From 0013b3f56b11f82f04a9796cc8181c89fc8c2f05 Mon Sep 17 00:00:00 2001
From: zitingguo-ms <zitingguo@microsoft.com>
Date: Thu, 19 Dec 2024 10:42:55 -0800
Subject: [PATCH] [Broadcom] Upgrade xgs SAI version to 12.1.0.2 and update
 knet driver (#20921)

Why I did it
Move xgs SAI to 12.1 and update knet driver.

12.1.0.2: [AN/LT] Enable Microsoft AN/LT behavior

Work item tracking
Microsoft ADO (number only): 30523065

How I did it
Upgrade xgs SAI version to 12.1.0.2 and update saibcm-modules.

How to verify it
load image on a 7050cx3 DUT, dockers are up and stable.

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>
---
 platform/broadcom/sai-modules.mk              |    2 +-
 platform/broadcom/sai.mk                      |    4 +-
 .../broadcom/saibcm-modules/debian/changelog  |    6 +
 .../broadcom/saibcm-modules/include/kcom.h    |   14 +-
 .../saibcm-modules/include/soc/devids.h       |   10 +
 .../broadcom/saibcm-modules/make/Make.config  |   33 +
 .../broadcom/saibcm-modules/make/Make.depend  |    9 +
 .../broadcom/saibcm-modules/make/Make.kernlib |   10 -
 .../broadcom/saibcm-modules/make/Make.lib     |   15 +-
 .../broadcom/saibcm-modules/make/Make.linux   |   40 +-
 .../broadcom/saibcm-modules/make/Make.subdirs |    2 +-
 .../saibcm-modules/make/Makefile.linux-gts    |   91 +-
 .../saibcm-modules/make/Makefile.linux-iproc  |   34 +-
 .../make/Makefile.linux-iproc_64              |   38 +-
 .../make/Makefile.linux-kernel-4_18           |    1 +
 .../saibcm-modules/make/Makefile.linux-slk    |    8 +-
 .../make/Makefile.linux-x86-5_10              |   73 +-
 .../make/Makefile.linux-x86-64-fc28           |   56 +-
 .../Makefile.linux-x86-generic-common-2_6     |    5 +-
 .../Makefile.linux-x86-smp_generic_64-2_6     |   11 +
 .../saibcm-modules/make/Makefile.linux-xlr    |   91 +-
 .../broadcom/saibcm-modules/sdklt/Makefile    |   20 +-
 .../hmi/cmicr/bcmcnet_cmicr2_pdma_rxtx.c      |    2 +
 .../bcmcnet/include/bcmcnet/bcmcnet_core.h    |    6 +-
 .../bcmdrd/include/bcmdrd/bcmdrd_types.h      |   53 +-
 .../bcmdrd/include/bcmdrd_config_chips.h      |   10 +-
 .../include/bcmlrd/bcmlrd_match_id_db.h       |    3 +
 .../generated/bcmlrd_variant_defs_internal.h  |   20 +-
 .../bcm56080_a0/bcm56080_a0_lrd_variant_def.h |    0
 .../bcm56690_a0/bcm56690_a0_lrd_variant_def.h |    0
 ...56690_a0_dna_6_5_31_7_0_lrd_variant_def.h} |    8 +-
 .../bcm56780_a0/bcm56780_a0_lrd_variant_def.h |    0
 ...56780_a0_cna_6_5_31_3_0_lrd_variant_def.h} |    8 +-
 ...56780_a0_dna_6_5_31_7_0_lrd_variant_def.h} |    8 +-
 ...56780_a0_hna_6_5_31_3_0_lrd_variant_def.h} |    8 +-
 .../bcm56880_a0/bcm56880_a0_lrd_variant_def.h |    0
 ...m56880_a0_dna_6_5_30_1_1_lrd_variant_def.h |   36 -
 ...m56880_a0_dna_6_5_31_6_0_lrd_variant_def.h |   36 +
 ...m56880_a0_hna_6_5_30_3_0_lrd_variant_def.h |   36 -
 ...m56880_a0_hna_6_5_31_3_0_lrd_variant_def.h |   36 +
 ...m56880_a0_nfa_6_5_30_1_1_lrd_variant_def.h |   36 -
 ...m56880_a0_nfa_6_5_31_3_1_lrd_variant_def.h |   36 +
 .../bcm56890_a0/bcm56890_a0_lrd_variant_def.h |    0
 ...m56890_a0_cna_6_5_30_2_0_lrd_variant_def.h |   36 -
 ...m56890_a0_cna_6_5_31_3_0_lrd_variant_def.h |   36 +
 ...m56890_a0_dna_6_5_30_8_0_lrd_variant_def.h |   36 -
 ...m56890_a0_dna_6_5_31_6_0_lrd_variant_def.h |   36 +
 .../bcm56990_a0/bcm56990_a0_lrd_variant_def.h |    0
 .../bcm56990_b0/bcm56990_b0_lrd_variant_def.h |    0
 .../bcm56996_a0/bcm56996_a0_lrd_variant_def.h |    0
 .../bcm56996_b0/bcm56996_b0_lrd_variant_def.h |    0
 .../bcm56998_a0/bcm56998_a0_lrd_variant_def.h |    0
 .../bcm56999_a0/bcm56999_a0_lrd_variant_def.h |    0
 .../bcm78800_a0/bcm78800_a0_lrd_variant_def.h |    0
 ...m78800_a0_dna_6_5_30_3_1_lrd_variant_def.h |   36 -
 ...m78800_a0_dna_6_5_31_5_0_lrd_variant_def.h |   36 +
 .../bcm78900_b0/bcm78900_b0_lrd_variant_def.h |    0
 .../bcm78905_a0/bcm78905_a0_lrd_variant_def.h |    0
 .../bcmltd/include/bcmltd/bcmltd_variant.h    |    4 +-
 .../chip/generated/bcmltd_config_variant.h    |    0
 .../bcmltd_config_variant_internal.h          |   20 +-
 .../chip/generated/bcmltd_variant_defs.h      |    0
 .../generated/bcmltd_variant_defs_internal.h  |   20 +-
 .../chip/generated/bcmltd_variant_entry.h     |   20 +-
 .../chip/generated/bcmltd_variant_limits.h    |    0
 .../bcm56080_a0_ltd_config_variant.h          |    0
 .../bcm56690_a0_ltd_config_variant.h          |    0
 ...90_a0_dna_6_5_31_7_0_ltd_config_variant.h} |   16 +-
 .../bcm56780_a0_ltd_config_variant.h          |    0
 ...80_a0_cna_6_5_31_3_0_ltd_config_variant.h} |   16 +-
 ...80_a0_dna_6_5_31_7_0_ltd_config_variant.h} |   16 +-
 ...80_a0_hna_6_5_31_3_0_ltd_config_variant.h} |   16 +-
 .../bcm56880_a0_ltd_config_variant.h          |    0
 ...80_a0_dna_6_5_31_6_0_ltd_config_variant.h} |   16 +-
 ...80_a0_hna_6_5_31_3_0_ltd_config_variant.h} |   16 +-
 ...80_a0_nfa_6_5_31_3_1_ltd_config_variant.h} |   16 +-
 .../bcm56890_a0_ltd_config_variant.h          |    0
 ...90_a0_cna_6_5_31_3_0_ltd_config_variant.h} |   16 +-
 ...90_a0_dna_6_5_31_6_0_ltd_config_variant.h} |   16 +-
 .../bcm56990_a0_ltd_config_variant.h          |    0
 .../bcm56990_b0_ltd_config_variant.h          |    0
 .../bcm56996_a0_ltd_config_variant.h          |    0
 .../bcm56996_b0_ltd_config_variant.h          |    0
 .../bcm56998_a0_ltd_config_variant.h          |    0
 .../bcm56999_a0_ltd_config_variant.h          |    0
 .../bcm78800_a0_ltd_config_variant.h          |    0
 ...00_a0_dna_6_5_31_5_0_ltd_config_variant.h} |   16 +-
 .../bcm78900_b0_ltd_config_variant.h          |    0
 .../bcm78905_a0_ltd_config_variant.h          |    0
 .../bcm56080_a0/bcm56080_a0_ltd_variant_def.h |    0
 .../bcm56690_a0/bcm56690_a0_ltd_variant_def.h |    0
 ...m56690_a0_dna_6_5_29_0_1_ltd_variant_def.h |   37 -
 ...m56690_a0_dna_6_5_31_7_0_ltd_variant_def.h |   37 +
 .../bcm56780_a0/bcm56780_a0_ltd_variant_def.h |    0
 ...m56780_a0_cna_6_5_30_2_0_ltd_variant_def.h |   37 -
 ...m56780_a0_cna_6_5_31_3_0_ltd_variant_def.h |   37 +
 ...m56780_a0_dna_6_5_30_2_0_ltd_variant_def.h |   37 -
 ...m56780_a0_dna_6_5_31_7_0_ltd_variant_def.h |   37 +
 ...m56780_a0_hna_6_5_30_6_0_ltd_variant_def.h |   37 -
 ...m56780_a0_hna_6_5_31_3_0_ltd_variant_def.h |   37 +
 .../bcm56880_a0/bcm56880_a0_ltd_variant_def.h |    0
 ...m56880_a0_dna_6_5_30_1_1_ltd_variant_def.h |   37 -
 ...m56880_a0_dna_6_5_31_6_0_ltd_variant_def.h |   37 +
 ...m56880_a0_hna_6_5_30_3_0_ltd_variant_def.h |   37 -
 ...m56880_a0_hna_6_5_31_3_0_ltd_variant_def.h |   37 +
 ...m56880_a0_nfa_6_5_30_1_1_ltd_variant_def.h |   37 -
 ...m56880_a0_nfa_6_5_31_3_1_ltd_variant_def.h |   37 +
 .../bcm56890_a0/bcm56890_a0_ltd_variant_def.h |    0
 ...m56890_a0_cna_6_5_30_2_0_ltd_variant_def.h |   37 -
 ...m56890_a0_cna_6_5_31_3_0_ltd_variant_def.h |   37 +
 ...m56890_a0_dna_6_5_30_8_0_ltd_variant_def.h |   37 -
 ...m56890_a0_dna_6_5_31_6_0_ltd_variant_def.h |   37 +
 .../bcm56990_a0/bcm56990_a0_ltd_variant_def.h |    0
 .../bcm56990_b0/bcm56990_b0_ltd_variant_def.h |    0
 .../bcm56996_a0/bcm56996_a0_ltd_variant_def.h |    0
 .../bcm56996_b0/bcm56996_b0_ltd_variant_def.h |    0
 .../bcm56998_a0/bcm56998_a0_ltd_variant_def.h |    0
 .../bcm56999_a0/bcm56999_a0_ltd_variant_def.h |    0
 .../bcm78800_a0/bcm78800_a0_ltd_variant_def.h |    0
 ...m78800_a0_dna_6_5_30_3_1_ltd_variant_def.h |   37 -
 ...m78800_a0_dna_6_5_31_5_0_ltd_variant_def.h |   37 +
 .../bcm78900_b0/bcm78900_b0_ltd_variant_def.h |    0
 .../bcm78905_a0/bcm78905_a0_ltd_variant_def.h |    0
 .../bcm56080_a0_ltd_variant_entry.h           |    0
 .../bcm56690_a0_ltd_variant_entry.h           |    0
 ...690_a0_dna_6_5_31_7_0_ltd_variant_entry.h} |   12 +-
 .../bcm56780_a0_ltd_variant_entry.h           |    0
 ...780_a0_cna_6_5_31_3_0_ltd_variant_entry.h} |   12 +-
 ...780_a0_dna_6_5_31_7_0_ltd_variant_entry.h} |   12 +-
 ...780_a0_hna_6_5_31_3_0_ltd_variant_entry.h} |   12 +-
 .../bcm56880_a0_ltd_variant_entry.h           |    0
 ...6880_a0_dna_6_5_30_1_1_ltd_variant_entry.h |   40 -
 ...6880_a0_dna_6_5_31_6_0_ltd_variant_entry.h |   40 +
 ...6880_a0_hna_6_5_30_3_0_ltd_variant_entry.h |   40 -
 ...6880_a0_hna_6_5_31_3_0_ltd_variant_entry.h |   40 +
 ...6880_a0_nfa_6_5_30_1_1_ltd_variant_entry.h |   40 -
 ...6880_a0_nfa_6_5_31_3_1_ltd_variant_entry.h |   40 +
 .../bcm56890_a0_ltd_variant_entry.h           |    0
 ...6890_a0_cna_6_5_30_2_0_ltd_variant_entry.h |   40 -
 ...6890_a0_cna_6_5_31_3_0_ltd_variant_entry.h |   40 +
 ...6890_a0_dna_6_5_30_8_0_ltd_variant_entry.h |   40 -
 ...6890_a0_dna_6_5_31_6_0_ltd_variant_entry.h |   40 +
 .../bcm56990_a0_ltd_variant_entry.h           |    0
 .../bcm56990_b0_ltd_variant_entry.h           |    0
 .../bcm56996_a0_ltd_variant_entry.h           |    0
 .../bcm56996_b0_ltd_variant_entry.h           |    0
 .../bcm56998_a0_ltd_variant_entry.h           |    0
 .../bcm56999_a0_ltd_variant_entry.h           |    0
 .../bcm78800_a0_ltd_variant_entry.h           |    0
 ...8800_a0_dna_6_5_30_3_1_ltd_variant_entry.h |   40 -
 ...8800_a0_dna_6_5_31_5_0_ltd_variant_entry.h |   40 +
 .../bcm78900_b0_ltd_variant_entry.h           |    0
 .../bcm78905_a0_ltd_variant_entry.h           |    0
 .../chip/bcm56080_a0/bcm56080_a0_pkt_lbhdr.c  |    4 +-
 .../chip/bcm56080_a0/bcm56080_a0_pkt_txpmd.c  |   83 +-
 .../chip/bcm56690_a0/bcm56690_a0_pkt_lbhdr.c  |    4 +-
 .../chip/bcm56690_a0/bcm56690_a0_pkt_txpmd.c  |   83 +-
 .../chip/bcm56780_a0/bcm56780_a0_pkt_lbhdr.c  |    4 +-
 .../chip/bcm56780_a0/bcm56780_a0_pkt_txpmd.c  |   83 +-
 .../chip/bcm56880_a0/bcm56880_a0_pkt_lbhdr.c  |    4 +-
 .../chip/bcm56880_a0/bcm56880_a0_pkt_txpmd.c  |   83 +-
 .../chip/bcm56890_a0/bcm56890_a0_pkt_lbhdr.c  |    4 +-
 .../chip/bcm56890_a0/bcm56890_a0_pkt_txpmd.c  |   83 +-
 .../chip/bcm56990_a0/bcm56990_a0_pkt_lbhdr.c  |    4 +-
 .../chip/bcm56990_a0/bcm56990_a0_pkt_txpmd.c  |   83 +-
 .../chip/bcm56990_b0/bcm56990_b0_pkt_lbhdr.c  |    4 +-
 .../chip/bcm56990_b0/bcm56990_b0_pkt_txpmd.c  |   83 +-
 .../chip/bcm56996_a0/bcm56996_a0_pkt_lbhdr.c  |    4 +-
 .../chip/bcm56996_a0/bcm56996_a0_pkt_txpmd.c  |   83 +-
 .../chip/bcm56996_b0/bcm56996_b0_pkt_lbhdr.c  |    4 +-
 .../chip/bcm56996_b0/bcm56996_b0_pkt_txpmd.c  |   83 +-
 .../chip/bcm56998_a0/bcm56998_a0_pkt_lbhdr.c  |    4 +-
 .../chip/bcm56998_a0/bcm56998_a0_pkt_txpmd.c  |   83 +-
 .../chip/bcm56999_a0/bcm56999_a0_pkt_lbhdr.c  |    4 +-
 .../chip/bcm56999_a0/bcm56999_a0_pkt_txpmd.c  |   83 +-
 .../chip/bcm78800_a0/bcm78800_a0_pkt_lbhdr.c  |    4 +-
 .../chip/bcm78800_a0/bcm78800_a0_pkt_txpmd.c  |   83 +-
 .../chip/bcm78900_b0/bcm78900_b0_pkt_lbhdr.c  |    4 +-
 .../chip/bcm78900_b0/bcm78900_b0_pkt_txpmd.c  |   83 +-
 .../chip/bcm78905_a0/bcm78905_a0_pkt_lbhdr.c  |    4 +-
 .../chip/bcm78905_a0/bcm78905_a0_pkt_txpmd.c  |   83 +-
 .../sdklt/bcmpkt/flexhdr/bcmpkt_flexhdr.c     |    2 +
 .../bcmpkt/include/bcmpkt/bcmpkt_flexhdr.h    |    8 +
 .../bcmpkt/include/bcmpkt/bcmpkt_lbhdr.h      |    4 +-
 .../bcmpkt/include/bcmpkt/bcmpkt_lbhdr_defs.h |    5 +-
 .../sdklt/bcmpkt/include/bcmpkt/bcmpkt_pmd.h  |    9 -
 .../bcmpkt/include/bcmpkt/bcmpkt_rxpmd.h      |    4 +-
 .../bcmpkt/include/bcmpkt/bcmpkt_rxpmd_defs.h |   15 +-
 .../bcmpkt/include/bcmpkt/bcmpkt_txpmd.h      |    4 +-
 .../bcmpkt/include/bcmpkt/bcmpkt_txpmd_defs.h |  313 +-
 .../sdklt/bcmpkt/include/bcmpkt/bcmpkt_util.h |    2 +-
 ...cm56690_a0_dna_6_5_29_0_1_bcmpkt_flexhdr.h |  182 -
 ...90_a0_dna_6_5_29_0_1_bcmpkt_flexhdr_data.h | 1392 ----
 ...a0_dna_6_5_29_0_1_bcmpkt_rxpmd_flex_data.h |  191 -
 ...na_6_5_29_0_1_bcmpkt_rxpmd_match_id_defs.h |  505 --
 ...cm56690_a0_dna_6_5_31_7_0_bcmpkt_flexhdr.h |  168 +
 ...90_a0_dna_6_5_31_7_0_bcmpkt_flexhdr_data.h | 1291 ++++
 ...a0_dna_6_5_31_7_0_bcmpkt_rxpmd_flex_data.h |  187 +
 ...na_6_5_31_7_0_bcmpkt_rxpmd_match_id_defs.h |  503 ++
 ...cm56780_a0_cna_6_5_30_2_0_bcmpkt_flexhdr.h |   96 -
 ...80_a0_cna_6_5_30_2_0_bcmpkt_flexhdr_data.h |  592 --
 ...a0_cna_6_5_30_2_0_bcmpkt_rxpmd_flex_data.h |  124 -
 ...na_6_5_30_2_0_bcmpkt_rxpmd_match_id_defs.h |  213 -
 ...cm56780_a0_cna_6_5_31_3_0_bcmpkt_flexhdr.h |   96 +
 ...80_a0_cna_6_5_31_3_0_bcmpkt_flexhdr_data.h |  592 ++
 ...a0_cna_6_5_31_3_0_bcmpkt_rxpmd_flex_data.h |  124 +
 ...na_6_5_31_3_0_bcmpkt_rxpmd_match_id_defs.h |  213 +
 ...cm56780_a0_dna_6_5_30_2_0_bcmpkt_flexhdr.h |  180 -
 ...80_a0_dna_6_5_30_2_0_bcmpkt_flexhdr_data.h | 1343 ----
 ...a0_dna_6_5_30_2_0_bcmpkt_rxpmd_flex_data.h |  180 -
 ...na_6_5_30_2_0_bcmpkt_rxpmd_match_id_defs.h |  417 --
 ...cm56780_a0_dna_6_5_31_7_0_bcmpkt_flexhdr.h |  180 +
 ...80_a0_dna_6_5_31_7_0_bcmpkt_flexhdr_data.h | 1343 ++++
 ...a0_dna_6_5_31_7_0_bcmpkt_rxpmd_flex_data.h |  181 +
 ...na_6_5_31_7_0_bcmpkt_rxpmd_match_id_defs.h |  417 ++
 ...cm56780_a0_hna_6_5_30_6_0_bcmpkt_flexhdr.h |  174 -
 ...80_a0_hna_6_5_30_6_0_bcmpkt_flexhdr_data.h | 1258 ----
 ...a0_hna_6_5_30_6_0_bcmpkt_rxpmd_flex_data.h |  181 -
 ...na_6_5_30_6_0_bcmpkt_rxpmd_match_id_defs.h |  405 --
 ...cm56780_a0_hna_6_5_31_3_0_bcmpkt_flexhdr.h |  174 +
 ...80_a0_hna_6_5_31_3_0_bcmpkt_flexhdr_data.h | 1258 ++++
 ...a0_hna_6_5_31_3_0_bcmpkt_rxpmd_flex_data.h |  181 +
 ...na_6_5_31_3_0_bcmpkt_rxpmd_match_id_defs.h |  405 ++
 ...cm56880_a0_dna_6_5_30_1_1_bcmpkt_flexhdr.h |  178 -
 ...80_a0_dna_6_5_30_1_1_bcmpkt_flexhdr_data.h | 1324 ----
 ...a0_dna_6_5_30_1_1_bcmpkt_rxpmd_flex_data.h |  163 -
 ...na_6_5_30_1_1_bcmpkt_rxpmd_match_id_defs.h |  407 --
 ...cm56880_a0_dna_6_5_31_6_0_bcmpkt_flexhdr.h |  178 +
 ...80_a0_dna_6_5_31_6_0_bcmpkt_flexhdr_data.h | 1324 ++++
 ...a0_dna_6_5_31_6_0_bcmpkt_rxpmd_flex_data.h |  164 +
 ...na_6_5_31_6_0_bcmpkt_rxpmd_match_id_defs.h |  407 ++
 ...cm56880_a0_hna_6_5_30_3_0_bcmpkt_flexhdr.h |  170 -
 ...80_a0_hna_6_5_30_3_0_bcmpkt_flexhdr_data.h | 1212 ----
 ...a0_hna_6_5_30_3_0_bcmpkt_rxpmd_flex_data.h |  165 -
 ...na_6_5_30_3_0_bcmpkt_rxpmd_match_id_defs.h |  395 --
 ...cm56880_a0_hna_6_5_31_3_0_bcmpkt_flexhdr.h |  170 +
 ...80_a0_hna_6_5_31_3_0_bcmpkt_flexhdr_data.h | 1212 ++++
 ...a0_hna_6_5_31_3_0_bcmpkt_rxpmd_flex_data.h |  165 +
 ...na_6_5_31_3_0_bcmpkt_rxpmd_match_id_defs.h |  395 ++
 ...cm56880_a0_nfa_6_5_30_1_1_bcmpkt_flexhdr.h |  162 -
 ...80_a0_nfa_6_5_30_1_1_bcmpkt_flexhdr_data.h | 1152 ----
 ...a0_nfa_6_5_30_1_1_bcmpkt_rxpmd_flex_data.h |  173 -
 ...fa_6_5_30_1_1_bcmpkt_rxpmd_match_id_defs.h |  427 --
 ...cm56880_a0_nfa_6_5_31_3_1_bcmpkt_flexhdr.h |  162 +
 ...80_a0_nfa_6_5_31_3_1_bcmpkt_flexhdr_data.h | 1152 ++++
 ...a0_nfa_6_5_31_3_1_bcmpkt_rxpmd_flex_data.h |  173 +
 ...fa_6_5_31_3_1_bcmpkt_rxpmd_match_id_defs.h |  427 ++
 ...cm56890_a0_cna_6_5_30_2_0_bcmpkt_flexhdr.h |   96 -
 ...90_a0_cna_6_5_30_2_0_bcmpkt_flexhdr_data.h |  592 --
 ...a0_cna_6_5_30_2_0_bcmpkt_rxpmd_flex_data.h |  124 -
 ...na_6_5_30_2_0_bcmpkt_rxpmd_match_id_defs.h |  213 -
 ...cm56890_a0_cna_6_5_31_3_0_bcmpkt_flexhdr.h |   96 +
 ...90_a0_cna_6_5_31_3_0_bcmpkt_flexhdr_data.h |  592 ++
 ...a0_cna_6_5_31_3_0_bcmpkt_rxpmd_flex_data.h |  124 +
 ...na_6_5_31_3_0_bcmpkt_rxpmd_match_id_defs.h |  213 +
 ...cm56890_a0_dna_6_5_30_8_0_bcmpkt_flexhdr.h |  176 -
 ...90_a0_dna_6_5_30_8_0_bcmpkt_flexhdr_data.h | 1361 ----
 ...a0_dna_6_5_30_8_0_bcmpkt_rxpmd_flex_data.h |  198 -
 ...na_6_5_30_8_0_bcmpkt_rxpmd_match_id_defs.h |  515 --
 ...cm56890_a0_dna_6_5_31_6_0_bcmpkt_flexhdr.h |  176 +
 ...90_a0_dna_6_5_31_6_0_bcmpkt_flexhdr_data.h | 1361 ++++
 ...a0_dna_6_5_31_6_0_bcmpkt_rxpmd_flex_data.h |  198 +
 ...na_6_5_31_6_0_bcmpkt_rxpmd_match_id_defs.h |  515 ++
 ...cm78800_a0_dna_6_5_30_3_1_bcmpkt_flexhdr.h |  180 -
 ...00_a0_dna_6_5_30_3_1_bcmpkt_flexhdr_data.h | 1419 ----
 ...a0_dna_6_5_30_3_1_bcmpkt_rxpmd_flex_data.h |  192 -
 ...na_6_5_30_3_1_bcmpkt_rxpmd_match_id_defs.h |  515 --
 ...cm78800_a0_dna_6_5_31_5_0_bcmpkt_flexhdr.h |  174 +
 ...00_a0_dna_6_5_31_5_0_bcmpkt_flexhdr_data.h | 1362 ++++
 ...a0_dna_6_5_31_5_0_bcmpkt_rxpmd_flex_data.h |  186 +
 ...na_6_5_31_5_0_bcmpkt_rxpmd_match_id_defs.h |  509 ++
 ...a0_dna_6_5_31_7_0_bcmpkt_rxpmd_match_id.c} | 5327 ++++++++-------
 .../bcm56690_a0_dna_6_5_31_7_0_pkt_flexhdr.c} | 5869 ++++++-----------
 ...a0_cna_6_5_31_3_0_bcmpkt_rxpmd_match_id.c} |  182 +-
 .../bcm56780_a0_cna_6_5_31_3_0_pkt_flexhdr.c} |  986 ++-
 ...a0_dna_6_5_31_7_0_bcmpkt_rxpmd_match_id.c} |  386 +-
 .../bcm56780_a0_dna_6_5_31_7_0_pkt_flexhdr.c} | 2391 ++++---
 ...a0_hna_6_5_31_3_0_bcmpkt_rxpmd_match_id.c} |  374 +-
 .../bcm56780_a0_hna_6_5_31_3_0_pkt_flexhdr.c} | 2090 +++---
 ...a0_dna_6_5_31_6_0_bcmpkt_rxpmd_match_id.c} |  376 +-
 .../bcm56880_a0_dna_6_5_31_6_0_pkt_flexhdr.c} | 2083 +++---
 ...a0_hna_6_5_31_3_0_bcmpkt_rxpmd_match_id.c} |  364 +-
 .../bcm56880_a0_hna_6_5_31_3_0_pkt_flexhdr.c} | 1670 ++---
 ...a0_nfa_6_5_31_3_1_bcmpkt_rxpmd_match_id.c} |  396 +-
 .../bcm56880_a0_nfa_6_5_31_3_1_pkt_flexhdr.c} | 1514 ++---
 ...a0_cna_6_5_31_3_0_bcmpkt_rxpmd_match_id.c} |  314 +-
 .../bcm56890_a0_cna_6_5_31_3_0_pkt_flexhdr.c} |  944 ++-
 ...a0_dna_6_5_31_6_0_bcmpkt_rxpmd_match_id.c} | 1005 ++-
 .../bcm56890_a0_dna_6_5_31_6_0_pkt_flexhdr.c} | 1705 ++---
 ...a0_dna_6_5_31_5_0_bcmpkt_rxpmd_match_id.c} | 3013 ++++-----
 .../bcm78800_a0_dna_6_5_31_5_0_pkt_flexhdr.c} | 5733 ++++++++--------
 .../saibcm-modules/sdklt/linux/bcmgenl/Kbuild |    3 +-
 .../sdklt/linux/bcmgenl/bcmgenl_packet.c      |   20 +-
 .../sdklt/linux/bcmgenl/bcmgenl_psample.c     |   15 +-
 .../saibcm-modules/sdklt/linux/bde/Kbuild     |    4 +-
 .../sdklt/linux/bde/ngbde_dma.c               |   29 +-
 .../saibcm-modules/sdklt/linux/edk/Kbuild     |   17 +
 .../saibcm-modules/sdklt/linux/edk/Makefile   |   19 +
 .../sdklt/linux/edk/ngedk_main.c              |  497 ++
 .../sdklt/linux/genl-packet/Kbuild            |    2 +-
 .../sdklt/linux/include/lkm/lkm.h             |   13 +-
 .../saibcm-modules/sdklt/linux/knet/Kbuild    |    2 +-
 .../sdklt/linux/knet/ngknet_callback.c        |   48 +-
 .../sdklt/linux/knet/ngknet_callback.h        |   12 +-
 .../sdklt/linux/knet/ngknet_linux.h           |    8 +
 .../sdklt/linux/knet/ngknet_main.c            |   64 +-
 .../saibcm-modules/sdklt/linux/knetcb/Kbuild  |    1 -
 .../sdklt/linux/knetcb/ngknetcb_main.c        |  579 +-
 .../sdklt/linux/ptpclock/Kbuild               |   17 +
 .../sdklt/linux/ptpclock/Makefile             |   19 +
 .../sdklt/linux/ptpclock/ngptpclock_main.c    | 3042 +++++++++
 .../saibcm-modules/sdklt/make/kpmd.mk         |   34 +-
 .../systems/bde/linux/include/linux-bde.h     |    6 +
 .../bde/linux/kernel/linux-kernel-bde.c       |   92 +-
 .../systems/bde/linux/kernel/linux_dma.c      |   38 +-
 .../systems/bde/linux/user/kernel/Makefile    |    2 +-
 .../bde/linux/user/kernel/linux-user-bde.c    |   37 +-
 .../systems/bde/shared/shbde_iproc.c          |    7 -
 .../kernel/modules/bcm-genl/bcm-genl-dev.c    |   97 +-
 .../kernel/modules/bcm-genl/bcm-genl-dev.h    |    5 +-
 .../kernel/modules/bcm-genl/bcm-genl-packet.c |   16 +-
 .../modules/bcm-genl/bcm-genl-psample.c       |  115 +-
 .../linux/kernel/modules/bcm-knet/bcm-knet.c  |  624 +-
 .../kernel/modules/bcm-ptp-clock/Makefile     |   99 +
 .../modules/bcm-ptp-clock/bcm-ptp-clock.c     |  305 +-
 .../kernel/modules/dcb/include/soc/defs.h     |  109 +-
 .../kernel/modules/dcb/include/soc/devids.h   |   10 +
 .../include/soc/shared/dcbformats/type35.h    |    2 +-
 .../linux/kernel/modules/include/lkm.h        |   14 +-
 .../linux/kernel/modules/knet-cb/knet-cb.c    |   21 +-
 .../linux/kernel/modules/shared/gmodule.c     |    2 +-
 .../systems/linux/user/common/Makefile        |   21 +-
 .../systems/linux/user/gts/Makefile           |    4 +-
 .../systems/linux/user/iproc-3_14/Makefile    |    1 -
 .../systems/linux/user/iproc-4_4/Makefile     |    1 -
 .../systems/linux/user/iproc/Makefile         |    3 +-
 .../systems/linux/user/iproc_64/Makefile      |    3 +-
 .../systems/linux/user/slk/Makefile           |    1 -
 .../systems/linux/user/x86-5_10/Makefile      |    1 -
 .../systems/linux/user/x86-64-fc28/Makefile   |    1 -
 .../user/x86-smp_generic_64-2_6/Makefile      |    1 -
 .../systems/linux/user/xlr/Makefile           |    4 +-
 342 files changed, 44526 insertions(+), 40180 deletions(-)
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56080_a0/bcm56080_a0_lrd_variant_def.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56690_a0/bcm56690_a0_lrd_variant_def.h
 rename platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56690_a0/{dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_lrd_variant_def.h => dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_lrd_variant_def.h} (80%)
 mode change 100755 => 100644
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56780_a0/bcm56780_a0_lrd_variant_def.h
 rename platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56780_a0/{cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_lrd_variant_def.h => cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_lrd_variant_def.h} (80%)
 mode change 100755 => 100644
 rename platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56780_a0/{dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_lrd_variant_def.h => dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_lrd_variant_def.h} (80%)
 mode change 100755 => 100644
 rename platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56780_a0/{hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_lrd_variant_def.h => hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_lrd_variant_def.h} (80%)
 mode change 100755 => 100644
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56880_a0/bcm56880_a0_lrd_variant_def.h
 delete mode 100755 platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_lrd_variant_def.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_lrd_variant_def.h
 delete mode 100755 platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_lrd_variant_def.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_lrd_variant_def.h
 delete mode 100755 platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_lrd_variant_def.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_lrd_variant_def.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56890_a0/bcm56890_a0_lrd_variant_def.h
 delete mode 100755 platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_lrd_variant_def.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_lrd_variant_def.h
 delete mode 100755 platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_lrd_variant_def.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_lrd_variant_def.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56990_a0/bcm56990_a0_lrd_variant_def.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56990_b0/bcm56990_b0_lrd_variant_def.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56996_a0/bcm56996_a0_lrd_variant_def.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56996_b0/bcm56996_b0_lrd_variant_def.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56998_a0/bcm56998_a0_lrd_variant_def.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56999_a0/bcm56999_a0_lrd_variant_def.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm78800_a0/bcm78800_a0_lrd_variant_def.h
 delete mode 100755 platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_lrd_variant_def.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_lrd_variant_def.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm78900_b0/bcm78900_b0_lrd_variant_def.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm78905_a0/bcm78905_a0_lrd_variant_def.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/chip/generated/bcmltd_config_variant.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/chip/generated/bcmltd_config_variant_internal.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/chip/generated/bcmltd_variant_defs.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/chip/generated/bcmltd_variant_defs_internal.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/chip/generated/bcmltd_variant_entry.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/chip/generated/bcmltd_variant_limits.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56080_a0/bcm56080_a0_ltd_config_variant.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56690_a0/bcm56690_a0_ltd_config_variant.h
 rename platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56690_a0/{dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_ltd_config_variant.h => dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_ltd_config_variant.h} (74%)
 mode change 100755 => 100644
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56780_a0/bcm56780_a0_ltd_config_variant.h
 rename platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56780_a0/{cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_ltd_config_variant.h => cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_ltd_config_variant.h} (74%)
 mode change 100755 => 100644
 rename platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56780_a0/{dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_ltd_config_variant.h => dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_ltd_config_variant.h} (74%)
 mode change 100755 => 100644
 rename platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56780_a0/{hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_ltd_config_variant.h => hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_ltd_config_variant.h} (74%)
 mode change 100755 => 100644
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56880_a0/bcm56880_a0_ltd_config_variant.h
 rename platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56880_a0/{dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_ltd_config_variant.h => dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_ltd_config_variant.h} (74%)
 mode change 100755 => 100644
 rename platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56880_a0/{hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_ltd_config_variant.h => hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_ltd_config_variant.h} (74%)
 mode change 100755 => 100644
 rename platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56880_a0/{nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_ltd_config_variant.h => nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_ltd_config_variant.h} (74%)
 mode change 100755 => 100644
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56890_a0/bcm56890_a0_ltd_config_variant.h
 rename platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56890_a0/{cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_ltd_config_variant.h => cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_ltd_config_variant.h} (74%)
 mode change 100755 => 100644
 rename platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56890_a0/{dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_ltd_config_variant.h => dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_ltd_config_variant.h} (74%)
 mode change 100755 => 100644
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56990_a0/bcm56990_a0_ltd_config_variant.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56990_b0/bcm56990_b0_ltd_config_variant.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56996_a0/bcm56996_a0_ltd_config_variant.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56996_b0/bcm56996_b0_ltd_config_variant.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56998_a0/bcm56998_a0_ltd_config_variant.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56999_a0/bcm56999_a0_ltd_config_variant.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm78800_a0/bcm78800_a0_ltd_config_variant.h
 rename platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm78800_a0/{dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_ltd_config_variant.h => dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_ltd_config_variant.h} (74%)
 mode change 100755 => 100644
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm78900_b0/bcm78900_b0_ltd_config_variant.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm78905_a0/bcm78905_a0_ltd_config_variant.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56080_a0/bcm56080_a0_ltd_variant_def.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56690_a0/bcm56690_a0_ltd_variant_def.h
 delete mode 100755 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_ltd_variant_def.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_ltd_variant_def.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56780_a0/bcm56780_a0_ltd_variant_def.h
 delete mode 100755 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_ltd_variant_def.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_ltd_variant_def.h
 delete mode 100755 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_ltd_variant_def.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_ltd_variant_def.h
 delete mode 100755 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_ltd_variant_def.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_ltd_variant_def.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56880_a0/bcm56880_a0_ltd_variant_def.h
 delete mode 100755 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_ltd_variant_def.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_ltd_variant_def.h
 delete mode 100755 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_ltd_variant_def.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_ltd_variant_def.h
 delete mode 100755 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_ltd_variant_def.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_ltd_variant_def.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56890_a0/bcm56890_a0_ltd_variant_def.h
 delete mode 100755 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_ltd_variant_def.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_ltd_variant_def.h
 delete mode 100755 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_ltd_variant_def.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_ltd_variant_def.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56990_a0/bcm56990_a0_ltd_variant_def.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56990_b0/bcm56990_b0_ltd_variant_def.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56996_a0/bcm56996_a0_ltd_variant_def.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56996_b0/bcm56996_b0_ltd_variant_def.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56998_a0/bcm56998_a0_ltd_variant_def.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56999_a0/bcm56999_a0_ltd_variant_def.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm78800_a0/bcm78800_a0_ltd_variant_def.h
 delete mode 100755 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_ltd_variant_def.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_ltd_variant_def.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm78900_b0/bcm78900_b0_ltd_variant_def.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm78905_a0/bcm78905_a0_ltd_variant_def.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56080_a0/bcm56080_a0_ltd_variant_entry.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56690_a0/bcm56690_a0_ltd_variant_entry.h
 rename platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56690_a0/{dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_ltd_variant_entry.h => dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_ltd_variant_entry.h} (68%)
 mode change 100755 => 100644
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56780_a0/bcm56780_a0_ltd_variant_entry.h
 rename platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56780_a0/{cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_ltd_variant_entry.h => cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_ltd_variant_entry.h} (68%)
 mode change 100755 => 100644
 rename platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56780_a0/{dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_ltd_variant_entry.h => dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_ltd_variant_entry.h} (68%)
 mode change 100755 => 100644
 rename platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56780_a0/{hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_ltd_variant_entry.h => hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_ltd_variant_entry.h} (68%)
 mode change 100755 => 100644
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56880_a0/bcm56880_a0_ltd_variant_entry.h
 delete mode 100755 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_ltd_variant_entry.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_ltd_variant_entry.h
 delete mode 100755 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_ltd_variant_entry.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_ltd_variant_entry.h
 delete mode 100755 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_ltd_variant_entry.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_ltd_variant_entry.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56890_a0/bcm56890_a0_ltd_variant_entry.h
 delete mode 100755 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_ltd_variant_entry.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_ltd_variant_entry.h
 delete mode 100755 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_ltd_variant_entry.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_ltd_variant_entry.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56990_a0/bcm56990_a0_ltd_variant_entry.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56990_b0/bcm56990_b0_ltd_variant_entry.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56996_a0/bcm56996_a0_ltd_variant_entry.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56996_b0/bcm56996_b0_ltd_variant_entry.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56998_a0/bcm56998_a0_ltd_variant_entry.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56999_a0/bcm56999_a0_ltd_variant_entry.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm78800_a0/bcm78800_a0_ltd_variant_entry.h
 delete mode 100755 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_ltd_variant_entry.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_ltd_variant_entry.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm78900_b0/bcm78900_b0_ltd_variant_entry.h
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm78905_a0/bcm78905_a0_ltd_variant_entry.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_bcmpkt_flexhdr.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_bcmpkt_flexhdr_data.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_bcmpkt_rxpmd_flex_data.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_bcmpkt_rxpmd_match_id_defs.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_bcmpkt_flexhdr.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_bcmpkt_flexhdr_data.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_bcmpkt_rxpmd_flex_data.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_bcmpkt_rxpmd_match_id_defs.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_bcmpkt_flexhdr.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_bcmpkt_flexhdr_data.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_bcmpkt_rxpmd_flex_data.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_bcmpkt_rxpmd_match_id_defs.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_bcmpkt_flexhdr.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_bcmpkt_flexhdr_data.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_bcmpkt_rxpmd_flex_data.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_bcmpkt_rxpmd_match_id_defs.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_bcmpkt_flexhdr.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_bcmpkt_flexhdr_data.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_bcmpkt_rxpmd_flex_data.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_bcmpkt_rxpmd_match_id_defs.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_bcmpkt_flexhdr.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_bcmpkt_flexhdr_data.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_bcmpkt_rxpmd_flex_data.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_bcmpkt_rxpmd_match_id_defs.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_bcmpkt_flexhdr.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_bcmpkt_flexhdr_data.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_bcmpkt_rxpmd_flex_data.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_bcmpkt_rxpmd_match_id_defs.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_bcmpkt_flexhdr.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_bcmpkt_flexhdr_data.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_bcmpkt_rxpmd_flex_data.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_bcmpkt_rxpmd_match_id_defs.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_bcmpkt_flexhdr.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_bcmpkt_flexhdr_data.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_bcmpkt_rxpmd_flex_data.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_bcmpkt_rxpmd_match_id_defs.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_bcmpkt_flexhdr.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_bcmpkt_flexhdr_data.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_bcmpkt_rxpmd_flex_data.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_bcmpkt_rxpmd_match_id_defs.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_bcmpkt_flexhdr.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_bcmpkt_flexhdr_data.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_bcmpkt_rxpmd_flex_data.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_bcmpkt_rxpmd_match_id_defs.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_bcmpkt_flexhdr.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_bcmpkt_flexhdr_data.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_bcmpkt_rxpmd_flex_data.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_bcmpkt_rxpmd_match_id_defs.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_bcmpkt_flexhdr.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_bcmpkt_flexhdr_data.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_bcmpkt_rxpmd_flex_data.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_bcmpkt_rxpmd_match_id_defs.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_bcmpkt_flexhdr.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_bcmpkt_flexhdr_data.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_bcmpkt_rxpmd_flex_data.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_bcmpkt_rxpmd_match_id_defs.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_bcmpkt_flexhdr.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_bcmpkt_flexhdr_data.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_bcmpkt_rxpmd_flex_data.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_bcmpkt_rxpmd_match_id_defs.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_bcmpkt_flexhdr.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_bcmpkt_flexhdr_data.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_bcmpkt_rxpmd_flex_data.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_bcmpkt_rxpmd_match_id_defs.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_bcmpkt_flexhdr.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_bcmpkt_flexhdr_data.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_bcmpkt_rxpmd_flex_data.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_bcmpkt_rxpmd_match_id_defs.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_bcmpkt_flexhdr.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_bcmpkt_flexhdr_data.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_bcmpkt_rxpmd_flex_data.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_bcmpkt_rxpmd_match_id_defs.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_bcmpkt_flexhdr.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_bcmpkt_flexhdr_data.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_bcmpkt_rxpmd_flex_data.h
 delete mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_bcmpkt_rxpmd_match_id_defs.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_bcmpkt_flexhdr.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_bcmpkt_flexhdr_data.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_bcmpkt_rxpmd_flex_data.h
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_bcmpkt_rxpmd_match_id_defs.h
 rename platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56690_a0/{dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_bcmpkt_rxpmd_match_id.c => dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_bcmpkt_rxpmd_match_id.c} (56%)
 rename platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/{bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_pkt_flexhdr.c => bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_pkt_flexhdr.c} (58%)
 rename platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/{cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_bcmpkt_rxpmd_match_id.c => cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_bcmpkt_rxpmd_match_id.c} (82%)
 rename platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/{cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_pkt_flexhdr.c => cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_pkt_flexhdr.c} (73%)
 rename platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/{dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_bcmpkt_rxpmd_match_id.c => dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_bcmpkt_rxpmd_match_id.c} (84%)
 rename platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/{dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_pkt_flexhdr.c => dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_pkt_flexhdr.c} (70%)
 rename platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/{hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_bcmpkt_rxpmd_match_id.c => hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_bcmpkt_rxpmd_match_id.c} (83%)
 rename platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/{hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_pkt_flexhdr.c => hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_pkt_flexhdr.c} (77%)
 rename platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/{dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_bcmpkt_rxpmd_match_id.c => dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_bcmpkt_rxpmd_match_id.c} (83%)
 rename platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/{dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_pkt_flexhdr.c => dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_pkt_flexhdr.c} (72%)
 rename platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/{hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_bcmpkt_rxpmd_match_id.c => hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_bcmpkt_rxpmd_match_id.c} (83%)
 rename platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/{hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_pkt_flexhdr.c => hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_pkt_flexhdr.c} (73%)
 rename platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/{nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_bcmpkt_rxpmd_match_id.c => nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_bcmpkt_rxpmd_match_id.c} (84%)
 rename platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/{nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_pkt_flexhdr.c => nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_pkt_flexhdr.c} (74%)
 rename platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56890_a0/{cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_bcmpkt_rxpmd_match_id.c => cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_bcmpkt_rxpmd_match_id.c} (77%)
 rename platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56890_a0/{cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_pkt_flexhdr.c => cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_pkt_flexhdr.c} (74%)
 rename platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56890_a0/{dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_bcmpkt_rxpmd_match_id.c => dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_bcmpkt_rxpmd_match_id.c} (82%)
 rename platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56890_a0/{dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_pkt_flexhdr.c => dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_pkt_flexhdr.c} (84%)
 rename platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm78800_a0/{dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_bcmpkt_rxpmd_match_id.c => dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_bcmpkt_rxpmd_match_id.c} (66%)
 rename platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/{bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_pkt_flexhdr.c => bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_pkt_flexhdr.c} (70%)
 create mode 100755 platform/broadcom/saibcm-modules/sdklt/linux/edk/Kbuild
 create mode 100755 platform/broadcom/saibcm-modules/sdklt/linux/edk/Makefile
 create mode 100755 platform/broadcom/saibcm-modules/sdklt/linux/edk/ngedk_main.c
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/ptpclock/Kbuild
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/ptpclock/Makefile
 create mode 100644 platform/broadcom/saibcm-modules/sdklt/linux/ptpclock/ngptpclock_main.c
 mode change 100755 => 100644 platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-knet/bcm-knet.c
 create mode 100644 platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-ptp-clock/Makefile

diff --git a/platform/broadcom/sai-modules.mk b/platform/broadcom/sai-modules.mk
index 53f0768a15e2..ae65a000704b 100644
--- a/platform/broadcom/sai-modules.mk
+++ b/platform/broadcom/sai-modules.mk
@@ -1,6 +1,6 @@
 # Broadcom SAI modules
 
-BRCM_OPENNSL_KERNEL_VERSION = 11.2.4.1
+BRCM_OPENNSL_KERNEL_VERSION = 12.1.0.2
 
 BRCM_OPENNSL_KERNEL = opennsl-modules_$(BRCM_OPENNSL_KERNEL_VERSION)_amd64.deb
 $(BRCM_OPENNSL_KERNEL)_SRC_PATH = $(PLATFORM_PATH)/saibcm-modules
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index 4127bb58d6b0..5f8e04c339cf 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,6 +1,6 @@
-LIBSAIBCM_XGS_VERSION = 11.2.16.2
+LIBSAIBCM_XGS_VERSION = 12.1.0.2
 LIBSAIBCM_DNX_VERSION = 11.2.13.1-1
-LIBSAIBCM_XGS_BRANCH_NAME = SAI_11.2.16.2
+LIBSAIBCM_XGS_BRANCH_NAME = SAI_12.1.0_GA
 LIBSAIBCM_DNX_BRANCH_NAME = SAI_11.2.0_GA
 LIBSAIBCM_XGS_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/sai-broadcom/$(LIBSAIBCM_XGS_BRANCH_NAME)/$(LIBSAIBCM_XGS_VERSION)/xgs"
 LIBSAIBCM_DNX_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/sai-broadcom/$(LIBSAIBCM_DNX_BRANCH_NAME)/$(LIBSAIBCM_DNX_VERSION)/dnx"
diff --git a/platform/broadcom/saibcm-modules/debian/changelog b/platform/broadcom/saibcm-modules/debian/changelog
index dd635964bc71..d6d19cde8f41 100644
--- a/platform/broadcom/saibcm-modules/debian/changelog
+++ b/platform/broadcom/saibcm-modules/debian/changelog
@@ -1,3 +1,9 @@
+opennsl (12.1.0.2) unstable; urgency=medium
+
+  * Update to Broadcom SAI 12.1.0.2
+
+ -- Ziting Guo <zitingguo@microsoft.com> Wed, 18 Dec 2024 02:33:59 +0000
+
 opennsl (11.2.4.1) unstable; urgency=medium
 
   * Update to Broadcom SAI 11.2.4.1
diff --git a/platform/broadcom/saibcm-modules/include/kcom.h b/platform/broadcom/saibcm-modules/include/kcom.h
index 6a20600469e5..17d3f3fb5c40 100644
--- a/platform/broadcom/saibcm-modules/include/kcom.h
+++ b/platform/broadcom/saibcm-modules/include/kcom.h
@@ -72,7 +72,7 @@
 #define KCOM_M_CLOCK_CMD        52 /* Clock Commands */
 #define KCOM_M_PCIE_LINK_STATUS 53 /* PCIe link status */
 
-#define KCOM_VERSION            16 /* Protocol version */
+#define KCOM_VERSION            17 /* Protocol version */
 
 /*
  * Message status codes
@@ -126,10 +126,11 @@ typedef struct kcom_msg_hdr_s {
 #define KCOM_NETIF_T_PORT       1
 #define KCOM_NETIF_T_META       2
 
-#define KCOM_NETIF_F_ADD_TAG    (1U << 0)
-#define KCOM_NETIF_F_RCPU_ENCAP (1U << 1)
+#define KCOM_NETIF_F_ADD_TAG           (1U << 0)
+#define KCOM_NETIF_F_RCPU_ENCAP        (1U << 1)
 /* If a netif has this flag, the packet sent to the netif can't be stripped tag or added tag */
-#define KCOM_NETIF_F_KEEP_RX_TAG (1U << 2)
+#define KCOM_NETIF_F_KEEP_RX_TAG       (1U << 2)
+#define KCOM_NETIF_F_USE_SHARED_NDEV   (1U << 3)
 
 #define KCOM_NETIF_NAME_MAX     16
 
@@ -331,7 +332,7 @@ typedef struct kcom_eth_hw_config_s {
 } kcom_eth_hw_config_t;
 
 #ifndef KCOM_HW_INFO_OAMP_PORT_MAX
-#define KCOM_HW_INFO_OAMP_PORT_MAX     4
+#define KCOM_HW_INFO_OAMP_PORT_MAX     8
 #endif
 
 /*
@@ -370,7 +371,7 @@ typedef struct kcom_msg_version_s {
 
 typedef struct kcom_clock_info_s {
     uint8 cmd;
-    int32 data[8];
+    int32 data[12];
 } kcom_clock_info_t;
 
 /*
@@ -587,6 +588,7 @@ typedef struct kcom_msg_hw_info_s {
     uint32 udh_length_type[4];
     uint32 udh_size;
     uint32 oamp_punted;
+    uint32 enet_channels;
     uint8 no_skip_udh_check;
     uint8 oam_dm_tod_exist;
     uint8 system_headers_mode;
diff --git a/platform/broadcom/saibcm-modules/include/soc/devids.h b/platform/broadcom/saibcm-modules/include/soc/devids.h
index a4ee14018a18..421e5e63237a 100644
--- a/platform/broadcom/saibcm-modules/include/soc/devids.h
+++ b/platform/broadcom/saibcm-modules/include/soc/devids.h
@@ -1445,6 +1445,11 @@
 #define BCM53653_B0_REV_ID      0x11
 #define BCM53653_C0_REV_ID      0x21
 
+#define BCM53654_DEVICE_ID      0x8654
+#define BCM53654_A0_REV_ID      1
+#define BCM53654_B0_REV_ID      0x11
+#define BCM53654_C0_REV_ID      0x21
+
 /* Firebolt-5 */
 #define BCM56565_DEVICE_ID      0xb565
 #define BCM56565_A0_REV_ID      1
@@ -2044,6 +2049,11 @@
 #define Q3_DEVICE_ID_END        0x886f
 #define J3AI_DEVICE_ID           0x8890
 #define Q3D_DEVICE_ID           0x8870
+#ifdef BCM_Q3A_SUPPORT
+#define Q3A_DEVICE_ID           0x8490
+#define Q3U_DEVICE_ID           0x8400
+#define Q3N_DEVICE_ID           0x8405
+#endif
 #endif
 #define Q2A_DEVICE_ID           0x8480
 #define Q2A_A0_REV_ID           DNXC_A0_REV_ID
diff --git a/platform/broadcom/saibcm-modules/make/Make.config b/platform/broadcom/saibcm-modules/make/Make.config
index 5e28e7222d24..c9eccf64d3f2 100644
--- a/platform/broadcom/saibcm-modules/make/Make.config
+++ b/platform/broadcom/saibcm-modules/make/Make.config
@@ -62,10 +62,42 @@ endif
 
 -include	${SDK}/make/Make.local
 
+ifdef ALL_DNX_CHIPS
+ALL_DNX2_CHIPS = 1
+endif
+ifdef ALL_DNXF_CHIPS
+ALL_DNXF1_CHIPS = 1
+endif
+
 ifdef ALL_CHIPS
  ESW_CHIPS = 1
 endif # ALL_CHIPS
 
+ifdef ALL_DNX_CHIPS
+ ALL_DNX2_CHIPS  = 1
+ ALL_DNX3_CHIPS  = 1
+ ALL_DNXF1_CHIPS = 1
+ ALL_DNXF3_CHIPS = 1
+endif # ALL_CHIPS
+
+ifdef ALL_DNX2_CHIPS
+  CFGFLAGS += -DBCM_DNX_SUPPORT
+endif
+
+ifdef ALL_DNX3_CHIPS
+  CFGFLAGS += -DBCM_DNX3_SUPPORT
+endif
+
+
+ifdef ALL_DNXF1_CHIPS
+  CFGFLAGS += -DBCM_DNXF_SUPPORT
+endif
+
+ifdef ALL_DNXF3_CHIPS
+  CFGFLAGS += -DBCM_DNXF3_SUPPORT
+endif
+
+
 #
 # By default, turn off the "changing directory" message.
 #
@@ -174,6 +206,7 @@ INCFLAGS = -I${INCDIR} -I${SDK}/systems
 CFLAGS += ${INCFLAGS}
 CXXFLAGS += ${INCFLAGS}
 CPPFLAGS += ${INCFLAGS}
+
 CFLAGS += -DSAI_FIXUP -UKCOM_FILTER_MAX -DKCOM_FILTER_MAX=1025 -UKCOM_NETIF_MAX -DKCOM_NETIF_MAX=1056
 
 # Flag to enable multi instance support
diff --git a/platform/broadcom/saibcm-modules/make/Make.depend b/platform/broadcom/saibcm-modules/make/Make.depend
index f51ffd77bbf6..7f737a260458 100644
--- a/platform/broadcom/saibcm-modules/make/Make.depend
+++ b/platform/broadcom/saibcm-modules/make/Make.depend
@@ -106,6 +106,15 @@ endif
 
 endif	# !CLEANING
 
+ifeq ($(ARCH),arm64)
+# SAI: SONIC-76388 and SDK: SDK-367718
+# This macro removes the redundant macros and gcc options
+# JIRA SONIC-69062
+UNIQE = $(if $1,$(firstword $1) $(call UNIQE,$(filter-out $(firstword $1),$1)))
+CFLAGS := $(call UNIQE,$(CFLAGS))
+CFGFLAGS := $(call UNIQE,$(CFGFLAGS))
+endif
+
 clean_d::
 ifdef QUIET
 	@$(ECHO) Cleaning dependencies for ${LOCALDIR}
diff --git a/platform/broadcom/saibcm-modules/make/Make.kernlib b/platform/broadcom/saibcm-modules/make/Make.kernlib
index 3051da05e1ba..909607ef0351 100644
--- a/platform/broadcom/saibcm-modules/make/Make.kernlib
+++ b/platform/broadcom/saibcm-modules/make/Make.kernlib
@@ -30,10 +30,6 @@
 
 .SECONDARY:: ${BOBJS}
 
-targetlibsoname = ${lib}.so.${SHAREDLIBVER}
-targetlibrealname = ${targetlibsoname}
-targetlibso = ${LIBDIR}/${targetlibrealname}
-
 LIBSUFFIX=a
 
 ${LIBDIR}/%.a: ${BOBJS}
@@ -42,11 +38,6 @@ ifdef QUIET
 endif
 	$Q$(RM) $@
 	$Q$(AR) ${ARFLAGS} $@ $(sort ${BOBJS})
-ifeq ($(LINUX_MAKE_SHARED_LIB),1)
-ifeq ($(targetbase),unix)
-	$(CC) -shared -Wl,-soname,${targetlibsoname} -o ${targetlibso} ${BOBJS} -lc
-endif
-endif # LINUX_MAKE_SHARED_LIB #
 
 targetlib = ${LIBDIR}/${lib}.${LIBSUFFIX}
 
@@ -60,7 +51,6 @@ ifdef QUIET
 endif
 	$Q$(RM) ${BOBJS}
 	$Q$(RM) ${targetlib}
-	$Q$(RM) ${targetlibso}
 
 distclean:: clean
 
diff --git a/platform/broadcom/saibcm-modules/make/Make.lib b/platform/broadcom/saibcm-modules/make/Make.lib
index c6558c0cb181..e710c84b8fa0 100644
--- a/platform/broadcom/saibcm-modules/make/Make.lib
+++ b/platform/broadcom/saibcm-modules/make/Make.lib
@@ -41,12 +41,14 @@ ifeq ($(FAST),1)
   endif
 endif
 
-ifeq ($(LINUX_MAKE_SHARED_LIB),1)
-LIBSUFFIX=so.${SHAREDLIBVER}
-else
-LIBSUFFIX=a
+ifeq (1,$(SAND_ONLY))
+  ifeq ($(LINUX_MAKE_SHARED_LIB),1)
+    LIBSUFFIX := so.${SHAREDLIBVER}
+  endif
 endif
 
+LIBSUFFIX ?= a
+
 targetlib = ${LIBDIR}/${lib}.${LIBSUFFIX}
 
 all:: ${BLDDIR}/.tree ${targetlib}
@@ -57,12 +59,7 @@ ifdef QUIET
 	@$(ECHO) Building library $(notdir $@)
 endif
 	$Q$(RM) $@
-ifeq ($(LINUX_MAKE_SHARED_LIB),1)
-	$(CC) -shared -Wl,-soname,${lib}.${LIBSUFFIX}${EXTRA_LIB_LDFLAGS} -o ${targetlib} ${BOBJS} -lc
-else
 	$(AR) ${ARFLAGS} $@ $(sort ${BOBJS})
-endif
-
 
 install:: all
 
diff --git a/platform/broadcom/saibcm-modules/make/Make.linux b/platform/broadcom/saibcm-modules/make/Make.linux
index 83871cdbbe5b..f053c96dda21 100644
--- a/platform/broadcom/saibcm-modules/make/Make.linux
+++ b/platform/broadcom/saibcm-modules/make/Make.linux
@@ -35,10 +35,6 @@
 # LINUX_MAKE_FLAGS
 #   Additional flags passed to Make
 #
-# LINUX_MAKE_USER
-#   Defined: user build
-#   Undefined: kernel build
-#
 # LINUX_MAKE_DIR
 #   Common makefile location, if it is not ../common
 #
@@ -46,39 +42,11 @@
 
 export DEST_DIR_SUFFIX :=$(subst $(realpath $(SDK))/systems,,$(realpath $(CURDIR)/$(dir ($(firstword $(MAKEFILE_LIST))))))
 
-ifeq (,$(kernel_version))
-kernel_version=2_4
-endif
-
-ifndef LINUX_MAKE_SHARED_LIB
-LINUX_MAKE_SHARED_LIB=0
-endif
-
-ifeq (,$(SHAREDLIBVER))
-SHAREDLIBVER=1
-endif
-
-ifndef LINUX_MAKE_DIR
-ifdef LINUX_MAKE_USER
-LINUX_MAKE_DIR := $(SDK)/systems/linux/user/common
-else
-LINUX_MAKE_DIR := $(SDK)/systems/linux/kernel/common
-endif
-endif
-
-ifneq (,$(findstring iproc,$(platform)))
-  ADD_TO_CFLAGS += -DINCLUDE_MTD
-endif
+LINUX_MAKE_DIR ?= $(SDK)/systems/linux/user/common
 
-ifdef LINUX_MAKE_USER
-  CMD = $(LINUX_MAKE_FLAGS) -C $(LINUX_MAKE_DIR) \
-        platform=$(platform) bldroot_suffix=/$(platform) kernel_version=$(kernel_version) \
-        LINUX_MAKE_SHARED_LIB=$(LINUX_MAKE_SHARED_LIB) SHAREDLIBVER=$(SHAREDLIBVER)
-else
-  export LINUX_MAKE_KERNEL := 1
-  CMD = $(LINUX_MAKE_FLAGS) -C $(LINUX_MAKE_DIR) \
-        platform=$(platform) kernel_version=$(kernel_version)
-endif
+CMD = $(LINUX_MAKE_FLAGS) -C $(LINUX_MAKE_DIR) \
+      platform=$(platform) kernel_version=$(kernel_version) \
+      bldroot_suffix=/$(platform)
 
 ifneq (,$(MIPS_TOOLS_DIR))
   CMD += MIPS_TOOLS_DIR=$(MIPS_TOOLS_DIR)
diff --git a/platform/broadcom/saibcm-modules/make/Make.subdirs b/platform/broadcom/saibcm-modules/make/Make.subdirs
index 2473764aec1c..9f3cf7056033 100644
--- a/platform/broadcom/saibcm-modules/make/Make.subdirs
+++ b/platform/broadcom/saibcm-modules/make/Make.subdirs
@@ -36,7 +36,7 @@ ifdef QUIET
 endif
 
 ${subdirs}::
-	$Q$(MAKE) -C $@ kernel_version=$(kernel_version) LINUX_MAKE_SHARED_LIB=${LINUX_MAKE_SHARED_LIB} SHAREDLIBVER=${SHAREDLIBVER} ${CLEAN_SUBDIRS}
+	$Q$(MAKE) -C $@ kernel_version=$(kernel_version) ${CLEAN_SUBDIRS}
 
 clean clean_d install distclean::
 ifdef QUIET
diff --git a/platform/broadcom/saibcm-modules/make/Makefile.linux-gts b/platform/broadcom/saibcm-modules/make/Makefile.linux-gts
index 5ac089618a60..2f7b90d0636a 100644
--- a/platform/broadcom/saibcm-modules/make/Makefile.linux-gts
+++ b/platform/broadcom/saibcm-modules/make/Makefile.linux-gts
@@ -43,14 +43,18 @@
 #endif
 
 # some basic path variables for tools and kernel source, etc #
-XLR_TOOLS_BASE ?= /projects/ntsw-tools/linux/gcc12.2
+XLR_TOOLS_BASE ?= /projects/ntsw-tools/linux/xlr-66
 TOOLCHAIN_DIR = $(XLR_TOOLS_BASE)/buildroot/host/usr
-KERNDIR       ?= /projects/ntsw-tools/linux/xlr-510/kernel/linux
+ifeq (1,$(USE_CLANG))
+KERNDIR = $(XLR_TOOLS_BASE)/kernel/linux-clang
+endif
+KERNDIR ?= $(XLR_TOOLS_BASE)/kernel/linux
+
 # Target machine for EDK-Host defconfig
 TARGET_MACHINE ?= x86_64
 
 # set up cross compile prefix, tools dir variables. #
-export CROSS_COMPILE := x86_64-broadcom-linux-gnu-
+export CROSS_COMPILE := x86_64-linux-
 export TOOLS_DIR     := $(TOOLCHAIN_DIR)/bin
 
 # architecture. #
@@ -68,6 +72,7 @@ export PATH         := $(TOOLCHAIN_DIR)/bin:$(KERNDIR):$(PATH)
 
 # set up SYSINC path #
 CROSS_GCC_VER ?= $(shell $(TOOLCHAIN_DIR)/bin/$(CROSS_COMPILE)gcc -dumpversion)
+CROSS_GCC_VER_MAJOR := $(shell echo $(CROSS_GCC_VER) | cut -f1 -d.)
 export SYSINC := $(TOOLCHAIN_DIR)/lib/gcc/$(TARGET_ARCHITECTURE)/$(CROSS_GCC_VER)/include
 
 # Glibc 2.27 or later version doesn't support SVID libm error handling.
@@ -75,67 +80,61 @@ export SYSINC := $(TOOLCHAIN_DIR)/lib/gcc/$(TARGET_ARCHITECTURE)/$(CROSS_GCC_VER
 export TCL840  := 1
 
 # Common CFLAGS
-CFLAGS += -DUSE_LINUX_BDE_MMAP=1
-#CFLAGS += -DBDE_LINUX_USE_MSI_INTERRUPT
-CFLAGS += -Wno-error=unused-value
-CFLAGS += -Wno-error=unused-function
-CFLAGS += -Wno-error=cpp
-CFLAGS += -Wno-error=array-bounds
-CFLAGS += -Wno-error=strict-overflow
+CFGFLAGS += -DUSE_LINUX_BDE_MMAP=1
+#CFGFLAGS += -DBDE_LINUX_USE_MSI_INTERRUPT
+OPT_CFLAGS += -Wno-error=unused-value
+OPT_CFLAGS += -Wno-error=unused-function
+OPT_CFLAGS += -Wno-error=cpp
+OPT_CFLAGS += -Wno-error=array-bounds
+OPT_CFLAGS += -Wno-error=strict-overflow
 CFLAGS += -L$(TOOLCHAIN_DIR)/lib
 CFLAGS += -L$(TOOLCHAIN_DIR)/lib64
-#CFLAGS += -Wl,--rpath=/lib64                                 # may need to set rpath and dynamic-linker path here (and possibly in KLFAGS below) in the future, #
-#CFLAGS += -Wl,--dynamic-linker=/lib64/ld-linux-x86-64.so.2   # if we want to build the target executable to be used with shared libs #
+#OPT_CFLAGS += -Wl,--rpath=/lib64                                 # may need to set rpath and dynamic-linker path here (and possibly in KLFAGS below) in the future, #
+#OPT_CFLAGS += -Wl,--dynamic-linker=/lib64/ld-linux-x86-64.so.2   # if we want to build the target executable to be used with shared libs #
 
 # Compiler-specific CFLAGS
 ifeq (1,$(USE_CLANG)) # CLANG-specific CFLAGS
-CFLAGS += -Wno-strlcpy-strlcat-size
-CFLAGS += -Wno-strncat-size
-ifeq "$(shell expr `echo $(CROSS_GCC_VER) | cut -f1 -d.` \>= 12)" "1"
-export LIBNSL_DEPRECATED := 1
+OPT_CFLAGS += -Wno-strlcpy-strlcat-size
+OPT_CFLAGS += -Wno-strncat-size
+ifeq "$(shell expr $(CROSS_GCC_VER_MAJOR) \>= 12)" "1"
+	export LIBNSL_DEPRECATED := 1
 endif
-
 else # GCC-specific CFLAGS
-CFLAGS += -Wno-error=unused-but-set-variable
-CFLAGS += -Wno-error=maybe-uninitialized
-CFLAGS += -Wno-error=aggressive-loop-optimizations
-CFLAGS += -Wno-error=sizeof-pointer-div #SDK-233830
-CFLAGS += -Wno-error=memset-elt-size #SDK-232626
-ifeq "$(shell expr `echo $(CROSS_GCC_VER) | cut -f1 -d.` \>= 8)" "1"
-	CFLAGS += -Wno-stringop-overflow
-	CFLAGS += -Wno-stringop-truncation
-	CFLAGS += -Wno-error=restrict
+OPT_CFLAGS += -Wno-error=unused-but-set-variable
+OPT_CFLAGS += -Wno-error=maybe-uninitialized
+OPT_CFLAGS += -Wno-error=aggressive-loop-optimizations
+OPT_CFLAGS += -Wno-error=sizeof-pointer-div #SDK-233830
+OPT_CFLAGS += -Wno-error=memset-elt-size #SDK-232626
+OPT_CFLAGS += -Wno-error=unused-variable #SDK-232993
+OPT_CFLAGS += -Wno-deprecated-declarations #SDK-233174
+ifeq "$(shell expr $(CROSS_GCC_VER_MAJOR) \>= 8)" "1"
+	OPT_CFLAGS += -Wno-stringop-overflow
+	OPT_CFLAGS += -Wno-stringop-truncation
+	OPT_CFLAGS += -Wno-error=restrict
 endif
-ifeq "$(shell expr `echo $(CROSS_GCC_VER) | cut -f1 -d.` \>= 9)" "1"
-	CFLAGS += -Wno-address-of-packed-member
+ifeq "$(shell expr $(CROSS_GCC_VER_MAJOR) \>= 9)" "1"
+	OPT_CFLAGS += -Wno-address-of-packed-member
 endif
-ifeq "$(shell expr `echo $(CROSS_GCC_VER) | cut -f1 -d.` \== 10)" "1"
-	#There might be a bug in GCC10 that cannot detect initialization correctly.
-	CFLAGS += -Wno-error=uninitialized
-	CFLAGS += -Wno-error=format-overflow
+ifeq "$(shell expr $(CROSS_GCC_VER_MAJOR) \>= 10)" "1"
+	OPT_CFLAGS += -Wno-error=uninitialized
+	OPT_CFLAGS += -Wno-error=format-overflow
 	CFLAGS += -fcommon
-ifeq "$(shell expr `echo $(CROSS_GCC_VER) | cut -f2 -d.` \== 2)" "1"
-	CFLAGS += -Wno-zero-length-bounds
+	OPT_CFLAGS += -Wno-zero-length-bounds
 endif
-endif
-ifeq "$(shell expr `echo $(CROSS_GCC_VER) | cut -f1 -d.` \== 12)" "1"
-	CFGFLAGS += -flarge-source-files
-	CFGFLAGS += -Wno-error=address
+ifeq "$(shell expr $(CROSS_GCC_VER_MAJOR) \>= 12)" "1"
+	CFLAGS += -flarge-source-files
+	OPT_CFLAGS += -Wno-error=address
 	export LIBNSL_DEPRECATED := 1
 endif
+ifeq "$(shell expr $(CROSS_GCC_VER_MAJOR) \>= 13)" "1"
+	OPT_CFLAGS += -Wno-error=enum-int-mismatch
+	CFLAGS += -fcf-protection
+endif
 endif # Compiler-specific CFLAGS
 
 #XLDK-568 fix inline references
 CFGFLAGS += -fgnu89-inline
 
-#XLR-54
-CFLAGS += -Wno-unused-variable #SDK-232993
-CFLAGS += -Wno-deprecated-declarations #SDK-233174
-
-#CFLAGS += -Wno-unused-function
-#CFLAGS += -Wno-aggressive-loop-optimizations
-#CFLAGS += -Wno-maybe-uninitialized
-
 # set up KFLAGS appropriately. #
 ifeq (,$(KFLAGS))
 KFLAGS := -L$(TOOLCHAIN_DIR)/lib -L$(TOOLCHAIN_DIR)/lib64 -I$(KERNDIR) -lc -nostdinc -isystem $(SYSINC) -Iinclude -I$(KERNDIR)/arch/x86/include -I$(KERNDIR)/arch/x86/include/generated -I$(KERNDIR)/arch/x86/include/generated/uapi -I$(KERNDIR)/arch/x86/include/uapi -I$(KERNDIR)/include -I$(KERNDIR)/include/generated -I$(KERNDIR)/include/generated/uapi -I$(KERNDIR)/include/uapi -include $(KERNDIR)/include/generated/autoconf.h -D__KERNEL__ -DNDEBUG -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -Wno-format-security -fno-delete-null-pointer-checks -Os -mno-sse -m64 -mtune=generic -mno-red-zone -mcmodel=kernel -fstack-protector -DCONFIG_AS_CFI=1 -DCONFIG_AS_CFI_SIGNAL_FRAME=1 -pipe -Wno-sign-compare -fno-asynchronous-unwind-tables -fno-omit-frame-pointer -Wdeclaration-after-statement -Wno-pointer-sign -fno-dwarf2-cfi-asm
diff --git a/platform/broadcom/saibcm-modules/make/Makefile.linux-iproc b/platform/broadcom/saibcm-modules/make/Makefile.linux-iproc
index c38f713082bb..5e6a37d16197 100644
--- a/platform/broadcom/saibcm-modules/make/Makefile.linux-iproc
+++ b/platform/broadcom/saibcm-modules/make/Makefile.linux-iproc
@@ -39,13 +39,13 @@ ifeq (BE,$(ENDIAN_MODE))
 #While BE mode is supported, it's use is very limited.  We had a specific customer
 #request for BE support but don't currently mainstream it.  So a 5.1.0 version
 #has not been built.  Continue using 5.0.3 for any BE support
-TOOLCHAIN_BASE_DIR ?= /projects/ntsw-tools/linux/iproc_ldks/xldk61-be/XLDK32
+TOOLCHAIN_BASE_DIR ?= /projects/ntsw-tools/linux/iproc_ldks/xldk63-be/XLDK32
 KERN_BASE_DIR ?= $(TOOLCHAIN_BASE_DIR)
 TARGET_ARCHITECTURE:=armeb-broadcom-linux-uclibcgnueabi
 KERNDIR ?= $(TOOLCHAIN_BASE_DIR)/kernel/linux
 else
-TOOLCHAIN_BASE_DIR ?= /projects/ntsw-tools/linux/iproc_ldks/xldk62/XLDK32
-KERN_BASE_DIR ?= /projects/ntsw-tools/linux/iproc_ldks/xldk62/XLDK32
+TOOLCHAIN_BASE_DIR ?= /projects/ntsw-tools/linux/iproc_ldks/xldk63/XLDK32
+KERN_BASE_DIR ?= $(TOOLCHAIN_BASE_DIR)
 TARGET_ARCHITECTURE:= arm-broadcom-linux-uclibcgnueabi
 KERNDIR ?= $(KERN_BASE_DIR)/kernel/linux
 endif
@@ -77,32 +77,32 @@ ENDIAN = LE_HOST=1
 endif
 
 CFLAGS += -fno-aggressive-loop-optimizations
-CFLAGS += -Wno-error=maybe-uninitialized
-CFLAGS += -Wno-error=unused-function
-CFLAGS += -Wno-error=array-bounds
-CFLAGS += -Wno-error=unused-variable
-CFLAGS += -Wno-error=memset-elt-size #SDK-232626
-CFLAGS += -Wno-error=unused-const-variable
+OPT_CFLAGS += -Wno-error=maybe-uninitialized
+OPT_CFLAGS += -Wno-error=unused-function
+OPT_CFLAGS += -Wno-error=array-bounds
+OPT_CFLAGS += -Wno-error=unused-variable
+OPT_CFLAGS += -Wno-error=memset-elt-size #SDK-232626
+OPT_CFLAGS += -Wno-error=unused-const-variable
 CFLAGS += -fgnu89-inline
 ifeq "$(shell expr $(CROSS_GCC_VER_MAJOR) \>= 8)" "1"
-    CFLAGS += -Wno-stringop-overflow
-    CFLAGS += -Wno-stringop-truncation
-    CFLAGS += -Wno-error=restrict
+    OPT_CFLAGS += -Wno-stringop-overflow
+    OPT_CFLAGS += -Wno-stringop-truncation
+    OPT_CFLAGS += -Wno-error=restrict
 endif
 ifeq "$(shell expr $(CROSS_GCC_VER_MAJOR) \>= 9)" "1"
-	CFLAGS += -Wno-address-of-packed-member
+	OPT_CFLAGS += -Wno-address-of-packed-member
 endif
 ifeq "$(shell expr $(CROSS_GCC_VER_MAJOR) \>= 10)" "1"
-	CFLAGS += -Wno-error=uninitialized
-	CFLAGS += -Wno-error=format-overflow
+	OPT_CFLAGS += -Wno-error=uninitialized
+	OPT_CFLAGS += -Wno-error=format-overflow
 	CFLAGS += -fcommon
 endif
 ifeq "$(shell expr $(CROSS_GCC_VER_MAJOR) \>= 12)" "1"
 	CFLAGS += -flarge-source-files
-	CFLAGS += -Wno-error=address
+	OPT_CFLAGS += -Wno-error=address
 endif
 ifeq "$(shell expr $(CROSS_GCC_VER_MAJOR) \>= 13)" "1"
-	CFLAGS += -Wno-error=enum-int-mismatch
+	OPT_CFLAGS += -Wno-error=enum-int-mismatch
 endif
 
 CFGFLAGS += -D$(ENDIAN) -DIPROC_CMICD
diff --git a/platform/broadcom/saibcm-modules/make/Makefile.linux-iproc_64 b/platform/broadcom/saibcm-modules/make/Makefile.linux-iproc_64
index c98be8a2c04f..1a5f5bb73284 100644
--- a/platform/broadcom/saibcm-modules/make/Makefile.linux-iproc_64
+++ b/platform/broadcom/saibcm-modules/make/Makefile.linux-iproc_64
@@ -43,13 +43,13 @@ endif
 ifeq (BE,$(ENDIAN_MODE))
 #We've never actually built a 64 BE executable.  Just here for any future
 #customer requirements.
-TOOLCHAIN_BASE_DIR ?= /projects/ntsw-tools/linux/iproc_ldks/xldk61-be/XLDK64
+TOOLCHAIN_BASE_DIR ?= /projects/ntsw-tools/linux/iproc_ldks/xldk63-be/XLDK64
 KERN_BASE_DIR ?= $(TOOLCHAIN_BASE_DIR)
 TARGET_ARCHITECTURE ?= aarch64_be-broadcom-linux-uclibc
 KERNDIR ?= $(KERN_BASE_DIR)/kernel/linux
 else
-TOOLCHAIN_BASE_DIR ?= /projects/ntsw-tools/linux/iproc_ldks/xldk62/XLDK64
-KERN_BASE_DIR ?= /projects/ntsw-tools/linux/iproc_ldks/xldk62/XLDK64
+TOOLCHAIN_BASE_DIR ?= /projects/ntsw-tools/linux/iproc_ldks/xldk63/XLDK64
+KERN_BASE_DIR ?= $(TOOLCHAIN_BASE_DIR)
 TARGET_ARCHITECTURE ?= aarch64-broadcom-linux-uclibc
 KERNDIR ?= $(KERN_BASE_DIR)/kernel/linux
 endif
@@ -59,6 +59,7 @@ CROSS_COMPILE:= $(TARGET_ARCHITECTURE)-
 endif
 
 # A72 tools
+# Setting default path
 # JIRA SONIC-69062
 TOOLCHAIN_BIN_DIR?=$(TOOLCHAIN_BASE_DIR)/buildroot/host/usr/bin
 override PATH:=$(TOOLCHAIN_BASE_DIR)/buildroot/host/usr/$(TARGET_ARCHITECTURE)/bin:$(TOOLCHAIN_BIN_DIR):$(PATH)
@@ -80,34 +81,35 @@ else
 CFGFLAGS += -DSYS_BE_PIO=0 -DSYS_BE_PACKET=0 -DSYS_BE_OTHER=0
 ENDIAN = LE_HOST=1
 endif
-
-CFLAGS += -DPTRS_ARE_64BITS -DLONGS_ARE_64BITS
-CFLAGS += -DPHYS_ADDRS_ARE_64BITS
+# JIRA SONIC-69062
+CFGFLAGS += -Wp,-w 
+CFGFLAGS += -DPTRS_ARE_64BITS -DLONGS_ARE_64BITS
+CFGFLAGS += -DPHYS_ADDRS_ARE_64BITS
 CFLAGS += -fno-aggressive-loop-optimizations -fno-strict-overflow
-CFLAGS += -Wno-error=maybe-uninitialized
-CFLAGS += -Wno-error=unused-function
-CFLAGS += -Wno-error=array-bounds
-CFLAGS += -Wno-error=format-overflow
+OPT_CFLAGS += -Wno-error=maybe-uninitialized
+OPT_CFLAGS += -Wno-error=unused-function
+OPT_CFLAGS += -Wno-error=array-bounds
+OPT_CFLAGS += -Wno-error=format-overflow
 CFLAGS += -fgnu89-inline
 ifeq "$(shell expr $(CROSS_GCC_VER_MAJOR) \>= 8)" "1"
-    CFLAGS += -Wno-stringop-overflow
-    CFLAGS += -Wno-stringop-truncation
-    CFLAGS += -Wno-error=restrict
+    OPT_CFLAGS += -Wno-stringop-overflow
+    OPT_CFLAGS += -Wno-stringop-truncation
+    OPT_CFLAGS += -Wno-error=restrict
 endif
 ifeq "$(shell expr $(CROSS_GCC_VER_MAJOR) \>= 9)" "1"
-	CFLAGS += -Wno-address-of-packed-member
+	OPT_CFLAGS += -Wno-address-of-packed-member
 endif
 ifeq "$(shell expr $(CROSS_GCC_VER_MAJOR) \>= 10)" "1"
-	CFLAGS += -Wno-error=uninitialized
-	CFLAGS += -Wno-error=format-overflow
+	OPT_CFLAGS += -Wno-error=uninitialized
+	OPT_CFLAGS += -Wno-error=format-overflow
 	CFLAGS += -fcommon
 endif
 ifeq "$(shell expr $(CROSS_GCC_VER_MAJOR) \>= 12)" "1"
 	CFLAGS += -flarge-source-files
-	CFLAGS += -Wno-error=address
+	OPT_CFLAGS += -Wno-error=address
 endif
 ifeq "$(shell expr $(CROSS_GCC_VER_MAJOR) \>= 13)" "1"
-	CFLAGS += -Wno-error=enum-int-mismatch
+	OPT_CFLAGS += -Wno-error=enum-int-mismatch
 endif
 
 CFGFLAGS += -D$(ENDIAN) -DIPROC_CMICD
diff --git a/platform/broadcom/saibcm-modules/make/Makefile.linux-kernel-4_18 b/platform/broadcom/saibcm-modules/make/Makefile.linux-kernel-4_18
index 535222656875..59953d5ab67e 100644
--- a/platform/broadcom/saibcm-modules/make/Makefile.linux-kernel-4_18
+++ b/platform/broadcom/saibcm-modules/make/Makefile.linux-kernel-4_18
@@ -44,6 +44,7 @@ ifeq ($(USE_CLANG),1)
 CC	= $(LSRUN) $(CROSS_COMPILE)gcc
 endif
 endif
+export CC
 
 ifeq ($(origin CXX),default)
 CXX	= $(CROSS_COMPILE)g++
diff --git a/platform/broadcom/saibcm-modules/make/Makefile.linux-slk b/platform/broadcom/saibcm-modules/make/Makefile.linux-slk
index fe20b9d5892c..8cdb29fd8af3 100644
--- a/platform/broadcom/saibcm-modules/make/Makefile.linux-slk
+++ b/platform/broadcom/saibcm-modules/make/Makefile.linux-slk
@@ -93,21 +93,21 @@ CLANG_ADD_CFLAGS += --target=$(TARGET_ARCHITECTURE) --gcc-toolchain=$(TOOLCHAIN_
 export KERNEL_LLVM = 0
 OPT_KERNEL_TOOLCHAIN = CC=$(CROSS_COMPILE)gcc LD=$(CROSS_COMPILE)ld AR=$(CROSS_COMPILE)ar
 else
-CFLAGS += -Wno-unused-value -Wno-unused-but-set-variable -Wno-sizeof-pointer-memaccess -fno-aggressive-loop-optimizations
+OPT_CFLAGS += -Wno-unused-value -Wno-unused-but-set-variable -Wno-sizeof-pointer-memaccess -fno-aggressive-loop-optimizations
 endif
 
 ifdef DPP_CHIPS
-CFLAGS += -DDUNE_BCM -D__DUNE_LINUX_BCM_CPU_PCP_DMA__
+CFGFLAGS += -DDUNE_BCM -D__DUNE_LINUX_BCM_CPU_PCP_DMA__
 CFGFLAGS += -DSOC_CM_FUNCTION
 endif
 
 ifdef DFE_CHIPS
-CFLAGS += -DDUNE_BCM
+CFGFLAGS += -DDUNE_BCM
 CFGFLAGS += -DSOC_CM_FUNCTION
 endif
 
 ifdef SAND_CHIPS
-CFLAGS += -D__DUNE_SLK_BCM_CPU__ -D__DUNE_LINUX_BCM_CPU_PCIE__
+CFGFLAGS += -D__DUNE_SLK_BCM_CPU__ -D__DUNE_LINUX_BCM_CPU_PCIE__
 endif
 
 # Enable cached DMA memory by default
diff --git a/platform/broadcom/saibcm-modules/make/Makefile.linux-x86-5_10 b/platform/broadcom/saibcm-modules/make/Makefile.linux-x86-5_10
index 4463b1c88b3b..5d9387774730 100644
--- a/platform/broadcom/saibcm-modules/make/Makefile.linux-x86-5_10
+++ b/platform/broadcom/saibcm-modules/make/Makefile.linux-x86-5_10
@@ -44,65 +44,48 @@
 
 # some basic path variables for tools and kernel source, etc #
 
-ifeq (1,$(NO_PRECOMPILED_MODULE))
-# {
-#
-# This is set due to some issue in binutils which has been fixed, apparently, in versions beyond 2.32.
-# If this is not used, an error 'File format not recognized' is ejected and the compilation fails.
-#
-export BINUTILSVER := 2.33.1
-# }
-else
-# {
-export BINUTILSVER := 2.38
-# }
-endif
+export BINUTILSVER := 2.41
+
 #
 # For ESW compilation, suppress 'stringop-overflow'
 #
 ifeq ($(BCM_ESW_SUPPORT),1)
-    CFGFLAGS += -Wno-error=stringop-overflow
+    OPT_CFLAGS += -Wno-error=stringop-overflow
 endif
 ifeq (1,$(GCC_12_1_0))
-    export BINUTILSVER := 2.38
     export GCCVER := 12.1.0
     TOOLCHAIN_DIR = /tools/oss/packages/x86_64-rhel7/gcc/$(GCCVER)
-    CFGFLAGS += -Wno-error=address
-    CFGFLAGS += -Wno-error=format
-    CFGFLAGS += -Wno-error=long-long
-    CFGFLAGS += -Wno-error=pedantic
-    CFGFLAGS += -Wno-variadic-macros
-    CFGFLAGS += -Wno-error=overlength-strings
 else ifeq (1,$(GCC_13_1_0))
-    export BINUTILSVER := 2.38
     export GCCVER := 13.1.0
     TOOLCHAIN_DIR = /projects/ntsw-tools/linux/gcc/13.1.0
     ifneq ($(DEBUG_OPTIMIZE),FALSE)
     # {
       # These flags are required for -O2 'optimized' compilation
+      # We leave the suppression of array-bounds since, currently,
+      # GCC emits many 'false positive' errors of this kind (among a
+      # few that are justified)
       #
-      CFGFLAGS += -Wno-error=stringop-truncation
-      CFGFLAGS += -Wno-error=array-bounds=
+      OPT_CFLAGS += -Wno-error=array-bounds=
     # }
     endif
-    CFGFLAGS += -Wno-error=address
-    CFGFLAGS += -Wno-error=enum-int-mismatch
-    CFGFLAGS += -Wno-error=format
-    CFGFLAGS += -Wno-variadic-macros
 else
-    export BINUTILSVER := 2.38
     export GCCVER := 11.2.0
     TOOLCHAIN_DIR = /projects/ntsw-tools/linux/gcc/11.2.0-x86_64
     ifneq ($(USE_CLANG),1)
-      CFGFLAGS += -Wno-error=sizeof-array-div
-      CFGFLAGS += -Wno-error=stringop-truncation
-      CFGFLAGS += -Wno-error=maybe-uninitialized
-      CFGFLAGS += -Wno-error=stringop-overread
-      CFGFLAGS += -Wno-error=format-overflow
-      CFGFLAGS += -Wno-error=array-bounds
+      OPT_CFLAGS += -Wno-error=array-bounds
     endif
 endif
 
+#The LCOV tool is not compatible with GCC version 9.x and newer, thus we are forced to compile with older one.
+ifeq (1,$(GCOV))
+  ifeq ($(targetplat),user)
+    # GCC 8.1 does not work with binutils 2.41 and newer
+    export BINUTILSVER := 2.38
+    export GCCVER := 8.1.0
+    TOOLCHAIN_DIR = /tools/oss/packages/x86_64-rhel7/gcc/$(GCCVER)
+  endif
+endif
+
 BINUTILS_DIR = /tools/oss/packages/x86_64-rhel7/binutils/$(BINUTILSVER)/bin
 export TCL860 := 1
 
@@ -138,20 +121,20 @@ export SYSINC := $(TOOLCHAIN_DIR)/lib/gcc/$(TARGET_ARCHITECTURE)/$(GCCVER)/inclu
 
 # CFLAGS/CFGFLAGS #
 ifdef SAND_CHIPS
-CFLAGS += -D__DUNE_GTS_BCM_CPU__
+CFGFLAGS += -D__DUNE_GTS_BCM_CPU__
 endif
-CFLAGS += -DUSE_LINUX_BDE_MMAP=1
-#CFLAGS += -DBDE_LINUX_USE_MSI_INTERRUPT
+CFGFLAGS += -DUSE_LINUX_BDE_MMAP=1
+#CFGFLAGS += -DBDE_LINUX_USE_MSI_INTERRUPT
 #
 #Flags to prevent gcc 8.1.0 new warnings to appear as errors.
 #(All these flags have been removed so as to activate the maximal types of
 #warning)
 #
-#CFLAGS += -Wno-error=unused-value
-#CFLAGS += -Wno-error=unused-but-set-variable
-#CFLAGS += -Wno-error=maybe-uninitialized
-#CFLAGS += -Wno-error=aggressive-loop-optimizations
-#CFLAGS += -Wno-error=array-bounds
+#OPT_CFLAGS += -Wno-error=unused-value
+#OPT_CFLAGS += -Wno-error=unused-but-set-variable
+#OPT_CFLAGS += -Wno-error=maybe-uninitialized
+#OPT_CFLAGS += -Wno-error=aggressive-loop-optimizations
+#OPT_CFLAGS += -Wno-error=array-bounds
 
 # set up KFLAGS appropriately. #
 # -fno-builtin needed for using kernel's version of memcpy instead of the gcc inline version
@@ -191,13 +174,13 @@ endif
 CFGFLAGS += -DSAL_SPL_LOCK_ON_IRQ
 
 ifeq (,$(BUILD_32BITS_EXEC))
-CFLAGS += -DPTRS_ARE_64BITS -DLONGS_ARE_64BITS
+CFGFLAGS += -DPTRS_ARE_64BITS -DLONGS_ARE_64BITS
 else
 CFLAGS += -m32
 EXTRA_USER_LDFLAGS += -m32
 CFGFLAGS += -DSAL_BDE_32BIT_USER_64BIT_KERNEL
 endif
-CFLAGS += -DPHYS_ADDRS_ARE_64BITS
+CFGFLAGS += -DPHYS_ADDRS_ARE_64BITS
 
 
 ###########################################################################################
diff --git a/platform/broadcom/saibcm-modules/make/Makefile.linux-x86-64-fc28 b/platform/broadcom/saibcm-modules/make/Makefile.linux-x86-64-fc28
index 5e86e1d579f2..1533626e5087 100644
--- a/platform/broadcom/saibcm-modules/make/Makefile.linux-x86-64-fc28
+++ b/platform/broadcom/saibcm-modules/make/Makefile.linux-x86-64-fc28
@@ -44,64 +44,40 @@
 
 # some basic path variables for tools and kernel source, etc #
 
-ifeq (1,$(NO_PRECOMPILED_MODULE))
-# {
-#
-# This is set due to some issue in binutils which has been fixed, apparently, in versions beyond 2.32.
-# If this is not used, an error 'File format not recognized' is ejected and the compilation fails.
-#
-export BINUTILSVER := 2.33.1
-# }
-else
-# {
-export BINUTILSVER := 2.38
-# }
-endif
-
 #
 # For ESW compilation, suppress 'stringop-overflow'
 #
 ifeq ($(BCM_ESW_SUPPORT),1)
-    CFGFLAGS += -Wno-error=stringop-overflow
+    OPT_CFLAGS += -Wno-error=stringop-overflow
 endif
 ifeq (1,$(GCC_11_2_0))
-  export BINUTILSVER := 2.38
+  export BINUTILSVER := 2.41
   export GCCVER := 11.2.0
   TOOLCHAIN_DIR = /projects/ntsw-tools/linux/gcc/11.2.0-x86_64
-  CFGFLAGS += -Wno-error=stringop-truncation
-  CFGFLAGS += -Wno-error=maybe-uninitialized
-  CFGFLAGS += -Wno-error=stringop-overread
-  CFGFLAGS += -Wno-error=format-overflow
-  CFGFLAGS += -Wno-error=array-bounds
+  OPT_CFLAGS += -Wno-error=array-bounds
 else
   ifeq (1,$(GCC_12_1_0))
-    export BINUTILSVER := 2.38
+    export BINUTILSVER := 2.41
     export GCCVER := 12.1.0
     TOOLCHAIN_DIR = /tools/oss/packages/x86_64-rhel7/gcc/$(GCCVER)
-    CFGFLAGS += -Wno-error=address
-    CFGFLAGS += -Wno-error=format
-    CFGFLAGS += -Wno-error=long-long
-    CFGFLAGS += -Wno-error=pedantic
-    CFGFLAGS += -Wno-variadic-macros
-    CFGFLAGS += -Wno-error=overlength-strings
   else
     ifeq (1,$(GCC_13_1_0))
-      export BINUTILSVER := 2.38
+      export BINUTILSVER := 2.41
       export GCCVER := 13.1.0
       TOOLCHAIN_DIR = /projects/ntsw-tools/linux/gcc/13.1.0
       ifneq ($(DEBUG_OPTIMIZE),FALSE)
       # {
         # These flags are required for -O2 'optimized' compilation
+        # We leave the suppression of array-bounds since, currently,
+        # GCC emits many 'false positive' errors of this kind (among a
+        # few that are justified)
         #
-        CFGFLAGS += -Wno-error=stringop-truncation
-        CFGFLAGS += -Wno-error=array-bounds=
+        OPT_CFLAGS += -Wno-error=array-bounds=
       # }
       endif
-      CFGFLAGS += -Wno-error=address
-      CFGFLAGS += -Wno-error=enum-int-mismatch
-      CFGFLAGS += -Wno-error=format
-      CFGFLAGS += -Wno-variadic-macros
     else
+      # GCC 8.1 does not work with binutils 2.41 and newer
+      export BINUTILSVER := 2.38
       export GCCVER := 8.1.0
       TOOLCHAIN_DIR = /tools/oss/packages/x86_64-rhel7/gcc/$(GCCVER)
     endif
@@ -155,11 +131,11 @@ CFGFLAGS += -DUSE_LINUX_BDE_MMAP=1
 #(All these flags have been removed so as to activate the maximal types of
 #warning)
 #
-#CFLAGS += -Wno-error=unused-value
-#CFLAGS += -Wno-error=unused-but-set-variable
-#CFLAGS += -Wno-error=maybe-uninitialized
-#CFLAGS += -Wno-error=aggressive-loop-optimizations
-#CFLAGS += -Wno-error=array-bounds
+#OPT_CFLAGS += -Wno-error=unused-value
+#OPT_CFLAGS += -Wno-error=unused-but-set-variable
+#OPT_CFLAGS += -Wno-error=maybe-uninitialized
+#OPT_CFLAGS += -Wno-error=aggressive-loop-optimizations
+#OPT_CFLAGS += -Wno-error=array-bounds
 
 # set up KFLAGS appropriately. #
 # -fno-builtin needed for using kernel's version of memcpy instead of the gcc inline version
diff --git a/platform/broadcom/saibcm-modules/make/Makefile.linux-x86-generic-common-2_6 b/platform/broadcom/saibcm-modules/make/Makefile.linux-x86-generic-common-2_6
index 726c2ea29e80..bbfcc82867ca 100644
--- a/platform/broadcom/saibcm-modules/make/Makefile.linux-x86-generic-common-2_6
+++ b/platform/broadcom/saibcm-modules/make/Makefile.linux-x86-generic-common-2_6
@@ -34,12 +34,15 @@ endif
 
 # Default architecture
 ifeq (,$(ARCH))
-ARCH = $(shell uname -p)
+ARCH = $(shell uname -m)
 ifneq (x86_64,$(ARCH))
 ARCH = i386
 endif
 endif
 
+# Target machine for EDK-Host defconfig
+TARGET_MACHINE ?= x86_64
+
 # Noisy kernel build
 KBUILD_VERBOSE = 1
 
diff --git a/platform/broadcom/saibcm-modules/make/Makefile.linux-x86-smp_generic_64-2_6 b/platform/broadcom/saibcm-modules/make/Makefile.linux-x86-smp_generic_64-2_6
index e34cc42b3054..90651a357298 100644
--- a/platform/broadcom/saibcm-modules/make/Makefile.linux-x86-smp_generic_64-2_6
+++ b/platform/broadcom/saibcm-modules/make/Makefile.linux-x86-smp_generic_64-2_6
@@ -45,6 +45,17 @@ ifneq (,$(shell ls $(LINUX_UAPI) 2>/dev/null))
 KFLAGS += -I$(LINUX_INCLUDE)/uapi -I$(LINUX_INCLUDE)/generated/uapi -I$(KERNDIR)/arch/x86/include/generated -I$(KERNDIR)/arch/x86/include/uapi -I$(KERNDIR)/arch/x86/include/generated/uapi
 endif
 
+GCC_MAJOR_VER  = $(shell GCCVER=$(GCCVER) $(CC) -dumpversion | cut -d'.' -f1)
+
+ifeq (${GCC_MAJOR_VER}, 11)
+	CFGFLAGS += -Wno-error=sizeof-array-div
+	CFGFLAGS += -Wno-error=stringop-overread
+endif
+CFGFLAGS += -Wno-error=stringop-truncation
+CFGFLAGS += -Wno-error=maybe-uninitialized
+CFGFLAGS += -Wno-error=format-overflow
+CFGFLAGS += -Wno-error=array-bounds
+
 ifdef LTSW_CHIPS
 # Ensure we do not use an out-of-date libelf.so
 ELFUTILS_MIN = 158
diff --git a/platform/broadcom/saibcm-modules/make/Makefile.linux-xlr b/platform/broadcom/saibcm-modules/make/Makefile.linux-xlr
index 5ac089618a60..2f7b90d0636a 100644
--- a/platform/broadcom/saibcm-modules/make/Makefile.linux-xlr
+++ b/platform/broadcom/saibcm-modules/make/Makefile.linux-xlr
@@ -43,14 +43,18 @@
 #endif
 
 # some basic path variables for tools and kernel source, etc #
-XLR_TOOLS_BASE ?= /projects/ntsw-tools/linux/gcc12.2
+XLR_TOOLS_BASE ?= /projects/ntsw-tools/linux/xlr-66
 TOOLCHAIN_DIR = $(XLR_TOOLS_BASE)/buildroot/host/usr
-KERNDIR       ?= /projects/ntsw-tools/linux/xlr-510/kernel/linux
+ifeq (1,$(USE_CLANG))
+KERNDIR = $(XLR_TOOLS_BASE)/kernel/linux-clang
+endif
+KERNDIR ?= $(XLR_TOOLS_BASE)/kernel/linux
+
 # Target machine for EDK-Host defconfig
 TARGET_MACHINE ?= x86_64
 
 # set up cross compile prefix, tools dir variables. #
-export CROSS_COMPILE := x86_64-broadcom-linux-gnu-
+export CROSS_COMPILE := x86_64-linux-
 export TOOLS_DIR     := $(TOOLCHAIN_DIR)/bin
 
 # architecture. #
@@ -68,6 +72,7 @@ export PATH         := $(TOOLCHAIN_DIR)/bin:$(KERNDIR):$(PATH)
 
 # set up SYSINC path #
 CROSS_GCC_VER ?= $(shell $(TOOLCHAIN_DIR)/bin/$(CROSS_COMPILE)gcc -dumpversion)
+CROSS_GCC_VER_MAJOR := $(shell echo $(CROSS_GCC_VER) | cut -f1 -d.)
 export SYSINC := $(TOOLCHAIN_DIR)/lib/gcc/$(TARGET_ARCHITECTURE)/$(CROSS_GCC_VER)/include
 
 # Glibc 2.27 or later version doesn't support SVID libm error handling.
@@ -75,67 +80,61 @@ export SYSINC := $(TOOLCHAIN_DIR)/lib/gcc/$(TARGET_ARCHITECTURE)/$(CROSS_GCC_VER
 export TCL840  := 1
 
 # Common CFLAGS
-CFLAGS += -DUSE_LINUX_BDE_MMAP=1
-#CFLAGS += -DBDE_LINUX_USE_MSI_INTERRUPT
-CFLAGS += -Wno-error=unused-value
-CFLAGS += -Wno-error=unused-function
-CFLAGS += -Wno-error=cpp
-CFLAGS += -Wno-error=array-bounds
-CFLAGS += -Wno-error=strict-overflow
+CFGFLAGS += -DUSE_LINUX_BDE_MMAP=1
+#CFGFLAGS += -DBDE_LINUX_USE_MSI_INTERRUPT
+OPT_CFLAGS += -Wno-error=unused-value
+OPT_CFLAGS += -Wno-error=unused-function
+OPT_CFLAGS += -Wno-error=cpp
+OPT_CFLAGS += -Wno-error=array-bounds
+OPT_CFLAGS += -Wno-error=strict-overflow
 CFLAGS += -L$(TOOLCHAIN_DIR)/lib
 CFLAGS += -L$(TOOLCHAIN_DIR)/lib64
-#CFLAGS += -Wl,--rpath=/lib64                                 # may need to set rpath and dynamic-linker path here (and possibly in KLFAGS below) in the future, #
-#CFLAGS += -Wl,--dynamic-linker=/lib64/ld-linux-x86-64.so.2   # if we want to build the target executable to be used with shared libs #
+#OPT_CFLAGS += -Wl,--rpath=/lib64                                 # may need to set rpath and dynamic-linker path here (and possibly in KLFAGS below) in the future, #
+#OPT_CFLAGS += -Wl,--dynamic-linker=/lib64/ld-linux-x86-64.so.2   # if we want to build the target executable to be used with shared libs #
 
 # Compiler-specific CFLAGS
 ifeq (1,$(USE_CLANG)) # CLANG-specific CFLAGS
-CFLAGS += -Wno-strlcpy-strlcat-size
-CFLAGS += -Wno-strncat-size
-ifeq "$(shell expr `echo $(CROSS_GCC_VER) | cut -f1 -d.` \>= 12)" "1"
-export LIBNSL_DEPRECATED := 1
+OPT_CFLAGS += -Wno-strlcpy-strlcat-size
+OPT_CFLAGS += -Wno-strncat-size
+ifeq "$(shell expr $(CROSS_GCC_VER_MAJOR) \>= 12)" "1"
+	export LIBNSL_DEPRECATED := 1
 endif
-
 else # GCC-specific CFLAGS
-CFLAGS += -Wno-error=unused-but-set-variable
-CFLAGS += -Wno-error=maybe-uninitialized
-CFLAGS += -Wno-error=aggressive-loop-optimizations
-CFLAGS += -Wno-error=sizeof-pointer-div #SDK-233830
-CFLAGS += -Wno-error=memset-elt-size #SDK-232626
-ifeq "$(shell expr `echo $(CROSS_GCC_VER) | cut -f1 -d.` \>= 8)" "1"
-	CFLAGS += -Wno-stringop-overflow
-	CFLAGS += -Wno-stringop-truncation
-	CFLAGS += -Wno-error=restrict
+OPT_CFLAGS += -Wno-error=unused-but-set-variable
+OPT_CFLAGS += -Wno-error=maybe-uninitialized
+OPT_CFLAGS += -Wno-error=aggressive-loop-optimizations
+OPT_CFLAGS += -Wno-error=sizeof-pointer-div #SDK-233830
+OPT_CFLAGS += -Wno-error=memset-elt-size #SDK-232626
+OPT_CFLAGS += -Wno-error=unused-variable #SDK-232993
+OPT_CFLAGS += -Wno-deprecated-declarations #SDK-233174
+ifeq "$(shell expr $(CROSS_GCC_VER_MAJOR) \>= 8)" "1"
+	OPT_CFLAGS += -Wno-stringop-overflow
+	OPT_CFLAGS += -Wno-stringop-truncation
+	OPT_CFLAGS += -Wno-error=restrict
 endif
-ifeq "$(shell expr `echo $(CROSS_GCC_VER) | cut -f1 -d.` \>= 9)" "1"
-	CFLAGS += -Wno-address-of-packed-member
+ifeq "$(shell expr $(CROSS_GCC_VER_MAJOR) \>= 9)" "1"
+	OPT_CFLAGS += -Wno-address-of-packed-member
 endif
-ifeq "$(shell expr `echo $(CROSS_GCC_VER) | cut -f1 -d.` \== 10)" "1"
-	#There might be a bug in GCC10 that cannot detect initialization correctly.
-	CFLAGS += -Wno-error=uninitialized
-	CFLAGS += -Wno-error=format-overflow
+ifeq "$(shell expr $(CROSS_GCC_VER_MAJOR) \>= 10)" "1"
+	OPT_CFLAGS += -Wno-error=uninitialized
+	OPT_CFLAGS += -Wno-error=format-overflow
 	CFLAGS += -fcommon
-ifeq "$(shell expr `echo $(CROSS_GCC_VER) | cut -f2 -d.` \== 2)" "1"
-	CFLAGS += -Wno-zero-length-bounds
+	OPT_CFLAGS += -Wno-zero-length-bounds
 endif
-endif
-ifeq "$(shell expr `echo $(CROSS_GCC_VER) | cut -f1 -d.` \== 12)" "1"
-	CFGFLAGS += -flarge-source-files
-	CFGFLAGS += -Wno-error=address
+ifeq "$(shell expr $(CROSS_GCC_VER_MAJOR) \>= 12)" "1"
+	CFLAGS += -flarge-source-files
+	OPT_CFLAGS += -Wno-error=address
 	export LIBNSL_DEPRECATED := 1
 endif
+ifeq "$(shell expr $(CROSS_GCC_VER_MAJOR) \>= 13)" "1"
+	OPT_CFLAGS += -Wno-error=enum-int-mismatch
+	CFLAGS += -fcf-protection
+endif
 endif # Compiler-specific CFLAGS
 
 #XLDK-568 fix inline references
 CFGFLAGS += -fgnu89-inline
 
-#XLR-54
-CFLAGS += -Wno-unused-variable #SDK-232993
-CFLAGS += -Wno-deprecated-declarations #SDK-233174
-
-#CFLAGS += -Wno-unused-function
-#CFLAGS += -Wno-aggressive-loop-optimizations
-#CFLAGS += -Wno-maybe-uninitialized
-
 # set up KFLAGS appropriately. #
 ifeq (,$(KFLAGS))
 KFLAGS := -L$(TOOLCHAIN_DIR)/lib -L$(TOOLCHAIN_DIR)/lib64 -I$(KERNDIR) -lc -nostdinc -isystem $(SYSINC) -Iinclude -I$(KERNDIR)/arch/x86/include -I$(KERNDIR)/arch/x86/include/generated -I$(KERNDIR)/arch/x86/include/generated/uapi -I$(KERNDIR)/arch/x86/include/uapi -I$(KERNDIR)/include -I$(KERNDIR)/include/generated -I$(KERNDIR)/include/generated/uapi -I$(KERNDIR)/include/uapi -include $(KERNDIR)/include/generated/autoconf.h -D__KERNEL__ -DNDEBUG -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -Wno-format-security -fno-delete-null-pointer-checks -Os -mno-sse -m64 -mtune=generic -mno-red-zone -mcmodel=kernel -fstack-protector -DCONFIG_AS_CFI=1 -DCONFIG_AS_CFI_SIGNAL_FRAME=1 -pipe -Wno-sign-compare -fno-asynchronous-unwind-tables -fno-omit-frame-pointer -Wdeclaration-after-statement -Wno-pointer-sign -fno-dwarf2-cfi-asm
diff --git a/platform/broadcom/saibcm-modules/sdklt/Makefile b/platform/broadcom/saibcm-modules/sdklt/Makefile
index 5600a33a3508..968d2ad3e39b 100644
--- a/platform/broadcom/saibcm-modules/sdklt/Makefile
+++ b/platform/broadcom/saibcm-modules/sdklt/Makefile
@@ -56,11 +56,13 @@ KNET_BLDDIR := $(OUTPUT_DIR)/knet
 KNETCB_BLDDIR := $(OUTPUT_DIR)/knetcb
 BCMGENL_BLDDIR := $(OUTPUT_DIR)/bcmgenl
 GENL_PACKET_BLDDIR := $(OUTPUT_DIR)/genl-packet
+EDK_BLDDIR := $(OUTPUT_DIR)/edk
+PTP_BLDDIR := $(OUTPUT_DIR)/ptpclock
 
 LKM_CFLAGS += -UNGKNET_NETIF_MAX -DNGKNET_NETIF_MAX=1056 -UNGKNET_FILTER_MAX -DNGKNET_FILTER_MAX=1025
 export LKM_CFLAGS
 
-kmod: bde knet knetcb genl-packet bcmgenl
+kmod: bde knet knetcb genl-packet bcmgenl edk ptpclock
 
 bde:
 	$(MAKE) -C $(SDK)/linux/bde SDK=$(SDK) \
@@ -82,7 +84,6 @@ knetcb: knet
 bcmgenl: knet genl-packet
 	$(MAKE) -C $(SDK)/linux/bcmgenl SDK=$(SDK) \
 		KBUILD_EXTRA_SYMBOLS=$(KNET_BLDDIR)/Module.symvers \
-		KBUILD_EXTRA_SYMBOLS+=$(GENL_PACKET_BLDDIR)/Module.symvers \
 		LKM_BLDDIR=$(BCMGENL_BLDDIR) $(TARGET)
 	ln -sf $(BCMGENL_BLDDIR)/*.ko $(OUTPUT_DIR)
 
@@ -91,6 +92,19 @@ genl-packet:
 		LKM_BLDDIR=$(GENL_PACKET_BLDDIR) $(TARGET)
 	ln -sf $(GENL_PACKET_BLDDIR)/*.ko $(OUTPUT_DIR)
 
+edk: bde
+	$(MAKE) -C $(SDK)/linux/edk SDK=$(SDK) \
+		KBUILD_EXTRA_SYMBOLS=$(BDE_BLDDIR)/Module.symvers \
+		LKM_BLDDIR=$(EDK_BLDDIR) $(TARGET)
+	ln -sf $(EDK_BLDDIR)/*.ko $(OUTPUT_DIR)
+
+ptpclock: knet edk
+	$(MAKE) -C $(SDK)/linux/ptpclock SDK=$(SDK) \
+		KBUILD_EXTRA_SYMBOLS=$(KNET_BLDDIR)/Module.symvers \
+		KBUILD_EXTRA_SYMBOLS+=$(EDK_BLDDIR)/Module.symvers \
+		KBUILD_EXTRA_SYMBOLS+=$(BDE_BLDDIR)/Module.symvers \
+		LKM_BLDDIR=$(PTP_BLDDIR) $(TARGET)
+	ln -sf $(PTP_BLDDIR)/*.ko $(OUTPUT_DIR)
 clean:
 	$(MAKE) kmod TARGET=$@
 	rm -f $(OUTPUT_DIR)/*.ko
@@ -99,4 +113,4 @@ distclean:
 	$(MAKE) kmod TARGET=$@
 	rm -rf $(OUTPUT_DIR)
 
-.PHONY: help kmod bde knet knetcb genl-packet bcmgenl clean distclean
+.PHONY: help kmod bde knet knetcb genl-packet bcmgenl edk ptpclock clean distclean
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmcnet/hmi/cmicr/bcmcnet_cmicr2_pdma_rxtx.c b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/hmi/cmicr/bcmcnet_cmicr2_pdma_rxtx.c
index de9e2e3bdf09..74c78973fd13 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmcnet/hmi/cmicr/bcmcnet_cmicr2_pdma_rxtx.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/hmi/cmicr/bcmcnet_cmicr2_pdma_rxtx.c
@@ -351,6 +351,8 @@ bcmcnet_cmicr2_pdma_driver_attach(struct pdma_dev *dev)
 
     hw->dops.pkt_xmit = cmicr2_pdma_pkt_xmit;
 
+    dev->flags |= PDMA_NO_FCS;
+
     return SHR_E_NONE;
 }
 
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmcnet/include/bcmcnet/bcmcnet_core.h b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/include/bcmcnet/bcmcnet_core.h
index 6ab4327a3ffc..edc77c183356 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmcnet/include/bcmcnet/bcmcnet_core.h
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmcnet/include/bcmcnet/bcmcnet_core.h
@@ -23,8 +23,8 @@
 #ifndef BCMCNET_CORE_H
 #define BCMCNET_CORE_H
 
-#include "bcmcnet_types.h"
-#include "bcmcnet_internal.h"
+#include <bcmcnet/bcmcnet_types.h>
+#include <bcmcnet/bcmcnet_internal.h>
 
 /*!
  * \brief Packet header structure.
@@ -923,6 +923,8 @@ struct pdma_dev {
 #define PDMA_VNET_DOCKED    (1 << 5)
     /*! Abort PDMA mode for suspend and resume */
 #define PDMA_ABORT          (1 << 6)
+    /*! No FCS for Rx/Tx packets */
+#define PDMA_NO_FCS         (1 << 7)
 
     /*! Extra poll time in microseconds */
     int extra_poll_time;
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmdrd/include/bcmdrd/bcmdrd_types.h b/platform/broadcom/saibcm-modules/sdklt/bcmdrd/include/bcmdrd/bcmdrd_types.h
index 2dfa87a635fe..ea14c91f8dfe 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmdrd/include/bcmdrd/bcmdrd_types.h
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmdrd/include/bcmdrd/bcmdrd_types.h
@@ -186,7 +186,7 @@ bcmdrd_pbmp_parse(const char *str, bcmdrd_pbmp_t *pbmp);
  * the subsequent statement for all bits set in the port bitmap.
  *
  * \param [in] _pbmp Port bitmap.
- * \param [in] _port Port iterator variable.
+ * \param [out] _port Port iterator variable.
  */
 #define BCMDRD_PBMP_ITER(_pbmp, _port)                          \
     for (_port = 0; _port < BCMDRD_CONFIG_MAX_PORTS; _port++)   \
@@ -194,6 +194,28 @@ bcmdrd_pbmp_parse(const char *str, bcmdrd_pbmp_t *pbmp);
             _port += 31;                                        \
         else if (BCMDRD_PBMP_MEMBER(_pbmp, _port))
 
+/*!
+ * \brief Iterate over a port bitmap with maximum.
+ *
+ * Iterate over a port bitmap of type \ref bcmdrd_pbmp_t and execute
+ * the subsequent statement for all bits set in the port bitmap.
+ *
+ * The iteration will be terminated if the iterator variable reaches
+ * the value of \c _port_max. This macro is mainly intended to prevent
+ * false errors from static analysis tools like Coverity.
+ *
+ * \param [in] _pbmp Port bitmap.
+ * \param [in] _port_max Maximum number of ports.
+ * \param [out] _port Port iterator variable.
+ */
+#define BCMDRD_PBMP_MAX_ITER(_pbmp, _port_max, _port)           \
+    for (_port = 0;                                             \
+         _port < _port_max && _port < BCMDRD_CONFIG_MAX_PORTS;  \
+         _port++)                                               \
+        if (BCMDRD_PBMP_WORD(_pbmp, _port) == 0)                \
+            _port += 31;                                        \
+        else if (BCMDRD_PBMP_MEMBER(_pbmp, _port))
+
 /*!
  * \brief Add a port to a port bitmap.
  *
@@ -500,11 +522,34 @@ bcmdrd_pipemap_is_null(const bcmdrd_pipemap_t *pm);
  * bitmap.
  *
  * \param [in] _pm Pipe map.
- * \param [in] _pipe Pipe iterator variable.
+ * \param [out] _pipe Pipe iterator variable.
  */
-#define BCMDRD_PIPEMAP_ITER(_pm, _pipe)                    \
+#define BCMDRD_PIPEMAP_ITER(_pm, _pipe)                         \
     for (_pipe = 0; _pipe < BCMDRD_CONFIG_MAX_PIPES; _pipe++)   \
-        if (BCMDRD_PIPEMAP_WORD(_pm, _pipe) == 0)          \
+        if (BCMDRD_PIPEMAP_WORD(_pm, _pipe) == 0)               \
+            _pipe += 31;                                        \
+        else if (BCMDRD_PIPEMAP_MEMBER(_pm, _pipe))
+
+/*!
+ * \brief Iterate over a pipe map with maximum.
+ *
+ * Iterate over a pipe map of type \ref bcmdrd_pipemap_t and
+ * execute the subsequent statement for all bits set in the pipe
+ * bitmap.
+ *
+ * The iteration will be terminated if the iterator variable reaches
+ * the value of \c _pipe_max. This macro is mainly intended to prevent
+ * false errors from static analysis tools like Coverity.
+ *
+ * \param [in] _pm Pipe map.
+ * \param [in] _pipe_max Maximum number of pipes.
+ * \param [out] _pipe Pipe iterator variable.
+ */
+#define BCMDRD_PIPEMAP_MAX_ITER(_pm, _pipe_max, _pipe)          \
+    for (_pipe = 0;                                             \
+         _pipe < _pipe_max && _pipe < BCMDRD_CONFIG_MAX_PIPES;  \
+         _pipe++)                                               \
+        if (BCMDRD_PIPEMAP_WORD(_pm, _pipe) == 0)               \
             _pipe += 31;                                        \
         else if (BCMDRD_PIPEMAP_MEMBER(_pm, _pipe))
 
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmdrd/include/bcmdrd_config_chips.h b/platform/broadcom/saibcm-modules/sdklt/bcmdrd/include/bcmdrd_config_chips.h
index f222215a68f0..1829a2163944 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmdrd/include/bcmdrd_config_chips.h
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmdrd/include/bcmdrd_config_chips.h
@@ -26,17 +26,17 @@
  *
  *     (1) #define BCMDRD_CONFIG_INCLUDE_<CHIPNAME> [1|0]
  *             -- Include or exclude all revisions of the given device
- *             Example: #define BCMDRD_CONFIG_INCLUDE_BCM56780    1
+ *             Example: #define BCMDRD_CONFIG_INCLUDE_BCM56080    1
  *
  *     (2) #define BCMDRD_CONFIG_INCLUDE_<CHIPNAME>_<REV>X [1|0]
  *             -- Include or exclude all versions of the given revision
- *             Example: #define BCMDRD_CONFIG_INCLUDE_BCM56780_Ax 0
- *                      #define BCMDRD_CONFIG_INCLUde_BCM56780_Bx 1
+ *             Example: #define BCMDRD_CONFIG_INCLUDE_BCM56080_Ax 0
+ *                      #define BCMDRD_CONFIG_INCLUde_BCM56080_Bx 1
  *
  *     (3) #define BCMDRD_CONFIG_INCLUDE_<EXACT_CHIP> [1|0]
  *             -- Include or exclude an exact device
- *             Example: #define BCMDRD_CONFIG_INCLUDE_BCM56780_A0 1
- *                      #define BCMDRD_CONFIG_INCLUDE_BCM56780_A1 0
+ *             Example: #define BCMDRD_CONFIG_INCLUDE_BCM56080_A0 1
+ *                      #define BCMDRD_CONFIG_INCLUDE_BCM56080_A1 0
  *
  *
  * The value of BCMDRD_CONFIG_INCLUDE_CHIP_DEFAULT is used for any
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/bcmlrd_match_id_db.h b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/bcmlrd_match_id_db.h
index 79da85ad8a88..f30dacf5d1f1 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/bcmlrd_match_id_db.h
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/bcmlrd_match_id_db.h
@@ -159,6 +159,9 @@ typedef struct bcmlrd_pdd_info_s {
 
     /*! If set, then PDD is aligned from LSB. */
     bool is_lsb;
+
+    /*! Absolute offset of container in the container list. */
+    uint16_t bit_offset;
 } bcmlrd_pdd_info_t;
 
 /*!
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/chip/generated/bcmlrd_variant_defs_internal.h b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/chip/generated/bcmlrd_variant_defs_internal.h
index 20e2df1b9ee0..684b80a99702 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/chip/generated/bcmlrd_variant_defs_internal.h
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/chip/generated/bcmlrd_variant_defs_internal.h
@@ -29,7 +29,7 @@
 /*+replace reverse */
 #include "../../defs/generated/bcm78905_a0/bcm78905_a0_lrd_variant_def.h"
 #include "../../defs/generated/bcm78900_b0/bcm78900_b0_lrd_variant_def.h"
-#include "../../defs/generated/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_lrd_variant_def.h"
+#include "../../defs/generated/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_lrd_variant_def.h"
 #include "../../defs/generated/bcm78800_a0/bcm78800_a0_lrd_variant_def.h"
 #include "../../defs/generated/bcm56999_a0/bcm56999_a0_lrd_variant_def.h"
 #include "../../defs/generated/bcm56998_a0/bcm56998_a0_lrd_variant_def.h"
@@ -37,18 +37,18 @@
 #include "../../defs/generated/bcm56996_a0/bcm56996_a0_lrd_variant_def.h"
 #include "../../defs/generated/bcm56990_b0/bcm56990_b0_lrd_variant_def.h"
 #include "../../defs/generated/bcm56990_a0/bcm56990_a0_lrd_variant_def.h"
-#include "../../defs/generated/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_lrd_variant_def.h"
-#include "../../defs/generated/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_lrd_variant_def.h"
+#include "../../defs/generated/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_lrd_variant_def.h"
+#include "../../defs/generated/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_lrd_variant_def.h"
 #include "../../defs/generated/bcm56890_a0/bcm56890_a0_lrd_variant_def.h"
-#include "../../defs/generated/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_lrd_variant_def.h"
-#include "../../defs/generated/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_lrd_variant_def.h"
-#include "../../defs/generated/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_lrd_variant_def.h"
+#include "../../defs/generated/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_lrd_variant_def.h"
+#include "../../defs/generated/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_lrd_variant_def.h"
+#include "../../defs/generated/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_lrd_variant_def.h"
 #include "../../defs/generated/bcm56880_a0/bcm56880_a0_lrd_variant_def.h"
-#include "../../defs/generated/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_lrd_variant_def.h"
-#include "../../defs/generated/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_lrd_variant_def.h"
-#include "../../defs/generated/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_lrd_variant_def.h"
+#include "../../defs/generated/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_lrd_variant_def.h"
+#include "../../defs/generated/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_lrd_variant_def.h"
+#include "../../defs/generated/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_lrd_variant_def.h"
 #include "../../defs/generated/bcm56780_a0/bcm56780_a0_lrd_variant_def.h"
-#include "../../defs/generated/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_lrd_variant_def.h"
+#include "../../defs/generated/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_lrd_variant_def.h"
 #include "../../defs/generated/bcm56690_a0/bcm56690_a0_lrd_variant_def.h"
 #include "../../defs/generated/bcm56080_a0/bcm56080_a0_lrd_variant_def.h"
 /*-replace*/
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56080_a0/bcm56080_a0_lrd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56080_a0/bcm56080_a0_lrd_variant_def.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56690_a0/bcm56690_a0_lrd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56690_a0/bcm56690_a0_lrd_variant_def.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_lrd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_lrd_variant_def.h
old mode 100755
new mode 100644
similarity index 80%
rename from platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_lrd_variant_def.h
rename to platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_lrd_variant_def.h
index 4bc81f8e4740..c5376c11ef11
--- a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_lrd_variant_def.h
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_lrd_variant_def.h
@@ -24,13 +24,13 @@
  *
  ******************************************************************************/
 
-#ifndef GEN_BCM56690_A0_DNA_6_5_29_0_1_LRD_VARIANT_DEF_H
-#define GEN_BCM56690_A0_DNA_6_5_29_0_1_LRD_VARIANT_DEF_H
+#ifndef GEN_BCM56690_A0_DNA_6_5_31_7_0_LRD_VARIANT_DEF_H
+#define GEN_BCM56690_A0_DNA_6_5_31_7_0_LRD_VARIANT_DEF_H
 
 #ifndef DOXYGEN_IGNORE_AUTOGEN
 
-#define BCMLRD_VARIANT_BCM56690_A0_DNA_6_5_29_0_1 BCMLTD_VARIANT_BCM56690_A0_DNA_6_5_29_0_1
+#define BCMLRD_VARIANT_BCM56690_A0_DNA_6_5_31_7_0 BCMLTD_VARIANT_BCM56690_A0_DNA_6_5_31_7_0
 #endif /* DOXYGEN_IGNORE_AUTOGEN */
 
-#endif /* GEN_BCM56690_A0_DNA_6_5_29_0_1_LRD_VARIANT_DEF_H */
+#endif /* GEN_BCM56690_A0_DNA_6_5_31_7_0_LRD_VARIANT_DEF_H */
 
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56780_a0/bcm56780_a0_lrd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56780_a0/bcm56780_a0_lrd_variant_def.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_lrd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_lrd_variant_def.h
old mode 100755
new mode 100644
similarity index 80%
rename from platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_lrd_variant_def.h
rename to platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_lrd_variant_def.h
index 05347a2d6aa1..57b0eb30cd09
--- a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_lrd_variant_def.h
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_lrd_variant_def.h
@@ -24,13 +24,13 @@
  *
  ******************************************************************************/
 
-#ifndef GEN_BCM56780_A0_CNA_6_5_30_2_0_LRD_VARIANT_DEF_H
-#define GEN_BCM56780_A0_CNA_6_5_30_2_0_LRD_VARIANT_DEF_H
+#ifndef GEN_BCM56780_A0_CNA_6_5_31_3_0_LRD_VARIANT_DEF_H
+#define GEN_BCM56780_A0_CNA_6_5_31_3_0_LRD_VARIANT_DEF_H
 
 #ifndef DOXYGEN_IGNORE_AUTOGEN
 
-#define BCMLRD_VARIANT_BCM56780_A0_CNA_6_5_30_2_0 BCMLTD_VARIANT_BCM56780_A0_CNA_6_5_30_2_0
+#define BCMLRD_VARIANT_BCM56780_A0_CNA_6_5_31_3_0 BCMLTD_VARIANT_BCM56780_A0_CNA_6_5_31_3_0
 #endif /* DOXYGEN_IGNORE_AUTOGEN */
 
-#endif /* GEN_BCM56780_A0_CNA_6_5_30_2_0_LRD_VARIANT_DEF_H */
+#endif /* GEN_BCM56780_A0_CNA_6_5_31_3_0_LRD_VARIANT_DEF_H */
 
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_lrd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_lrd_variant_def.h
old mode 100755
new mode 100644
similarity index 80%
rename from platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_lrd_variant_def.h
rename to platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_lrd_variant_def.h
index 23f5c62f6f49..bdb8f646cfda
--- a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_lrd_variant_def.h
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_lrd_variant_def.h
@@ -24,13 +24,13 @@
  *
  ******************************************************************************/
 
-#ifndef GEN_BCM56780_A0_DNA_6_5_30_2_0_LRD_VARIANT_DEF_H
-#define GEN_BCM56780_A0_DNA_6_5_30_2_0_LRD_VARIANT_DEF_H
+#ifndef GEN_BCM56780_A0_DNA_6_5_31_7_0_LRD_VARIANT_DEF_H
+#define GEN_BCM56780_A0_DNA_6_5_31_7_0_LRD_VARIANT_DEF_H
 
 #ifndef DOXYGEN_IGNORE_AUTOGEN
 
-#define BCMLRD_VARIANT_BCM56780_A0_DNA_6_5_30_2_0 BCMLTD_VARIANT_BCM56780_A0_DNA_6_5_30_2_0
+#define BCMLRD_VARIANT_BCM56780_A0_DNA_6_5_31_7_0 BCMLTD_VARIANT_BCM56780_A0_DNA_6_5_31_7_0
 #endif /* DOXYGEN_IGNORE_AUTOGEN */
 
-#endif /* GEN_BCM56780_A0_DNA_6_5_30_2_0_LRD_VARIANT_DEF_H */
+#endif /* GEN_BCM56780_A0_DNA_6_5_31_7_0_LRD_VARIANT_DEF_H */
 
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_lrd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_lrd_variant_def.h
old mode 100755
new mode 100644
similarity index 80%
rename from platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_lrd_variant_def.h
rename to platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_lrd_variant_def.h
index 73fa0876d1b9..99fc561ffe86
--- a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_lrd_variant_def.h
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_lrd_variant_def.h
@@ -24,13 +24,13 @@
  *
  ******************************************************************************/
 
-#ifndef GEN_BCM56780_A0_HNA_6_5_30_6_0_LRD_VARIANT_DEF_H
-#define GEN_BCM56780_A0_HNA_6_5_30_6_0_LRD_VARIANT_DEF_H
+#ifndef GEN_BCM56780_A0_HNA_6_5_31_3_0_LRD_VARIANT_DEF_H
+#define GEN_BCM56780_A0_HNA_6_5_31_3_0_LRD_VARIANT_DEF_H
 
 #ifndef DOXYGEN_IGNORE_AUTOGEN
 
-#define BCMLRD_VARIANT_BCM56780_A0_HNA_6_5_30_6_0 BCMLTD_VARIANT_BCM56780_A0_HNA_6_5_30_6_0
+#define BCMLRD_VARIANT_BCM56780_A0_HNA_6_5_31_3_0 BCMLTD_VARIANT_BCM56780_A0_HNA_6_5_31_3_0
 #endif /* DOXYGEN_IGNORE_AUTOGEN */
 
-#endif /* GEN_BCM56780_A0_HNA_6_5_30_6_0_LRD_VARIANT_DEF_H */
+#endif /* GEN_BCM56780_A0_HNA_6_5_31_3_0_LRD_VARIANT_DEF_H */
 
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56880_a0/bcm56880_a0_lrd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56880_a0/bcm56880_a0_lrd_variant_def.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_lrd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_lrd_variant_def.h
deleted file mode 100755
index e0984c1463c4..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_lrd_variant_def.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by fltg from Logical Table mapping files.
- *
- * Tool: $SDK/tools/fltg/bin/fltg
- *
- * Edits to this file will be lost when it is regenerated.
- *
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- *
- ******************************************************************************/
-
-#ifndef GEN_BCM56880_A0_DNA_6_5_30_1_1_LRD_VARIANT_DEF_H
-#define GEN_BCM56880_A0_DNA_6_5_30_1_1_LRD_VARIANT_DEF_H
-
-#ifndef DOXYGEN_IGNORE_AUTOGEN
-
-#define BCMLRD_VARIANT_BCM56880_A0_DNA_6_5_30_1_1 BCMLTD_VARIANT_BCM56880_A0_DNA_6_5_30_1_1
-#endif /* DOXYGEN_IGNORE_AUTOGEN */
-
-#endif /* GEN_BCM56880_A0_DNA_6_5_30_1_1_LRD_VARIANT_DEF_H */
-
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_lrd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_lrd_variant_def.h
new file mode 100644
index 000000000000..97c79ac47365
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_lrd_variant_def.h
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by fltg from Logical Table mapping files.
+ *
+ * Tool: $SDK/tools/fltg/bin/fltg
+ *
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ *
+ ******************************************************************************/
+
+#ifndef GEN_BCM56880_A0_DNA_6_5_31_6_0_LRD_VARIANT_DEF_H
+#define GEN_BCM56880_A0_DNA_6_5_31_6_0_LRD_VARIANT_DEF_H
+
+#ifndef DOXYGEN_IGNORE_AUTOGEN
+
+#define BCMLRD_VARIANT_BCM56880_A0_DNA_6_5_31_6_0 BCMLTD_VARIANT_BCM56880_A0_DNA_6_5_31_6_0
+#endif /* DOXYGEN_IGNORE_AUTOGEN */
+
+#endif /* GEN_BCM56880_A0_DNA_6_5_31_6_0_LRD_VARIANT_DEF_H */
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_lrd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_lrd_variant_def.h
deleted file mode 100755
index 1af4ea229bfa..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_lrd_variant_def.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by fltg from Logical Table mapping files.
- *
- * Tool: $SDK/tools/fltg/bin/fltg
- *
- * Edits to this file will be lost when it is regenerated.
- *
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- *
- ******************************************************************************/
-
-#ifndef GEN_BCM56880_A0_HNA_6_5_30_3_0_LRD_VARIANT_DEF_H
-#define GEN_BCM56880_A0_HNA_6_5_30_3_0_LRD_VARIANT_DEF_H
-
-#ifndef DOXYGEN_IGNORE_AUTOGEN
-
-#define BCMLRD_VARIANT_BCM56880_A0_HNA_6_5_30_3_0 BCMLTD_VARIANT_BCM56880_A0_HNA_6_5_30_3_0
-#endif /* DOXYGEN_IGNORE_AUTOGEN */
-
-#endif /* GEN_BCM56880_A0_HNA_6_5_30_3_0_LRD_VARIANT_DEF_H */
-
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_lrd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_lrd_variant_def.h
new file mode 100644
index 000000000000..1a1e632b9ed1
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_lrd_variant_def.h
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by fltg from Logical Table mapping files.
+ *
+ * Tool: $SDK/tools/fltg/bin/fltg
+ *
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ *
+ ******************************************************************************/
+
+#ifndef GEN_BCM56880_A0_HNA_6_5_31_3_0_LRD_VARIANT_DEF_H
+#define GEN_BCM56880_A0_HNA_6_5_31_3_0_LRD_VARIANT_DEF_H
+
+#ifndef DOXYGEN_IGNORE_AUTOGEN
+
+#define BCMLRD_VARIANT_BCM56880_A0_HNA_6_5_31_3_0 BCMLTD_VARIANT_BCM56880_A0_HNA_6_5_31_3_0
+#endif /* DOXYGEN_IGNORE_AUTOGEN */
+
+#endif /* GEN_BCM56880_A0_HNA_6_5_31_3_0_LRD_VARIANT_DEF_H */
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_lrd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_lrd_variant_def.h
deleted file mode 100755
index af6ea4ed85bf..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_lrd_variant_def.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by fltg from Logical Table mapping files.
- *
- * Tool: $SDK/tools/fltg/bin/fltg
- *
- * Edits to this file will be lost when it is regenerated.
- *
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- *
- ******************************************************************************/
-
-#ifndef GEN_BCM56880_A0_NFA_6_5_30_1_1_LRD_VARIANT_DEF_H
-#define GEN_BCM56880_A0_NFA_6_5_30_1_1_LRD_VARIANT_DEF_H
-
-#ifndef DOXYGEN_IGNORE_AUTOGEN
-
-#define BCMLRD_VARIANT_BCM56880_A0_NFA_6_5_30_1_1 BCMLTD_VARIANT_BCM56880_A0_NFA_6_5_30_1_1
-#endif /* DOXYGEN_IGNORE_AUTOGEN */
-
-#endif /* GEN_BCM56880_A0_NFA_6_5_30_1_1_LRD_VARIANT_DEF_H */
-
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_lrd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_lrd_variant_def.h
new file mode 100644
index 000000000000..e7e9cb62e805
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_lrd_variant_def.h
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by fltg from Logical Table mapping files.
+ *
+ * Tool: $SDK/tools/fltg/bin/fltg
+ *
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ *
+ ******************************************************************************/
+
+#ifndef GEN_BCM56880_A0_NFA_6_5_31_3_1_LRD_VARIANT_DEF_H
+#define GEN_BCM56880_A0_NFA_6_5_31_3_1_LRD_VARIANT_DEF_H
+
+#ifndef DOXYGEN_IGNORE_AUTOGEN
+
+#define BCMLRD_VARIANT_BCM56880_A0_NFA_6_5_31_3_1 BCMLTD_VARIANT_BCM56880_A0_NFA_6_5_31_3_1
+#endif /* DOXYGEN_IGNORE_AUTOGEN */
+
+#endif /* GEN_BCM56880_A0_NFA_6_5_31_3_1_LRD_VARIANT_DEF_H */
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56890_a0/bcm56890_a0_lrd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56890_a0/bcm56890_a0_lrd_variant_def.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_lrd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_lrd_variant_def.h
deleted file mode 100755
index dc5af3486b95..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_lrd_variant_def.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by fltg from Logical Table mapping files.
- *
- * Tool: $SDK/tools/fltg/bin/fltg
- *
- * Edits to this file will be lost when it is regenerated.
- *
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- *
- ******************************************************************************/
-
-#ifndef GEN_BCM56890_A0_CNA_6_5_30_2_0_LRD_VARIANT_DEF_H
-#define GEN_BCM56890_A0_CNA_6_5_30_2_0_LRD_VARIANT_DEF_H
-
-#ifndef DOXYGEN_IGNORE_AUTOGEN
-
-#define BCMLRD_VARIANT_BCM56890_A0_CNA_6_5_30_2_0 BCMLTD_VARIANT_BCM56890_A0_CNA_6_5_30_2_0
-#endif /* DOXYGEN_IGNORE_AUTOGEN */
-
-#endif /* GEN_BCM56890_A0_CNA_6_5_30_2_0_LRD_VARIANT_DEF_H */
-
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_lrd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_lrd_variant_def.h
new file mode 100644
index 000000000000..70385f1d6ac3
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_lrd_variant_def.h
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by fltg from Logical Table mapping files.
+ *
+ * Tool: $SDK/tools/fltg/bin/fltg
+ *
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ *
+ ******************************************************************************/
+
+#ifndef GEN_BCM56890_A0_CNA_6_5_31_3_0_LRD_VARIANT_DEF_H
+#define GEN_BCM56890_A0_CNA_6_5_31_3_0_LRD_VARIANT_DEF_H
+
+#ifndef DOXYGEN_IGNORE_AUTOGEN
+
+#define BCMLRD_VARIANT_BCM56890_A0_CNA_6_5_31_3_0 BCMLTD_VARIANT_BCM56890_A0_CNA_6_5_31_3_0
+#endif /* DOXYGEN_IGNORE_AUTOGEN */
+
+#endif /* GEN_BCM56890_A0_CNA_6_5_31_3_0_LRD_VARIANT_DEF_H */
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_lrd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_lrd_variant_def.h
deleted file mode 100755
index 32ca41777985..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_lrd_variant_def.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by fltg from Logical Table mapping files.
- *
- * Tool: $SDK/tools/fltg/bin/fltg
- *
- * Edits to this file will be lost when it is regenerated.
- *
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- *
- ******************************************************************************/
-
-#ifndef GEN_BCM56890_A0_DNA_6_5_30_8_0_LRD_VARIANT_DEF_H
-#define GEN_BCM56890_A0_DNA_6_5_30_8_0_LRD_VARIANT_DEF_H
-
-#ifndef DOXYGEN_IGNORE_AUTOGEN
-
-#define BCMLRD_VARIANT_BCM56890_A0_DNA_6_5_30_8_0 BCMLTD_VARIANT_BCM56890_A0_DNA_6_5_30_8_0
-#endif /* DOXYGEN_IGNORE_AUTOGEN */
-
-#endif /* GEN_BCM56890_A0_DNA_6_5_30_8_0_LRD_VARIANT_DEF_H */
-
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_lrd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_lrd_variant_def.h
new file mode 100644
index 000000000000..1203b6c1d7d1
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_lrd_variant_def.h
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by fltg from Logical Table mapping files.
+ *
+ * Tool: $SDK/tools/fltg/bin/fltg
+ *
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ *
+ ******************************************************************************/
+
+#ifndef GEN_BCM56890_A0_DNA_6_5_31_6_0_LRD_VARIANT_DEF_H
+#define GEN_BCM56890_A0_DNA_6_5_31_6_0_LRD_VARIANT_DEF_H
+
+#ifndef DOXYGEN_IGNORE_AUTOGEN
+
+#define BCMLRD_VARIANT_BCM56890_A0_DNA_6_5_31_6_0 BCMLTD_VARIANT_BCM56890_A0_DNA_6_5_31_6_0
+#endif /* DOXYGEN_IGNORE_AUTOGEN */
+
+#endif /* GEN_BCM56890_A0_DNA_6_5_31_6_0_LRD_VARIANT_DEF_H */
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56990_a0/bcm56990_a0_lrd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56990_a0/bcm56990_a0_lrd_variant_def.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56990_b0/bcm56990_b0_lrd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56990_b0/bcm56990_b0_lrd_variant_def.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56996_a0/bcm56996_a0_lrd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56996_a0/bcm56996_a0_lrd_variant_def.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56996_b0/bcm56996_b0_lrd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56996_b0/bcm56996_b0_lrd_variant_def.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56998_a0/bcm56998_a0_lrd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56998_a0/bcm56998_a0_lrd_variant_def.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56999_a0/bcm56999_a0_lrd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm56999_a0/bcm56999_a0_lrd_variant_def.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm78800_a0/bcm78800_a0_lrd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm78800_a0/bcm78800_a0_lrd_variant_def.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_lrd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_lrd_variant_def.h
deleted file mode 100755
index 4708d71d8f59..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_lrd_variant_def.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by fltg from Logical Table mapping files.
- *
- * Tool: $SDK/tools/fltg/bin/fltg
- *
- * Edits to this file will be lost when it is regenerated.
- *
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- *
- ******************************************************************************/
-
-#ifndef GEN_BCM78800_A0_DNA_6_5_30_3_1_LRD_VARIANT_DEF_H
-#define GEN_BCM78800_A0_DNA_6_5_30_3_1_LRD_VARIANT_DEF_H
-
-#ifndef DOXYGEN_IGNORE_AUTOGEN
-
-#define BCMLRD_VARIANT_BCM78800_A0_DNA_6_5_30_3_1 BCMLTD_VARIANT_BCM78800_A0_DNA_6_5_30_3_1
-#endif /* DOXYGEN_IGNORE_AUTOGEN */
-
-#endif /* GEN_BCM78800_A0_DNA_6_5_30_3_1_LRD_VARIANT_DEF_H */
-
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_lrd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_lrd_variant_def.h
new file mode 100644
index 000000000000..7d884106722c
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_lrd_variant_def.h
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by fltg from Logical Table mapping files.
+ *
+ * Tool: $SDK/tools/fltg/bin/fltg
+ *
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ *
+ ******************************************************************************/
+
+#ifndef GEN_BCM78800_A0_DNA_6_5_31_5_0_LRD_VARIANT_DEF_H
+#define GEN_BCM78800_A0_DNA_6_5_31_5_0_LRD_VARIANT_DEF_H
+
+#ifndef DOXYGEN_IGNORE_AUTOGEN
+
+#define BCMLRD_VARIANT_BCM78800_A0_DNA_6_5_31_5_0 BCMLTD_VARIANT_BCM78800_A0_DNA_6_5_31_5_0
+#endif /* DOXYGEN_IGNORE_AUTOGEN */
+
+#endif /* GEN_BCM78800_A0_DNA_6_5_31_5_0_LRD_VARIANT_DEF_H */
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm78900_b0/bcm78900_b0_lrd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm78900_b0/bcm78900_b0_lrd_variant_def.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm78905_a0/bcm78905_a0_lrd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmlrd/include/bcmlrd/defs/generated/bcm78905_a0/bcm78905_a0_lrd_variant_def.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/bcmltd_variant.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/bcmltd_variant.h
index b677351a4473..3938c50b64e9 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/bcmltd_variant.h
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/bcmltd_variant.h
@@ -1,13 +1,13 @@
 /*! \file bcmltd_variant.h
  *
- * \brief BCMLTD Variant initerfaces and definitions
+ * \brief BCMLTD Variant interfaces and definitions
  *
  * Logical table variant inclusion and exclusion support within the
  * BCMLTD can be specified as a combination of the following defines:
  *
  *     #define BCMLTD_CONFIG_INCLUDE_<CHIPNAME>_<REV>X_<VARIANT> [1|0]
  *           -- Include or exclude the specified variant
- *           Example: #define BCMLTD_CONFIG_INCLUDE_BCM56880_UTLTM    1
+ *     Example: #define BCMLTD_CONFIG_INCLUDE_BCM56880_A0_DNA_6_5_30_1_1    1
  *
  * The value of BCMLTD_CONFIG_INCLUDE_VARIANT_DEFAULT is used for any
  * variants which are left unspecified. Set this value to 1 or 0 to
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/chip/generated/bcmltd_config_variant.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/chip/generated/bcmltd_config_variant.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/chip/generated/bcmltd_config_variant_internal.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/chip/generated/bcmltd_config_variant_internal.h
old mode 100755
new mode 100644
index 804903e09340..d459f0845d3d
--- a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/chip/generated/bcmltd_config_variant_internal.h
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/chip/generated/bcmltd_config_variant_internal.h
@@ -29,7 +29,7 @@
 /*+replace reverse */
 #include "../../conf/generated/bcm78905_a0/bcm78905_a0_ltd_config_variant.h"
 #include "../../conf/generated/bcm78900_b0/bcm78900_b0_ltd_config_variant.h"
-#include "../../conf/generated/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_ltd_config_variant.h"
+#include "../../conf/generated/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_ltd_config_variant.h"
 #include "../../conf/generated/bcm78800_a0/bcm78800_a0_ltd_config_variant.h"
 #include "../../conf/generated/bcm56999_a0/bcm56999_a0_ltd_config_variant.h"
 #include "../../conf/generated/bcm56998_a0/bcm56998_a0_ltd_config_variant.h"
@@ -37,18 +37,18 @@
 #include "../../conf/generated/bcm56996_a0/bcm56996_a0_ltd_config_variant.h"
 #include "../../conf/generated/bcm56990_b0/bcm56990_b0_ltd_config_variant.h"
 #include "../../conf/generated/bcm56990_a0/bcm56990_a0_ltd_config_variant.h"
-#include "../../conf/generated/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_ltd_config_variant.h"
-#include "../../conf/generated/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_ltd_config_variant.h"
+#include "../../conf/generated/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_ltd_config_variant.h"
+#include "../../conf/generated/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_ltd_config_variant.h"
 #include "../../conf/generated/bcm56890_a0/bcm56890_a0_ltd_config_variant.h"
-#include "../../conf/generated/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_ltd_config_variant.h"
-#include "../../conf/generated/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_ltd_config_variant.h"
-#include "../../conf/generated/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_ltd_config_variant.h"
+#include "../../conf/generated/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_ltd_config_variant.h"
+#include "../../conf/generated/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_ltd_config_variant.h"
+#include "../../conf/generated/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_ltd_config_variant.h"
 #include "../../conf/generated/bcm56880_a0/bcm56880_a0_ltd_config_variant.h"
-#include "../../conf/generated/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_ltd_config_variant.h"
-#include "../../conf/generated/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_ltd_config_variant.h"
-#include "../../conf/generated/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_ltd_config_variant.h"
+#include "../../conf/generated/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_ltd_config_variant.h"
+#include "../../conf/generated/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_ltd_config_variant.h"
+#include "../../conf/generated/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_ltd_config_variant.h"
 #include "../../conf/generated/bcm56780_a0/bcm56780_a0_ltd_config_variant.h"
-#include "../../conf/generated/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_ltd_config_variant.h"
+#include "../../conf/generated/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_ltd_config_variant.h"
 #include "../../conf/generated/bcm56690_a0/bcm56690_a0_ltd_config_variant.h"
 #include "../../conf/generated/bcm56080_a0/bcm56080_a0_ltd_config_variant.h"
 /*-replace*/
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/chip/generated/bcmltd_variant_defs.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/chip/generated/bcmltd_variant_defs.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/chip/generated/bcmltd_variant_defs_internal.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/chip/generated/bcmltd_variant_defs_internal.h
old mode 100755
new mode 100644
index 079bbb5be10b..7592194dda5c
--- a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/chip/generated/bcmltd_variant_defs_internal.h
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/chip/generated/bcmltd_variant_defs_internal.h
@@ -29,7 +29,7 @@
 /*+replace reverse */
 #include "../../defs/generated/bcm78905_a0/bcm78905_a0_ltd_variant_def.h"
 #include "../../defs/generated/bcm78900_b0/bcm78900_b0_ltd_variant_def.h"
-#include "../../defs/generated/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_ltd_variant_def.h"
+#include "../../defs/generated/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_ltd_variant_def.h"
 #include "../../defs/generated/bcm78800_a0/bcm78800_a0_ltd_variant_def.h"
 #include "../../defs/generated/bcm56999_a0/bcm56999_a0_ltd_variant_def.h"
 #include "../../defs/generated/bcm56998_a0/bcm56998_a0_ltd_variant_def.h"
@@ -37,18 +37,18 @@
 #include "../../defs/generated/bcm56996_a0/bcm56996_a0_ltd_variant_def.h"
 #include "../../defs/generated/bcm56990_b0/bcm56990_b0_ltd_variant_def.h"
 #include "../../defs/generated/bcm56990_a0/bcm56990_a0_ltd_variant_def.h"
-#include "../../defs/generated/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_ltd_variant_def.h"
-#include "../../defs/generated/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_ltd_variant_def.h"
+#include "../../defs/generated/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_ltd_variant_def.h"
+#include "../../defs/generated/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_ltd_variant_def.h"
 #include "../../defs/generated/bcm56890_a0/bcm56890_a0_ltd_variant_def.h"
-#include "../../defs/generated/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_ltd_variant_def.h"
-#include "../../defs/generated/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_ltd_variant_def.h"
-#include "../../defs/generated/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_ltd_variant_def.h"
+#include "../../defs/generated/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_ltd_variant_def.h"
+#include "../../defs/generated/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_ltd_variant_def.h"
+#include "../../defs/generated/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_ltd_variant_def.h"
 #include "../../defs/generated/bcm56880_a0/bcm56880_a0_ltd_variant_def.h"
-#include "../../defs/generated/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_ltd_variant_def.h"
-#include "../../defs/generated/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_ltd_variant_def.h"
-#include "../../defs/generated/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_ltd_variant_def.h"
+#include "../../defs/generated/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_ltd_variant_def.h"
+#include "../../defs/generated/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_ltd_variant_def.h"
+#include "../../defs/generated/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_ltd_variant_def.h"
 #include "../../defs/generated/bcm56780_a0/bcm56780_a0_ltd_variant_def.h"
-#include "../../defs/generated/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_ltd_variant_def.h"
+#include "../../defs/generated/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_ltd_variant_def.h"
 #include "../../defs/generated/bcm56690_a0/bcm56690_a0_ltd_variant_def.h"
 #include "../../defs/generated/bcm56080_a0/bcm56080_a0_ltd_variant_def.h"
 /*-replace*/
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/chip/generated/bcmltd_variant_entry.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/chip/generated/bcmltd_variant_entry.h
old mode 100755
new mode 100644
index 7d68a5e02556..98eced708e06
--- a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/chip/generated/bcmltd_variant_entry.h
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/chip/generated/bcmltd_variant_entry.h
@@ -43,15 +43,15 @@
 #include "../../entry/generated/bcm78800_a0/bcm78800_a0_ltd_variant_entry.h"
 #include "../../entry/generated/bcm78900_b0/bcm78900_b0_ltd_variant_entry.h"
 #include "../../entry/generated/bcm78905_a0/bcm78905_a0_ltd_variant_entry.h"
-#include "../../entry/generated/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_ltd_variant_entry.h"
-#include "../../entry/generated/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_ltd_variant_entry.h"
-#include "../../entry/generated/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_ltd_variant_entry.h"
-#include "../../entry/generated/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_ltd_variant_entry.h"
-#include "../../entry/generated/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_ltd_variant_entry.h"
-#include "../../entry/generated/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_ltd_variant_entry.h"
-#include "../../entry/generated/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_ltd_variant_entry.h"
-#include "../../entry/generated/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_ltd_variant_entry.h"
-#include "../../entry/generated/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_ltd_variant_entry.h"
-#include "../../entry/generated/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_ltd_variant_entry.h"
+#include "../../entry/generated/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_ltd_variant_entry.h"
+#include "../../entry/generated/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_ltd_variant_entry.h"
+#include "../../entry/generated/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_ltd_variant_entry.h"
+#include "../../entry/generated/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_ltd_variant_entry.h"
+#include "../../entry/generated/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_ltd_variant_entry.h"
+#include "../../entry/generated/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_ltd_variant_entry.h"
+#include "../../entry/generated/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_ltd_variant_entry.h"
+#include "../../entry/generated/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_ltd_variant_entry.h"
+#include "../../entry/generated/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_ltd_variant_entry.h"
+#include "../../entry/generated/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_ltd_variant_entry.h"
 /*-replace*/
 #endif /* DOXYGEN_IGNORE_AUTOGEN */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/chip/generated/bcmltd_variant_limits.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/chip/generated/bcmltd_variant_limits.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56080_a0/bcm56080_a0_ltd_config_variant.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56080_a0/bcm56080_a0_ltd_config_variant.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56690_a0/bcm56690_a0_ltd_config_variant.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56690_a0/bcm56690_a0_ltd_config_variant.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_ltd_config_variant.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_ltd_config_variant.h
old mode 100755
new mode 100644
similarity index 74%
rename from platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_ltd_config_variant.h
rename to platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_ltd_config_variant.h
index 8b436739ed3e..c683383ecee8
--- a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_ltd_config_variant.h
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_ltd_config_variant.h
@@ -24,26 +24,26 @@
  *
  ******************************************************************************/
 
-#ifndef GEN_BCM56690_A0_DNA_6_5_29_0_1_LTD_CONFIG_VARIANT_H
-#define GEN_BCM56690_A0_DNA_6_5_29_0_1_LTD_CONFIG_VARIANT_H
+#ifndef GEN_BCM56690_A0_DNA_6_5_31_7_0_LTD_CONFIG_VARIANT_H
+#define GEN_BCM56690_A0_DNA_6_5_31_7_0_LTD_CONFIG_VARIANT_H
 
 #ifndef DOXYGEN_IGNORE_AUTOGEN
 
 #if BCMDRD_CONFIG_INCLUDE_BCM56690_A0
-#ifndef BCMLTD_CONFIG_INCLUDE_BCM56690_A0_DNA_6_5_29_0_1
-#define BCMLTD_CONFIG_INCLUDE_BCM56690_A0_DNA_6_5_29_0_1 BCMLTD_CONFIG_INCLUDE_VARIANT_DEFAULT
+#ifndef BCMLTD_CONFIG_INCLUDE_BCM56690_A0_DNA_6_5_31_7_0
+#define BCMLTD_CONFIG_INCLUDE_BCM56690_A0_DNA_6_5_31_7_0 BCMLTD_CONFIG_INCLUDE_VARIANT_DEFAULT
 #endif
-#if BCMLTD_CONFIG_INCLUDE_BCM56690_A0_DNA_6_5_29_0_1 == 1
+#if BCMLTD_CONFIG_INCLUDE_BCM56690_A0_DNA_6_5_31_7_0 == 1
 #ifndef BCMLTD_CONFIG_INCLUDE_BCM56690_A0_BASE
 #define BCMLTD_CONFIG_INCLUDE_BCM56690_A0_BASE 1
 #endif
 #if BCMLTD_CONFIG_INCLUDE_BCM56690_A0_BASE == 0
-#error Inconsistent variant flags BCMLTD_CONFIG_INCLUDE_BCM56690_A0_DNA_6_5_29_0_1=1, BCMLTD_CONFIG_INCLUDE_BCM56690_A0_BASE=0.
+#error Inconsistent variant flags BCMLTD_CONFIG_INCLUDE_BCM56690_A0_DNA_6_5_31_7_0=1, BCMLTD_CONFIG_INCLUDE_BCM56690_A0_BASE=0.
 #endif
 #endif
 #else
-#define BCMLTD_CONFIG_INCLUDE_BCM56690_A0_DNA_6_5_29_0_1 0
+#define BCMLTD_CONFIG_INCLUDE_BCM56690_A0_DNA_6_5_31_7_0 0
 #endif
 #endif /* DOXYGEN_IGNORE_AUTOGEN */
 
-#endif /* GEN_BCM56690_A0_DNA_6_5_29_0_1_LTD_CONFIG_VARIANT_H */
+#endif /* GEN_BCM56690_A0_DNA_6_5_31_7_0_LTD_CONFIG_VARIANT_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56780_a0/bcm56780_a0_ltd_config_variant.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56780_a0/bcm56780_a0_ltd_config_variant.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_ltd_config_variant.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_ltd_config_variant.h
old mode 100755
new mode 100644
similarity index 74%
rename from platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_ltd_config_variant.h
rename to platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_ltd_config_variant.h
index 0001e457e635..7a296324c3e2
--- a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_ltd_config_variant.h
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_ltd_config_variant.h
@@ -24,26 +24,26 @@
  *
  ******************************************************************************/
 
-#ifndef GEN_BCM56780_A0_CNA_6_5_30_2_0_LTD_CONFIG_VARIANT_H
-#define GEN_BCM56780_A0_CNA_6_5_30_2_0_LTD_CONFIG_VARIANT_H
+#ifndef GEN_BCM56780_A0_CNA_6_5_31_3_0_LTD_CONFIG_VARIANT_H
+#define GEN_BCM56780_A0_CNA_6_5_31_3_0_LTD_CONFIG_VARIANT_H
 
 #ifndef DOXYGEN_IGNORE_AUTOGEN
 
 #if BCMDRD_CONFIG_INCLUDE_BCM56780_A0
-#ifndef BCMLTD_CONFIG_INCLUDE_BCM56780_A0_CNA_6_5_30_2_0
-#define BCMLTD_CONFIG_INCLUDE_BCM56780_A0_CNA_6_5_30_2_0 BCMLTD_CONFIG_INCLUDE_VARIANT_DEFAULT
+#ifndef BCMLTD_CONFIG_INCLUDE_BCM56780_A0_CNA_6_5_31_3_0
+#define BCMLTD_CONFIG_INCLUDE_BCM56780_A0_CNA_6_5_31_3_0 BCMLTD_CONFIG_INCLUDE_VARIANT_DEFAULT
 #endif
-#if BCMLTD_CONFIG_INCLUDE_BCM56780_A0_CNA_6_5_30_2_0 == 1
+#if BCMLTD_CONFIG_INCLUDE_BCM56780_A0_CNA_6_5_31_3_0 == 1
 #ifndef BCMLTD_CONFIG_INCLUDE_BCM56780_A0_BASE
 #define BCMLTD_CONFIG_INCLUDE_BCM56780_A0_BASE 1
 #endif
 #if BCMLTD_CONFIG_INCLUDE_BCM56780_A0_BASE == 0
-#error Inconsistent variant flags BCMLTD_CONFIG_INCLUDE_BCM56780_A0_CNA_6_5_30_2_0=1, BCMLTD_CONFIG_INCLUDE_BCM56780_A0_BASE=0.
+#error Inconsistent variant flags BCMLTD_CONFIG_INCLUDE_BCM56780_A0_CNA_6_5_31_3_0=1, BCMLTD_CONFIG_INCLUDE_BCM56780_A0_BASE=0.
 #endif
 #endif
 #else
-#define BCMLTD_CONFIG_INCLUDE_BCM56780_A0_CNA_6_5_30_2_0 0
+#define BCMLTD_CONFIG_INCLUDE_BCM56780_A0_CNA_6_5_31_3_0 0
 #endif
 #endif /* DOXYGEN_IGNORE_AUTOGEN */
 
-#endif /* GEN_BCM56780_A0_CNA_6_5_30_2_0_LTD_CONFIG_VARIANT_H */
+#endif /* GEN_BCM56780_A0_CNA_6_5_31_3_0_LTD_CONFIG_VARIANT_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_ltd_config_variant.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_ltd_config_variant.h
old mode 100755
new mode 100644
similarity index 74%
rename from platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_ltd_config_variant.h
rename to platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_ltd_config_variant.h
index 2156d844ac42..16ac6abc404f
--- a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_ltd_config_variant.h
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_ltd_config_variant.h
@@ -24,26 +24,26 @@
  *
  ******************************************************************************/
 
-#ifndef GEN_BCM56780_A0_DNA_6_5_30_2_0_LTD_CONFIG_VARIANT_H
-#define GEN_BCM56780_A0_DNA_6_5_30_2_0_LTD_CONFIG_VARIANT_H
+#ifndef GEN_BCM56780_A0_DNA_6_5_31_7_0_LTD_CONFIG_VARIANT_H
+#define GEN_BCM56780_A0_DNA_6_5_31_7_0_LTD_CONFIG_VARIANT_H
 
 #ifndef DOXYGEN_IGNORE_AUTOGEN
 
 #if BCMDRD_CONFIG_INCLUDE_BCM56780_A0
-#ifndef BCMLTD_CONFIG_INCLUDE_BCM56780_A0_DNA_6_5_30_2_0
-#define BCMLTD_CONFIG_INCLUDE_BCM56780_A0_DNA_6_5_30_2_0 BCMLTD_CONFIG_INCLUDE_VARIANT_DEFAULT
+#ifndef BCMLTD_CONFIG_INCLUDE_BCM56780_A0_DNA_6_5_31_7_0
+#define BCMLTD_CONFIG_INCLUDE_BCM56780_A0_DNA_6_5_31_7_0 BCMLTD_CONFIG_INCLUDE_VARIANT_DEFAULT
 #endif
-#if BCMLTD_CONFIG_INCLUDE_BCM56780_A0_DNA_6_5_30_2_0 == 1
+#if BCMLTD_CONFIG_INCLUDE_BCM56780_A0_DNA_6_5_31_7_0 == 1
 #ifndef BCMLTD_CONFIG_INCLUDE_BCM56780_A0_BASE
 #define BCMLTD_CONFIG_INCLUDE_BCM56780_A0_BASE 1
 #endif
 #if BCMLTD_CONFIG_INCLUDE_BCM56780_A0_BASE == 0
-#error Inconsistent variant flags BCMLTD_CONFIG_INCLUDE_BCM56780_A0_DNA_6_5_30_2_0=1, BCMLTD_CONFIG_INCLUDE_BCM56780_A0_BASE=0.
+#error Inconsistent variant flags BCMLTD_CONFIG_INCLUDE_BCM56780_A0_DNA_6_5_31_7_0=1, BCMLTD_CONFIG_INCLUDE_BCM56780_A0_BASE=0.
 #endif
 #endif
 #else
-#define BCMLTD_CONFIG_INCLUDE_BCM56780_A0_DNA_6_5_30_2_0 0
+#define BCMLTD_CONFIG_INCLUDE_BCM56780_A0_DNA_6_5_31_7_0 0
 #endif
 #endif /* DOXYGEN_IGNORE_AUTOGEN */
 
-#endif /* GEN_BCM56780_A0_DNA_6_5_30_2_0_LTD_CONFIG_VARIANT_H */
+#endif /* GEN_BCM56780_A0_DNA_6_5_31_7_0_LTD_CONFIG_VARIANT_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_ltd_config_variant.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_ltd_config_variant.h
old mode 100755
new mode 100644
similarity index 74%
rename from platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_ltd_config_variant.h
rename to platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_ltd_config_variant.h
index d4642e4ca1bb..24eaa4a69260
--- a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_ltd_config_variant.h
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_ltd_config_variant.h
@@ -24,26 +24,26 @@
  *
  ******************************************************************************/
 
-#ifndef GEN_BCM56780_A0_HNA_6_5_30_6_0_LTD_CONFIG_VARIANT_H
-#define GEN_BCM56780_A0_HNA_6_5_30_6_0_LTD_CONFIG_VARIANT_H
+#ifndef GEN_BCM56780_A0_HNA_6_5_31_3_0_LTD_CONFIG_VARIANT_H
+#define GEN_BCM56780_A0_HNA_6_5_31_3_0_LTD_CONFIG_VARIANT_H
 
 #ifndef DOXYGEN_IGNORE_AUTOGEN
 
 #if BCMDRD_CONFIG_INCLUDE_BCM56780_A0
-#ifndef BCMLTD_CONFIG_INCLUDE_BCM56780_A0_HNA_6_5_30_6_0
-#define BCMLTD_CONFIG_INCLUDE_BCM56780_A0_HNA_6_5_30_6_0 BCMLTD_CONFIG_INCLUDE_VARIANT_DEFAULT
+#ifndef BCMLTD_CONFIG_INCLUDE_BCM56780_A0_HNA_6_5_31_3_0
+#define BCMLTD_CONFIG_INCLUDE_BCM56780_A0_HNA_6_5_31_3_0 BCMLTD_CONFIG_INCLUDE_VARIANT_DEFAULT
 #endif
-#if BCMLTD_CONFIG_INCLUDE_BCM56780_A0_HNA_6_5_30_6_0 == 1
+#if BCMLTD_CONFIG_INCLUDE_BCM56780_A0_HNA_6_5_31_3_0 == 1
 #ifndef BCMLTD_CONFIG_INCLUDE_BCM56780_A0_BASE
 #define BCMLTD_CONFIG_INCLUDE_BCM56780_A0_BASE 1
 #endif
 #if BCMLTD_CONFIG_INCLUDE_BCM56780_A0_BASE == 0
-#error Inconsistent variant flags BCMLTD_CONFIG_INCLUDE_BCM56780_A0_HNA_6_5_30_6_0=1, BCMLTD_CONFIG_INCLUDE_BCM56780_A0_BASE=0.
+#error Inconsistent variant flags BCMLTD_CONFIG_INCLUDE_BCM56780_A0_HNA_6_5_31_3_0=1, BCMLTD_CONFIG_INCLUDE_BCM56780_A0_BASE=0.
 #endif
 #endif
 #else
-#define BCMLTD_CONFIG_INCLUDE_BCM56780_A0_HNA_6_5_30_6_0 0
+#define BCMLTD_CONFIG_INCLUDE_BCM56780_A0_HNA_6_5_31_3_0 0
 #endif
 #endif /* DOXYGEN_IGNORE_AUTOGEN */
 
-#endif /* GEN_BCM56780_A0_HNA_6_5_30_6_0_LTD_CONFIG_VARIANT_H */
+#endif /* GEN_BCM56780_A0_HNA_6_5_31_3_0_LTD_CONFIG_VARIANT_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56880_a0/bcm56880_a0_ltd_config_variant.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56880_a0/bcm56880_a0_ltd_config_variant.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_ltd_config_variant.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_ltd_config_variant.h
old mode 100755
new mode 100644
similarity index 74%
rename from platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_ltd_config_variant.h
rename to platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_ltd_config_variant.h
index 762391e56e02..f9a9c4f80322
--- a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_ltd_config_variant.h
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_ltd_config_variant.h
@@ -24,26 +24,26 @@
  *
  ******************************************************************************/
 
-#ifndef GEN_BCM56880_A0_DNA_6_5_30_1_1_LTD_CONFIG_VARIANT_H
-#define GEN_BCM56880_A0_DNA_6_5_30_1_1_LTD_CONFIG_VARIANT_H
+#ifndef GEN_BCM56880_A0_DNA_6_5_31_6_0_LTD_CONFIG_VARIANT_H
+#define GEN_BCM56880_A0_DNA_6_5_31_6_0_LTD_CONFIG_VARIANT_H
 
 #ifndef DOXYGEN_IGNORE_AUTOGEN
 
 #if BCMDRD_CONFIG_INCLUDE_BCM56880_A0
-#ifndef BCMLTD_CONFIG_INCLUDE_BCM56880_A0_DNA_6_5_30_1_1
-#define BCMLTD_CONFIG_INCLUDE_BCM56880_A0_DNA_6_5_30_1_1 BCMLTD_CONFIG_INCLUDE_VARIANT_DEFAULT
+#ifndef BCMLTD_CONFIG_INCLUDE_BCM56880_A0_DNA_6_5_31_6_0
+#define BCMLTD_CONFIG_INCLUDE_BCM56880_A0_DNA_6_5_31_6_0 BCMLTD_CONFIG_INCLUDE_VARIANT_DEFAULT
 #endif
-#if BCMLTD_CONFIG_INCLUDE_BCM56880_A0_DNA_6_5_30_1_1 == 1
+#if BCMLTD_CONFIG_INCLUDE_BCM56880_A0_DNA_6_5_31_6_0 == 1
 #ifndef BCMLTD_CONFIG_INCLUDE_BCM56880_A0_BASE
 #define BCMLTD_CONFIG_INCLUDE_BCM56880_A0_BASE 1
 #endif
 #if BCMLTD_CONFIG_INCLUDE_BCM56880_A0_BASE == 0
-#error Inconsistent variant flags BCMLTD_CONFIG_INCLUDE_BCM56880_A0_DNA_6_5_30_1_1=1, BCMLTD_CONFIG_INCLUDE_BCM56880_A0_BASE=0.
+#error Inconsistent variant flags BCMLTD_CONFIG_INCLUDE_BCM56880_A0_DNA_6_5_31_6_0=1, BCMLTD_CONFIG_INCLUDE_BCM56880_A0_BASE=0.
 #endif
 #endif
 #else
-#define BCMLTD_CONFIG_INCLUDE_BCM56880_A0_DNA_6_5_30_1_1 0
+#define BCMLTD_CONFIG_INCLUDE_BCM56880_A0_DNA_6_5_31_6_0 0
 #endif
 #endif /* DOXYGEN_IGNORE_AUTOGEN */
 
-#endif /* GEN_BCM56880_A0_DNA_6_5_30_1_1_LTD_CONFIG_VARIANT_H */
+#endif /* GEN_BCM56880_A0_DNA_6_5_31_6_0_LTD_CONFIG_VARIANT_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_ltd_config_variant.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_ltd_config_variant.h
old mode 100755
new mode 100644
similarity index 74%
rename from platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_ltd_config_variant.h
rename to platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_ltd_config_variant.h
index cf6f78a34401..3a9bdb8cd5d2
--- a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_ltd_config_variant.h
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_ltd_config_variant.h
@@ -24,26 +24,26 @@
  *
  ******************************************************************************/
 
-#ifndef GEN_BCM56880_A0_HNA_6_5_30_3_0_LTD_CONFIG_VARIANT_H
-#define GEN_BCM56880_A0_HNA_6_5_30_3_0_LTD_CONFIG_VARIANT_H
+#ifndef GEN_BCM56880_A0_HNA_6_5_31_3_0_LTD_CONFIG_VARIANT_H
+#define GEN_BCM56880_A0_HNA_6_5_31_3_0_LTD_CONFIG_VARIANT_H
 
 #ifndef DOXYGEN_IGNORE_AUTOGEN
 
 #if BCMDRD_CONFIG_INCLUDE_BCM56880_A0
-#ifndef BCMLTD_CONFIG_INCLUDE_BCM56880_A0_HNA_6_5_30_3_0
-#define BCMLTD_CONFIG_INCLUDE_BCM56880_A0_HNA_6_5_30_3_0 BCMLTD_CONFIG_INCLUDE_VARIANT_DEFAULT
+#ifndef BCMLTD_CONFIG_INCLUDE_BCM56880_A0_HNA_6_5_31_3_0
+#define BCMLTD_CONFIG_INCLUDE_BCM56880_A0_HNA_6_5_31_3_0 BCMLTD_CONFIG_INCLUDE_VARIANT_DEFAULT
 #endif
-#if BCMLTD_CONFIG_INCLUDE_BCM56880_A0_HNA_6_5_30_3_0 == 1
+#if BCMLTD_CONFIG_INCLUDE_BCM56880_A0_HNA_6_5_31_3_0 == 1
 #ifndef BCMLTD_CONFIG_INCLUDE_BCM56880_A0_BASE
 #define BCMLTD_CONFIG_INCLUDE_BCM56880_A0_BASE 1
 #endif
 #if BCMLTD_CONFIG_INCLUDE_BCM56880_A0_BASE == 0
-#error Inconsistent variant flags BCMLTD_CONFIG_INCLUDE_BCM56880_A0_HNA_6_5_30_3_0=1, BCMLTD_CONFIG_INCLUDE_BCM56880_A0_BASE=0.
+#error Inconsistent variant flags BCMLTD_CONFIG_INCLUDE_BCM56880_A0_HNA_6_5_31_3_0=1, BCMLTD_CONFIG_INCLUDE_BCM56880_A0_BASE=0.
 #endif
 #endif
 #else
-#define BCMLTD_CONFIG_INCLUDE_BCM56880_A0_HNA_6_5_30_3_0 0
+#define BCMLTD_CONFIG_INCLUDE_BCM56880_A0_HNA_6_5_31_3_0 0
 #endif
 #endif /* DOXYGEN_IGNORE_AUTOGEN */
 
-#endif /* GEN_BCM56880_A0_HNA_6_5_30_3_0_LTD_CONFIG_VARIANT_H */
+#endif /* GEN_BCM56880_A0_HNA_6_5_31_3_0_LTD_CONFIG_VARIANT_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_ltd_config_variant.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_ltd_config_variant.h
old mode 100755
new mode 100644
similarity index 74%
rename from platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_ltd_config_variant.h
rename to platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_ltd_config_variant.h
index d5fefbeb296f..485fb9fac684
--- a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_ltd_config_variant.h
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_ltd_config_variant.h
@@ -24,26 +24,26 @@
  *
  ******************************************************************************/
 
-#ifndef GEN_BCM56880_A0_NFA_6_5_30_1_1_LTD_CONFIG_VARIANT_H
-#define GEN_BCM56880_A0_NFA_6_5_30_1_1_LTD_CONFIG_VARIANT_H
+#ifndef GEN_BCM56880_A0_NFA_6_5_31_3_1_LTD_CONFIG_VARIANT_H
+#define GEN_BCM56880_A0_NFA_6_5_31_3_1_LTD_CONFIG_VARIANT_H
 
 #ifndef DOXYGEN_IGNORE_AUTOGEN
 
 #if BCMDRD_CONFIG_INCLUDE_BCM56880_A0
-#ifndef BCMLTD_CONFIG_INCLUDE_BCM56880_A0_NFA_6_5_30_1_1
-#define BCMLTD_CONFIG_INCLUDE_BCM56880_A0_NFA_6_5_30_1_1 BCMLTD_CONFIG_INCLUDE_VARIANT_DEFAULT
+#ifndef BCMLTD_CONFIG_INCLUDE_BCM56880_A0_NFA_6_5_31_3_1
+#define BCMLTD_CONFIG_INCLUDE_BCM56880_A0_NFA_6_5_31_3_1 BCMLTD_CONFIG_INCLUDE_VARIANT_DEFAULT
 #endif
-#if BCMLTD_CONFIG_INCLUDE_BCM56880_A0_NFA_6_5_30_1_1 == 1
+#if BCMLTD_CONFIG_INCLUDE_BCM56880_A0_NFA_6_5_31_3_1 == 1
 #ifndef BCMLTD_CONFIG_INCLUDE_BCM56880_A0_BASE
 #define BCMLTD_CONFIG_INCLUDE_BCM56880_A0_BASE 1
 #endif
 #if BCMLTD_CONFIG_INCLUDE_BCM56880_A0_BASE == 0
-#error Inconsistent variant flags BCMLTD_CONFIG_INCLUDE_BCM56880_A0_NFA_6_5_30_1_1=1, BCMLTD_CONFIG_INCLUDE_BCM56880_A0_BASE=0.
+#error Inconsistent variant flags BCMLTD_CONFIG_INCLUDE_BCM56880_A0_NFA_6_5_31_3_1=1, BCMLTD_CONFIG_INCLUDE_BCM56880_A0_BASE=0.
 #endif
 #endif
 #else
-#define BCMLTD_CONFIG_INCLUDE_BCM56880_A0_NFA_6_5_30_1_1 0
+#define BCMLTD_CONFIG_INCLUDE_BCM56880_A0_NFA_6_5_31_3_1 0
 #endif
 #endif /* DOXYGEN_IGNORE_AUTOGEN */
 
-#endif /* GEN_BCM56880_A0_NFA_6_5_30_1_1_LTD_CONFIG_VARIANT_H */
+#endif /* GEN_BCM56880_A0_NFA_6_5_31_3_1_LTD_CONFIG_VARIANT_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56890_a0/bcm56890_a0_ltd_config_variant.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56890_a0/bcm56890_a0_ltd_config_variant.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_ltd_config_variant.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_ltd_config_variant.h
old mode 100755
new mode 100644
similarity index 74%
rename from platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_ltd_config_variant.h
rename to platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_ltd_config_variant.h
index ec40fd40676d..74e6cbc17a4b
--- a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_ltd_config_variant.h
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_ltd_config_variant.h
@@ -24,26 +24,26 @@
  *
  ******************************************************************************/
 
-#ifndef GEN_BCM56890_A0_CNA_6_5_30_2_0_LTD_CONFIG_VARIANT_H
-#define GEN_BCM56890_A0_CNA_6_5_30_2_0_LTD_CONFIG_VARIANT_H
+#ifndef GEN_BCM56890_A0_CNA_6_5_31_3_0_LTD_CONFIG_VARIANT_H
+#define GEN_BCM56890_A0_CNA_6_5_31_3_0_LTD_CONFIG_VARIANT_H
 
 #ifndef DOXYGEN_IGNORE_AUTOGEN
 
 #if BCMDRD_CONFIG_INCLUDE_BCM56890_A0
-#ifndef BCMLTD_CONFIG_INCLUDE_BCM56890_A0_CNA_6_5_30_2_0
-#define BCMLTD_CONFIG_INCLUDE_BCM56890_A0_CNA_6_5_30_2_0 BCMLTD_CONFIG_INCLUDE_VARIANT_DEFAULT
+#ifndef BCMLTD_CONFIG_INCLUDE_BCM56890_A0_CNA_6_5_31_3_0
+#define BCMLTD_CONFIG_INCLUDE_BCM56890_A0_CNA_6_5_31_3_0 BCMLTD_CONFIG_INCLUDE_VARIANT_DEFAULT
 #endif
-#if BCMLTD_CONFIG_INCLUDE_BCM56890_A0_CNA_6_5_30_2_0 == 1
+#if BCMLTD_CONFIG_INCLUDE_BCM56890_A0_CNA_6_5_31_3_0 == 1
 #ifndef BCMLTD_CONFIG_INCLUDE_BCM56890_A0_BASE
 #define BCMLTD_CONFIG_INCLUDE_BCM56890_A0_BASE 1
 #endif
 #if BCMLTD_CONFIG_INCLUDE_BCM56890_A0_BASE == 0
-#error Inconsistent variant flags BCMLTD_CONFIG_INCLUDE_BCM56890_A0_CNA_6_5_30_2_0=1, BCMLTD_CONFIG_INCLUDE_BCM56890_A0_BASE=0.
+#error Inconsistent variant flags BCMLTD_CONFIG_INCLUDE_BCM56890_A0_CNA_6_5_31_3_0=1, BCMLTD_CONFIG_INCLUDE_BCM56890_A0_BASE=0.
 #endif
 #endif
 #else
-#define BCMLTD_CONFIG_INCLUDE_BCM56890_A0_CNA_6_5_30_2_0 0
+#define BCMLTD_CONFIG_INCLUDE_BCM56890_A0_CNA_6_5_31_3_0 0
 #endif
 #endif /* DOXYGEN_IGNORE_AUTOGEN */
 
-#endif /* GEN_BCM56890_A0_CNA_6_5_30_2_0_LTD_CONFIG_VARIANT_H */
+#endif /* GEN_BCM56890_A0_CNA_6_5_31_3_0_LTD_CONFIG_VARIANT_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_ltd_config_variant.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_ltd_config_variant.h
old mode 100755
new mode 100644
similarity index 74%
rename from platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_ltd_config_variant.h
rename to platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_ltd_config_variant.h
index 78af73f2edd5..b4681302bc69
--- a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_ltd_config_variant.h
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_ltd_config_variant.h
@@ -24,26 +24,26 @@
  *
  ******************************************************************************/
 
-#ifndef GEN_BCM56890_A0_DNA_6_5_30_8_0_LTD_CONFIG_VARIANT_H
-#define GEN_BCM56890_A0_DNA_6_5_30_8_0_LTD_CONFIG_VARIANT_H
+#ifndef GEN_BCM56890_A0_DNA_6_5_31_6_0_LTD_CONFIG_VARIANT_H
+#define GEN_BCM56890_A0_DNA_6_5_31_6_0_LTD_CONFIG_VARIANT_H
 
 #ifndef DOXYGEN_IGNORE_AUTOGEN
 
 #if BCMDRD_CONFIG_INCLUDE_BCM56890_A0
-#ifndef BCMLTD_CONFIG_INCLUDE_BCM56890_A0_DNA_6_5_30_8_0
-#define BCMLTD_CONFIG_INCLUDE_BCM56890_A0_DNA_6_5_30_8_0 BCMLTD_CONFIG_INCLUDE_VARIANT_DEFAULT
+#ifndef BCMLTD_CONFIG_INCLUDE_BCM56890_A0_DNA_6_5_31_6_0
+#define BCMLTD_CONFIG_INCLUDE_BCM56890_A0_DNA_6_5_31_6_0 BCMLTD_CONFIG_INCLUDE_VARIANT_DEFAULT
 #endif
-#if BCMLTD_CONFIG_INCLUDE_BCM56890_A0_DNA_6_5_30_8_0 == 1
+#if BCMLTD_CONFIG_INCLUDE_BCM56890_A0_DNA_6_5_31_6_0 == 1
 #ifndef BCMLTD_CONFIG_INCLUDE_BCM56890_A0_BASE
 #define BCMLTD_CONFIG_INCLUDE_BCM56890_A0_BASE 1
 #endif
 #if BCMLTD_CONFIG_INCLUDE_BCM56890_A0_BASE == 0
-#error Inconsistent variant flags BCMLTD_CONFIG_INCLUDE_BCM56890_A0_DNA_6_5_30_8_0=1, BCMLTD_CONFIG_INCLUDE_BCM56890_A0_BASE=0.
+#error Inconsistent variant flags BCMLTD_CONFIG_INCLUDE_BCM56890_A0_DNA_6_5_31_6_0=1, BCMLTD_CONFIG_INCLUDE_BCM56890_A0_BASE=0.
 #endif
 #endif
 #else
-#define BCMLTD_CONFIG_INCLUDE_BCM56890_A0_DNA_6_5_30_8_0 0
+#define BCMLTD_CONFIG_INCLUDE_BCM56890_A0_DNA_6_5_31_6_0 0
 #endif
 #endif /* DOXYGEN_IGNORE_AUTOGEN */
 
-#endif /* GEN_BCM56890_A0_DNA_6_5_30_8_0_LTD_CONFIG_VARIANT_H */
+#endif /* GEN_BCM56890_A0_DNA_6_5_31_6_0_LTD_CONFIG_VARIANT_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56990_a0/bcm56990_a0_ltd_config_variant.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56990_a0/bcm56990_a0_ltd_config_variant.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56990_b0/bcm56990_b0_ltd_config_variant.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56990_b0/bcm56990_b0_ltd_config_variant.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56996_a0/bcm56996_a0_ltd_config_variant.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56996_a0/bcm56996_a0_ltd_config_variant.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56996_b0/bcm56996_b0_ltd_config_variant.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56996_b0/bcm56996_b0_ltd_config_variant.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56998_a0/bcm56998_a0_ltd_config_variant.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56998_a0/bcm56998_a0_ltd_config_variant.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56999_a0/bcm56999_a0_ltd_config_variant.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm56999_a0/bcm56999_a0_ltd_config_variant.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm78800_a0/bcm78800_a0_ltd_config_variant.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm78800_a0/bcm78800_a0_ltd_config_variant.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_ltd_config_variant.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_ltd_config_variant.h
old mode 100755
new mode 100644
similarity index 74%
rename from platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_ltd_config_variant.h
rename to platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_ltd_config_variant.h
index 96d06c9656de..35271bf4f8af
--- a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_ltd_config_variant.h
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_ltd_config_variant.h
@@ -24,26 +24,26 @@
  *
  ******************************************************************************/
 
-#ifndef GEN_BCM78800_A0_DNA_6_5_30_3_1_LTD_CONFIG_VARIANT_H
-#define GEN_BCM78800_A0_DNA_6_5_30_3_1_LTD_CONFIG_VARIANT_H
+#ifndef GEN_BCM78800_A0_DNA_6_5_31_5_0_LTD_CONFIG_VARIANT_H
+#define GEN_BCM78800_A0_DNA_6_5_31_5_0_LTD_CONFIG_VARIANT_H
 
 #ifndef DOXYGEN_IGNORE_AUTOGEN
 
 #if BCMDRD_CONFIG_INCLUDE_BCM78800_A0
-#ifndef BCMLTD_CONFIG_INCLUDE_BCM78800_A0_DNA_6_5_30_3_1
-#define BCMLTD_CONFIG_INCLUDE_BCM78800_A0_DNA_6_5_30_3_1 BCMLTD_CONFIG_INCLUDE_VARIANT_DEFAULT
+#ifndef BCMLTD_CONFIG_INCLUDE_BCM78800_A0_DNA_6_5_31_5_0
+#define BCMLTD_CONFIG_INCLUDE_BCM78800_A0_DNA_6_5_31_5_0 BCMLTD_CONFIG_INCLUDE_VARIANT_DEFAULT
 #endif
-#if BCMLTD_CONFIG_INCLUDE_BCM78800_A0_DNA_6_5_30_3_1 == 1
+#if BCMLTD_CONFIG_INCLUDE_BCM78800_A0_DNA_6_5_31_5_0 == 1
 #ifndef BCMLTD_CONFIG_INCLUDE_BCM78800_A0_BASE
 #define BCMLTD_CONFIG_INCLUDE_BCM78800_A0_BASE 1
 #endif
 #if BCMLTD_CONFIG_INCLUDE_BCM78800_A0_BASE == 0
-#error Inconsistent variant flags BCMLTD_CONFIG_INCLUDE_BCM78800_A0_DNA_6_5_30_3_1=1, BCMLTD_CONFIG_INCLUDE_BCM78800_A0_BASE=0.
+#error Inconsistent variant flags BCMLTD_CONFIG_INCLUDE_BCM78800_A0_DNA_6_5_31_5_0=1, BCMLTD_CONFIG_INCLUDE_BCM78800_A0_BASE=0.
 #endif
 #endif
 #else
-#define BCMLTD_CONFIG_INCLUDE_BCM78800_A0_DNA_6_5_30_3_1 0
+#define BCMLTD_CONFIG_INCLUDE_BCM78800_A0_DNA_6_5_31_5_0 0
 #endif
 #endif /* DOXYGEN_IGNORE_AUTOGEN */
 
-#endif /* GEN_BCM78800_A0_DNA_6_5_30_3_1_LTD_CONFIG_VARIANT_H */
+#endif /* GEN_BCM78800_A0_DNA_6_5_31_5_0_LTD_CONFIG_VARIANT_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm78900_b0/bcm78900_b0_ltd_config_variant.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm78900_b0/bcm78900_b0_ltd_config_variant.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm78905_a0/bcm78905_a0_ltd_config_variant.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/conf/generated/bcm78905_a0/bcm78905_a0_ltd_config_variant.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56080_a0/bcm56080_a0_ltd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56080_a0/bcm56080_a0_ltd_variant_def.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56690_a0/bcm56690_a0_ltd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56690_a0/bcm56690_a0_ltd_variant_def.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_ltd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_ltd_variant_def.h
deleted file mode 100755
index 0a39b63ed1e2..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_ltd_variant_def.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by fltg from Logical Table mapping files.
- *
- * Tool: $SDK/tools/fltg/bin/fltg
- *
- * Edits to this file will be lost when it is regenerated.
- *
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- *
- ******************************************************************************/
-
-#ifndef GEN_BCM56690_A0_DNA_6_5_29_0_1_LTD_VARIANT_DEF_H
-#define GEN_BCM56690_A0_DNA_6_5_29_0_1_LTD_VARIANT_DEF_H
-
-#ifndef DOXYGEN_IGNORE_AUTOGEN
-
-#define BCMLTD_VARIANT_BCM56690_A0_DNA_6_5_29_0_1 15
-#define BCMLTD_VARIANT_LOCAL_BCM56690_A0_DNA_6_5_29_0_1 1
-#endif /* DOXYGEN_IGNORE_AUTOGEN */
-
-#endif /* GEN_BCM56690_A0_DNA_6_5_29_0_1_LTD_VARIANT_DEF_H */
-
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_ltd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_ltd_variant_def.h
new file mode 100644
index 000000000000..6fb7c867c370
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_ltd_variant_def.h
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by fltg from Logical Table mapping files.
+ *
+ * Tool: $SDK/tools/fltg/bin/fltg
+ *
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ *
+ ******************************************************************************/
+
+#ifndef GEN_BCM56690_A0_DNA_6_5_31_7_0_LTD_VARIANT_DEF_H
+#define GEN_BCM56690_A0_DNA_6_5_31_7_0_LTD_VARIANT_DEF_H
+
+#ifndef DOXYGEN_IGNORE_AUTOGEN
+
+#define BCMLTD_VARIANT_BCM56690_A0_DNA_6_5_31_7_0 15
+#define BCMLTD_VARIANT_LOCAL_BCM56690_A0_DNA_6_5_31_7_0 1
+#endif /* DOXYGEN_IGNORE_AUTOGEN */
+
+#endif /* GEN_BCM56690_A0_DNA_6_5_31_7_0_LTD_VARIANT_DEF_H */
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56780_a0/bcm56780_a0_ltd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56780_a0/bcm56780_a0_ltd_variant_def.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_ltd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_ltd_variant_def.h
deleted file mode 100755
index 44c23d04e69b..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_ltd_variant_def.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by fltg from Logical Table mapping files.
- *
- * Tool: $SDK/tools/fltg/bin/fltg
- *
- * Edits to this file will be lost when it is regenerated.
- *
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- *
- ******************************************************************************/
-
-#ifndef GEN_BCM56780_A0_CNA_6_5_30_2_0_LTD_VARIANT_DEF_H
-#define GEN_BCM56780_A0_CNA_6_5_30_2_0_LTD_VARIANT_DEF_H
-
-#ifndef DOXYGEN_IGNORE_AUTOGEN
-
-#define BCMLTD_VARIANT_BCM56780_A0_CNA_6_5_30_2_0 16
-#define BCMLTD_VARIANT_LOCAL_BCM56780_A0_CNA_6_5_30_2_0 1
-#endif /* DOXYGEN_IGNORE_AUTOGEN */
-
-#endif /* GEN_BCM56780_A0_CNA_6_5_30_2_0_LTD_VARIANT_DEF_H */
-
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_ltd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_ltd_variant_def.h
new file mode 100644
index 000000000000..d707be6af2bb
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_ltd_variant_def.h
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by fltg from Logical Table mapping files.
+ *
+ * Tool: $SDK/tools/fltg/bin/fltg
+ *
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ *
+ ******************************************************************************/
+
+#ifndef GEN_BCM56780_A0_CNA_6_5_31_3_0_LTD_VARIANT_DEF_H
+#define GEN_BCM56780_A0_CNA_6_5_31_3_0_LTD_VARIANT_DEF_H
+
+#ifndef DOXYGEN_IGNORE_AUTOGEN
+
+#define BCMLTD_VARIANT_BCM56780_A0_CNA_6_5_31_3_0 16
+#define BCMLTD_VARIANT_LOCAL_BCM56780_A0_CNA_6_5_31_3_0 1
+#endif /* DOXYGEN_IGNORE_AUTOGEN */
+
+#endif /* GEN_BCM56780_A0_CNA_6_5_31_3_0_LTD_VARIANT_DEF_H */
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_ltd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_ltd_variant_def.h
deleted file mode 100755
index 99163f509a1b..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_ltd_variant_def.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by fltg from Logical Table mapping files.
- *
- * Tool: $SDK/tools/fltg/bin/fltg
- *
- * Edits to this file will be lost when it is regenerated.
- *
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- *
- ******************************************************************************/
-
-#ifndef GEN_BCM56780_A0_DNA_6_5_30_2_0_LTD_VARIANT_DEF_H
-#define GEN_BCM56780_A0_DNA_6_5_30_2_0_LTD_VARIANT_DEF_H
-
-#ifndef DOXYGEN_IGNORE_AUTOGEN
-
-#define BCMLTD_VARIANT_BCM56780_A0_DNA_6_5_30_2_0 17
-#define BCMLTD_VARIANT_LOCAL_BCM56780_A0_DNA_6_5_30_2_0 2
-#endif /* DOXYGEN_IGNORE_AUTOGEN */
-
-#endif /* GEN_BCM56780_A0_DNA_6_5_30_2_0_LTD_VARIANT_DEF_H */
-
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_ltd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_ltd_variant_def.h
new file mode 100644
index 000000000000..163fec8a8bf6
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_ltd_variant_def.h
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by fltg from Logical Table mapping files.
+ *
+ * Tool: $SDK/tools/fltg/bin/fltg
+ *
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ *
+ ******************************************************************************/
+
+#ifndef GEN_BCM56780_A0_DNA_6_5_31_7_0_LTD_VARIANT_DEF_H
+#define GEN_BCM56780_A0_DNA_6_5_31_7_0_LTD_VARIANT_DEF_H
+
+#ifndef DOXYGEN_IGNORE_AUTOGEN
+
+#define BCMLTD_VARIANT_BCM56780_A0_DNA_6_5_31_7_0 17
+#define BCMLTD_VARIANT_LOCAL_BCM56780_A0_DNA_6_5_31_7_0 2
+#endif /* DOXYGEN_IGNORE_AUTOGEN */
+
+#endif /* GEN_BCM56780_A0_DNA_6_5_31_7_0_LTD_VARIANT_DEF_H */
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_ltd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_ltd_variant_def.h
deleted file mode 100755
index b8378adb1cc0..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_ltd_variant_def.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by fltg from Logical Table mapping files.
- *
- * Tool: $SDK/tools/fltg/bin/fltg
- *
- * Edits to this file will be lost when it is regenerated.
- *
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- *
- ******************************************************************************/
-
-#ifndef GEN_BCM56780_A0_HNA_6_5_30_6_0_LTD_VARIANT_DEF_H
-#define GEN_BCM56780_A0_HNA_6_5_30_6_0_LTD_VARIANT_DEF_H
-
-#ifndef DOXYGEN_IGNORE_AUTOGEN
-
-#define BCMLTD_VARIANT_BCM56780_A0_HNA_6_5_30_6_0 18
-#define BCMLTD_VARIANT_LOCAL_BCM56780_A0_HNA_6_5_30_6_0 3
-#endif /* DOXYGEN_IGNORE_AUTOGEN */
-
-#endif /* GEN_BCM56780_A0_HNA_6_5_30_6_0_LTD_VARIANT_DEF_H */
-
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_ltd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_ltd_variant_def.h
new file mode 100644
index 000000000000..838935637d4d
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_ltd_variant_def.h
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by fltg from Logical Table mapping files.
+ *
+ * Tool: $SDK/tools/fltg/bin/fltg
+ *
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ *
+ ******************************************************************************/
+
+#ifndef GEN_BCM56780_A0_HNA_6_5_31_3_0_LTD_VARIANT_DEF_H
+#define GEN_BCM56780_A0_HNA_6_5_31_3_0_LTD_VARIANT_DEF_H
+
+#ifndef DOXYGEN_IGNORE_AUTOGEN
+
+#define BCMLTD_VARIANT_BCM56780_A0_HNA_6_5_31_3_0 18
+#define BCMLTD_VARIANT_LOCAL_BCM56780_A0_HNA_6_5_31_3_0 3
+#endif /* DOXYGEN_IGNORE_AUTOGEN */
+
+#endif /* GEN_BCM56780_A0_HNA_6_5_31_3_0_LTD_VARIANT_DEF_H */
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56880_a0/bcm56880_a0_ltd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56880_a0/bcm56880_a0_ltd_variant_def.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_ltd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_ltd_variant_def.h
deleted file mode 100755
index 40df3e6b0c99..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_ltd_variant_def.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by fltg from Logical Table mapping files.
- *
- * Tool: $SDK/tools/fltg/bin/fltg
- *
- * Edits to this file will be lost when it is regenerated.
- *
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- *
- ******************************************************************************/
-
-#ifndef GEN_BCM56880_A0_DNA_6_5_30_1_1_LTD_VARIANT_DEF_H
-#define GEN_BCM56880_A0_DNA_6_5_30_1_1_LTD_VARIANT_DEF_H
-
-#ifndef DOXYGEN_IGNORE_AUTOGEN
-
-#define BCMLTD_VARIANT_BCM56880_A0_DNA_6_5_30_1_1 19
-#define BCMLTD_VARIANT_LOCAL_BCM56880_A0_DNA_6_5_30_1_1 1
-#endif /* DOXYGEN_IGNORE_AUTOGEN */
-
-#endif /* GEN_BCM56880_A0_DNA_6_5_30_1_1_LTD_VARIANT_DEF_H */
-
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_ltd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_ltd_variant_def.h
new file mode 100644
index 000000000000..4873018ebe77
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_ltd_variant_def.h
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by fltg from Logical Table mapping files.
+ *
+ * Tool: $SDK/tools/fltg/bin/fltg
+ *
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ *
+ ******************************************************************************/
+
+#ifndef GEN_BCM56880_A0_DNA_6_5_31_6_0_LTD_VARIANT_DEF_H
+#define GEN_BCM56880_A0_DNA_6_5_31_6_0_LTD_VARIANT_DEF_H
+
+#ifndef DOXYGEN_IGNORE_AUTOGEN
+
+#define BCMLTD_VARIANT_BCM56880_A0_DNA_6_5_31_6_0 19
+#define BCMLTD_VARIANT_LOCAL_BCM56880_A0_DNA_6_5_31_6_0 1
+#endif /* DOXYGEN_IGNORE_AUTOGEN */
+
+#endif /* GEN_BCM56880_A0_DNA_6_5_31_6_0_LTD_VARIANT_DEF_H */
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_ltd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_ltd_variant_def.h
deleted file mode 100755
index 8528d3a84522..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_ltd_variant_def.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by fltg from Logical Table mapping files.
- *
- * Tool: $SDK/tools/fltg/bin/fltg
- *
- * Edits to this file will be lost when it is regenerated.
- *
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- *
- ******************************************************************************/
-
-#ifndef GEN_BCM56880_A0_HNA_6_5_30_3_0_LTD_VARIANT_DEF_H
-#define GEN_BCM56880_A0_HNA_6_5_30_3_0_LTD_VARIANT_DEF_H
-
-#ifndef DOXYGEN_IGNORE_AUTOGEN
-
-#define BCMLTD_VARIANT_BCM56880_A0_HNA_6_5_30_3_0 20
-#define BCMLTD_VARIANT_LOCAL_BCM56880_A0_HNA_6_5_30_3_0 2
-#endif /* DOXYGEN_IGNORE_AUTOGEN */
-
-#endif /* GEN_BCM56880_A0_HNA_6_5_30_3_0_LTD_VARIANT_DEF_H */
-
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_ltd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_ltd_variant_def.h
new file mode 100644
index 000000000000..bde6d690d8ac
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_ltd_variant_def.h
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by fltg from Logical Table mapping files.
+ *
+ * Tool: $SDK/tools/fltg/bin/fltg
+ *
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ *
+ ******************************************************************************/
+
+#ifndef GEN_BCM56880_A0_HNA_6_5_31_3_0_LTD_VARIANT_DEF_H
+#define GEN_BCM56880_A0_HNA_6_5_31_3_0_LTD_VARIANT_DEF_H
+
+#ifndef DOXYGEN_IGNORE_AUTOGEN
+
+#define BCMLTD_VARIANT_BCM56880_A0_HNA_6_5_31_3_0 20
+#define BCMLTD_VARIANT_LOCAL_BCM56880_A0_HNA_6_5_31_3_0 2
+#endif /* DOXYGEN_IGNORE_AUTOGEN */
+
+#endif /* GEN_BCM56880_A0_HNA_6_5_31_3_0_LTD_VARIANT_DEF_H */
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_ltd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_ltd_variant_def.h
deleted file mode 100755
index b99fdff03335..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_ltd_variant_def.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by fltg from Logical Table mapping files.
- *
- * Tool: $SDK/tools/fltg/bin/fltg
- *
- * Edits to this file will be lost when it is regenerated.
- *
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- *
- ******************************************************************************/
-
-#ifndef GEN_BCM56880_A0_NFA_6_5_30_1_1_LTD_VARIANT_DEF_H
-#define GEN_BCM56880_A0_NFA_6_5_30_1_1_LTD_VARIANT_DEF_H
-
-#ifndef DOXYGEN_IGNORE_AUTOGEN
-
-#define BCMLTD_VARIANT_BCM56880_A0_NFA_6_5_30_1_1 21
-#define BCMLTD_VARIANT_LOCAL_BCM56880_A0_NFA_6_5_30_1_1 3
-#endif /* DOXYGEN_IGNORE_AUTOGEN */
-
-#endif /* GEN_BCM56880_A0_NFA_6_5_30_1_1_LTD_VARIANT_DEF_H */
-
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_ltd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_ltd_variant_def.h
new file mode 100644
index 000000000000..0795df272634
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_ltd_variant_def.h
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by fltg from Logical Table mapping files.
+ *
+ * Tool: $SDK/tools/fltg/bin/fltg
+ *
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ *
+ ******************************************************************************/
+
+#ifndef GEN_BCM56880_A0_NFA_6_5_31_3_1_LTD_VARIANT_DEF_H
+#define GEN_BCM56880_A0_NFA_6_5_31_3_1_LTD_VARIANT_DEF_H
+
+#ifndef DOXYGEN_IGNORE_AUTOGEN
+
+#define BCMLTD_VARIANT_BCM56880_A0_NFA_6_5_31_3_1 21
+#define BCMLTD_VARIANT_LOCAL_BCM56880_A0_NFA_6_5_31_3_1 3
+#endif /* DOXYGEN_IGNORE_AUTOGEN */
+
+#endif /* GEN_BCM56880_A0_NFA_6_5_31_3_1_LTD_VARIANT_DEF_H */
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56890_a0/bcm56890_a0_ltd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56890_a0/bcm56890_a0_ltd_variant_def.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_ltd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_ltd_variant_def.h
deleted file mode 100755
index d4fd99e762ab..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_ltd_variant_def.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by fltg from Logical Table mapping files.
- *
- * Tool: $SDK/tools/fltg/bin/fltg
- *
- * Edits to this file will be lost when it is regenerated.
- *
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- *
- ******************************************************************************/
-
-#ifndef GEN_BCM56890_A0_CNA_6_5_30_2_0_LTD_VARIANT_DEF_H
-#define GEN_BCM56890_A0_CNA_6_5_30_2_0_LTD_VARIANT_DEF_H
-
-#ifndef DOXYGEN_IGNORE_AUTOGEN
-
-#define BCMLTD_VARIANT_BCM56890_A0_CNA_6_5_30_2_0 22
-#define BCMLTD_VARIANT_LOCAL_BCM56890_A0_CNA_6_5_30_2_0 1
-#endif /* DOXYGEN_IGNORE_AUTOGEN */
-
-#endif /* GEN_BCM56890_A0_CNA_6_5_30_2_0_LTD_VARIANT_DEF_H */
-
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_ltd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_ltd_variant_def.h
new file mode 100644
index 000000000000..648b0bb7be99
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_ltd_variant_def.h
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by fltg from Logical Table mapping files.
+ *
+ * Tool: $SDK/tools/fltg/bin/fltg
+ *
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ *
+ ******************************************************************************/
+
+#ifndef GEN_BCM56890_A0_CNA_6_5_31_3_0_LTD_VARIANT_DEF_H
+#define GEN_BCM56890_A0_CNA_6_5_31_3_0_LTD_VARIANT_DEF_H
+
+#ifndef DOXYGEN_IGNORE_AUTOGEN
+
+#define BCMLTD_VARIANT_BCM56890_A0_CNA_6_5_31_3_0 22
+#define BCMLTD_VARIANT_LOCAL_BCM56890_A0_CNA_6_5_31_3_0 1
+#endif /* DOXYGEN_IGNORE_AUTOGEN */
+
+#endif /* GEN_BCM56890_A0_CNA_6_5_31_3_0_LTD_VARIANT_DEF_H */
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_ltd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_ltd_variant_def.h
deleted file mode 100755
index 6e094163dd9d..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_ltd_variant_def.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by fltg from Logical Table mapping files.
- *
- * Tool: $SDK/tools/fltg/bin/fltg
- *
- * Edits to this file will be lost when it is regenerated.
- *
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- *
- ******************************************************************************/
-
-#ifndef GEN_BCM56890_A0_DNA_6_5_30_8_0_LTD_VARIANT_DEF_H
-#define GEN_BCM56890_A0_DNA_6_5_30_8_0_LTD_VARIANT_DEF_H
-
-#ifndef DOXYGEN_IGNORE_AUTOGEN
-
-#define BCMLTD_VARIANT_BCM56890_A0_DNA_6_5_30_8_0 23
-#define BCMLTD_VARIANT_LOCAL_BCM56890_A0_DNA_6_5_30_8_0 2
-#endif /* DOXYGEN_IGNORE_AUTOGEN */
-
-#endif /* GEN_BCM56890_A0_DNA_6_5_30_8_0_LTD_VARIANT_DEF_H */
-
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_ltd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_ltd_variant_def.h
new file mode 100644
index 000000000000..fef26892e235
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_ltd_variant_def.h
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by fltg from Logical Table mapping files.
+ *
+ * Tool: $SDK/tools/fltg/bin/fltg
+ *
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ *
+ ******************************************************************************/
+
+#ifndef GEN_BCM56890_A0_DNA_6_5_31_6_0_LTD_VARIANT_DEF_H
+#define GEN_BCM56890_A0_DNA_6_5_31_6_0_LTD_VARIANT_DEF_H
+
+#ifndef DOXYGEN_IGNORE_AUTOGEN
+
+#define BCMLTD_VARIANT_BCM56890_A0_DNA_6_5_31_6_0 23
+#define BCMLTD_VARIANT_LOCAL_BCM56890_A0_DNA_6_5_31_6_0 2
+#endif /* DOXYGEN_IGNORE_AUTOGEN */
+
+#endif /* GEN_BCM56890_A0_DNA_6_5_31_6_0_LTD_VARIANT_DEF_H */
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56990_a0/bcm56990_a0_ltd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56990_a0/bcm56990_a0_ltd_variant_def.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56990_b0/bcm56990_b0_ltd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56990_b0/bcm56990_b0_ltd_variant_def.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56996_a0/bcm56996_a0_ltd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56996_a0/bcm56996_a0_ltd_variant_def.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56996_b0/bcm56996_b0_ltd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56996_b0/bcm56996_b0_ltd_variant_def.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56998_a0/bcm56998_a0_ltd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56998_a0/bcm56998_a0_ltd_variant_def.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56999_a0/bcm56999_a0_ltd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm56999_a0/bcm56999_a0_ltd_variant_def.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm78800_a0/bcm78800_a0_ltd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm78800_a0/bcm78800_a0_ltd_variant_def.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_ltd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_ltd_variant_def.h
deleted file mode 100755
index 752feaa57d4f..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_ltd_variant_def.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by fltg from Logical Table mapping files.
- *
- * Tool: $SDK/tools/fltg/bin/fltg
- *
- * Edits to this file will be lost when it is regenerated.
- *
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- *
- ******************************************************************************/
-
-#ifndef GEN_BCM78800_A0_DNA_6_5_30_3_1_LTD_VARIANT_DEF_H
-#define GEN_BCM78800_A0_DNA_6_5_30_3_1_LTD_VARIANT_DEF_H
-
-#ifndef DOXYGEN_IGNORE_AUTOGEN
-
-#define BCMLTD_VARIANT_BCM78800_A0_DNA_6_5_30_3_1 24
-#define BCMLTD_VARIANT_LOCAL_BCM78800_A0_DNA_6_5_30_3_1 1
-#endif /* DOXYGEN_IGNORE_AUTOGEN */
-
-#endif /* GEN_BCM78800_A0_DNA_6_5_30_3_1_LTD_VARIANT_DEF_H */
-
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_ltd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_ltd_variant_def.h
new file mode 100644
index 000000000000..9aa5fa6be63b
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_ltd_variant_def.h
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by fltg from Logical Table mapping files.
+ *
+ * Tool: $SDK/tools/fltg/bin/fltg
+ *
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ *
+ ******************************************************************************/
+
+#ifndef GEN_BCM78800_A0_DNA_6_5_31_5_0_LTD_VARIANT_DEF_H
+#define GEN_BCM78800_A0_DNA_6_5_31_5_0_LTD_VARIANT_DEF_H
+
+#ifndef DOXYGEN_IGNORE_AUTOGEN
+
+#define BCMLTD_VARIANT_BCM78800_A0_DNA_6_5_31_5_0 24
+#define BCMLTD_VARIANT_LOCAL_BCM78800_A0_DNA_6_5_31_5_0 1
+#endif /* DOXYGEN_IGNORE_AUTOGEN */
+
+#endif /* GEN_BCM78800_A0_DNA_6_5_31_5_0_LTD_VARIANT_DEF_H */
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm78900_b0/bcm78900_b0_ltd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm78900_b0/bcm78900_b0_ltd_variant_def.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm78905_a0/bcm78905_a0_ltd_variant_def.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/defs/generated/bcm78905_a0/bcm78905_a0_ltd_variant_def.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56080_a0/bcm56080_a0_ltd_variant_entry.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56080_a0/bcm56080_a0_ltd_variant_entry.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56690_a0/bcm56690_a0_ltd_variant_entry.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56690_a0/bcm56690_a0_ltd_variant_entry.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_ltd_variant_entry.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_ltd_variant_entry.h
old mode 100755
new mode 100644
similarity index 68%
rename from platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_ltd_variant_entry.h
rename to platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_ltd_variant_entry.h
index 63d52143e949..a0df0dec6303
--- a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_ltd_variant_entry.h
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_ltd_variant_entry.h
@@ -24,15 +24,15 @@
  *
  ******************************************************************************/
 
-#ifndef GEN_BCM56690_A0_DNA_6_5_29_0_1_LTD_VARIANT_ENTRY_H
-#define GEN_BCM56690_A0_DNA_6_5_29_0_1_LTD_VARIANT_ENTRY_H
-#include <bcmltd/defs/generated/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_ltd_variant_def.h>
-#endif /* GEN_BCM56690_A0_DNA_6_5_29_0_1_LTD_VARIANT_ENTRY_H */
+#ifndef GEN_BCM56690_A0_DNA_6_5_31_7_0_LTD_VARIANT_ENTRY_H
+#define GEN_BCM56690_A0_DNA_6_5_31_7_0_LTD_VARIANT_ENTRY_H
+#include <bcmltd/defs/generated/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_ltd_variant_def.h>
+#endif /* GEN_BCM56690_A0_DNA_6_5_31_7_0_LTD_VARIANT_ENTRY_H */
 
 #ifndef DOXYGEN_IGNORE_AUTOGEN
 
-#if BCMLTD_CONFIG_INCLUDE_BCM56690_A0_DNA_6_5_29_0_1 == 1 || defined(BCMLTD_VARIANT_OVERRIDE)
-BCMLTD_VARIANT_ENTRY(bcm56690_a0,BCM56690_A0,dna_6_5_29_0_1,DNA_6_5_29_0_1,_,BCMLTD_VARIANT_BCM56690_A0_DNA_6_5_29_0_1,BCMLTD_VARIANT_LOCAL_BCM56690_A0_DNA_6_5_29_0_1,NULL,0,0)
+#if BCMLTD_CONFIG_INCLUDE_BCM56690_A0_DNA_6_5_31_7_0 == 1 || defined(BCMLTD_VARIANT_OVERRIDE)
+BCMLTD_VARIANT_ENTRY(bcm56690_a0,BCM56690_A0,dna_6_5_31_7_0,DNA_6_5_31_7_0,_,BCMLTD_VARIANT_BCM56690_A0_DNA_6_5_31_7_0,BCMLTD_VARIANT_LOCAL_BCM56690_A0_DNA_6_5_31_7_0,NULL,0,0)
 #endif
 
 #endif /* DOXYGEN_IGNORE_AUTOGEN */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56780_a0/bcm56780_a0_ltd_variant_entry.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56780_a0/bcm56780_a0_ltd_variant_entry.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_ltd_variant_entry.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_ltd_variant_entry.h
old mode 100755
new mode 100644
similarity index 68%
rename from platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_ltd_variant_entry.h
rename to platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_ltd_variant_entry.h
index 82e276e6ab17..fe5104f682e5
--- a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_ltd_variant_entry.h
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_ltd_variant_entry.h
@@ -24,15 +24,15 @@
  *
  ******************************************************************************/
 
-#ifndef GEN_BCM56780_A0_CNA_6_5_30_2_0_LTD_VARIANT_ENTRY_H
-#define GEN_BCM56780_A0_CNA_6_5_30_2_0_LTD_VARIANT_ENTRY_H
-#include <bcmltd/defs/generated/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_ltd_variant_def.h>
-#endif /* GEN_BCM56780_A0_CNA_6_5_30_2_0_LTD_VARIANT_ENTRY_H */
+#ifndef GEN_BCM56780_A0_CNA_6_5_31_3_0_LTD_VARIANT_ENTRY_H
+#define GEN_BCM56780_A0_CNA_6_5_31_3_0_LTD_VARIANT_ENTRY_H
+#include <bcmltd/defs/generated/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_ltd_variant_def.h>
+#endif /* GEN_BCM56780_A0_CNA_6_5_31_3_0_LTD_VARIANT_ENTRY_H */
 
 #ifndef DOXYGEN_IGNORE_AUTOGEN
 
-#if BCMLTD_CONFIG_INCLUDE_BCM56780_A0_CNA_6_5_30_2_0 == 1 || defined(BCMLTD_VARIANT_OVERRIDE)
-BCMLTD_VARIANT_ENTRY(bcm56780_a0,BCM56780_A0,cna_6_5_30_2_0,CNA_6_5_30_2_0,_,BCMLTD_VARIANT_BCM56780_A0_CNA_6_5_30_2_0,BCMLTD_VARIANT_LOCAL_BCM56780_A0_CNA_6_5_30_2_0,NULL,0,0)
+#if BCMLTD_CONFIG_INCLUDE_BCM56780_A0_CNA_6_5_31_3_0 == 1 || defined(BCMLTD_VARIANT_OVERRIDE)
+BCMLTD_VARIANT_ENTRY(bcm56780_a0,BCM56780_A0,cna_6_5_31_3_0,CNA_6_5_31_3_0,_,BCMLTD_VARIANT_BCM56780_A0_CNA_6_5_31_3_0,BCMLTD_VARIANT_LOCAL_BCM56780_A0_CNA_6_5_31_3_0,NULL,0,0)
 #endif
 
 #endif /* DOXYGEN_IGNORE_AUTOGEN */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_ltd_variant_entry.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_ltd_variant_entry.h
old mode 100755
new mode 100644
similarity index 68%
rename from platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_ltd_variant_entry.h
rename to platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_ltd_variant_entry.h
index 6fe0337c0d6a..ede67f27bbd2
--- a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_ltd_variant_entry.h
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_ltd_variant_entry.h
@@ -24,15 +24,15 @@
  *
  ******************************************************************************/
 
-#ifndef GEN_BCM56780_A0_DNA_6_5_30_2_0_LTD_VARIANT_ENTRY_H
-#define GEN_BCM56780_A0_DNA_6_5_30_2_0_LTD_VARIANT_ENTRY_H
-#include <bcmltd/defs/generated/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_ltd_variant_def.h>
-#endif /* GEN_BCM56780_A0_DNA_6_5_30_2_0_LTD_VARIANT_ENTRY_H */
+#ifndef GEN_BCM56780_A0_DNA_6_5_31_7_0_LTD_VARIANT_ENTRY_H
+#define GEN_BCM56780_A0_DNA_6_5_31_7_0_LTD_VARIANT_ENTRY_H
+#include <bcmltd/defs/generated/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_ltd_variant_def.h>
+#endif /* GEN_BCM56780_A0_DNA_6_5_31_7_0_LTD_VARIANT_ENTRY_H */
 
 #ifndef DOXYGEN_IGNORE_AUTOGEN
 
-#if BCMLTD_CONFIG_INCLUDE_BCM56780_A0_DNA_6_5_30_2_0 == 1 || defined(BCMLTD_VARIANT_OVERRIDE)
-BCMLTD_VARIANT_ENTRY(bcm56780_a0,BCM56780_A0,dna_6_5_30_2_0,DNA_6_5_30_2_0,_,BCMLTD_VARIANT_BCM56780_A0_DNA_6_5_30_2_0,BCMLTD_VARIANT_LOCAL_BCM56780_A0_DNA_6_5_30_2_0,NULL,0,0)
+#if BCMLTD_CONFIG_INCLUDE_BCM56780_A0_DNA_6_5_31_7_0 == 1 || defined(BCMLTD_VARIANT_OVERRIDE)
+BCMLTD_VARIANT_ENTRY(bcm56780_a0,BCM56780_A0,dna_6_5_31_7_0,DNA_6_5_31_7_0,_,BCMLTD_VARIANT_BCM56780_A0_DNA_6_5_31_7_0,BCMLTD_VARIANT_LOCAL_BCM56780_A0_DNA_6_5_31_7_0,NULL,0,0)
 #endif
 
 #endif /* DOXYGEN_IGNORE_AUTOGEN */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_ltd_variant_entry.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_ltd_variant_entry.h
old mode 100755
new mode 100644
similarity index 68%
rename from platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_ltd_variant_entry.h
rename to platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_ltd_variant_entry.h
index a462d25fc858..5d05e665042e
--- a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_ltd_variant_entry.h
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_ltd_variant_entry.h
@@ -24,15 +24,15 @@
  *
  ******************************************************************************/
 
-#ifndef GEN_BCM56780_A0_HNA_6_5_30_6_0_LTD_VARIANT_ENTRY_H
-#define GEN_BCM56780_A0_HNA_6_5_30_6_0_LTD_VARIANT_ENTRY_H
-#include <bcmltd/defs/generated/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_ltd_variant_def.h>
-#endif /* GEN_BCM56780_A0_HNA_6_5_30_6_0_LTD_VARIANT_ENTRY_H */
+#ifndef GEN_BCM56780_A0_HNA_6_5_31_3_0_LTD_VARIANT_ENTRY_H
+#define GEN_BCM56780_A0_HNA_6_5_31_3_0_LTD_VARIANT_ENTRY_H
+#include <bcmltd/defs/generated/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_ltd_variant_def.h>
+#endif /* GEN_BCM56780_A0_HNA_6_5_31_3_0_LTD_VARIANT_ENTRY_H */
 
 #ifndef DOXYGEN_IGNORE_AUTOGEN
 
-#if BCMLTD_CONFIG_INCLUDE_BCM56780_A0_HNA_6_5_30_6_0 == 1 || defined(BCMLTD_VARIANT_OVERRIDE)
-BCMLTD_VARIANT_ENTRY(bcm56780_a0,BCM56780_A0,hna_6_5_30_6_0,HNA_6_5_30_6_0,_,BCMLTD_VARIANT_BCM56780_A0_HNA_6_5_30_6_0,BCMLTD_VARIANT_LOCAL_BCM56780_A0_HNA_6_5_30_6_0,NULL,0,0)
+#if BCMLTD_CONFIG_INCLUDE_BCM56780_A0_HNA_6_5_31_3_0 == 1 || defined(BCMLTD_VARIANT_OVERRIDE)
+BCMLTD_VARIANT_ENTRY(bcm56780_a0,BCM56780_A0,hna_6_5_31_3_0,HNA_6_5_31_3_0,_,BCMLTD_VARIANT_BCM56780_A0_HNA_6_5_31_3_0,BCMLTD_VARIANT_LOCAL_BCM56780_A0_HNA_6_5_31_3_0,NULL,0,0)
 #endif
 
 #endif /* DOXYGEN_IGNORE_AUTOGEN */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56880_a0/bcm56880_a0_ltd_variant_entry.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56880_a0/bcm56880_a0_ltd_variant_entry.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_ltd_variant_entry.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_ltd_variant_entry.h
deleted file mode 100755
index f8b70cd7c2d4..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_ltd_variant_entry.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by fltg from Logical Table mapping files.
- *
- * Tool: $SDK/tools/fltg/bin/fltg
- *
- * Edits to this file will be lost when it is regenerated.
- *
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- *
- ******************************************************************************/
-
-#ifndef GEN_BCM56880_A0_DNA_6_5_30_1_1_LTD_VARIANT_ENTRY_H
-#define GEN_BCM56880_A0_DNA_6_5_30_1_1_LTD_VARIANT_ENTRY_H
-#include <bcmltd/defs/generated/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_ltd_variant_def.h>
-#endif /* GEN_BCM56880_A0_DNA_6_5_30_1_1_LTD_VARIANT_ENTRY_H */
-
-#ifndef DOXYGEN_IGNORE_AUTOGEN
-
-#if BCMLTD_CONFIG_INCLUDE_BCM56880_A0_DNA_6_5_30_1_1 == 1 || defined(BCMLTD_VARIANT_OVERRIDE)
-BCMLTD_VARIANT_ENTRY(bcm56880_a0,BCM56880_A0,dna_6_5_30_1_1,DNA_6_5_30_1_1,_,BCMLTD_VARIANT_BCM56880_A0_DNA_6_5_30_1_1,BCMLTD_VARIANT_LOCAL_BCM56880_A0_DNA_6_5_30_1_1,NULL,0,0)
-#endif
-
-#endif /* DOXYGEN_IGNORE_AUTOGEN */
-
-
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_ltd_variant_entry.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_ltd_variant_entry.h
new file mode 100644
index 000000000000..feadd4e888df
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_ltd_variant_entry.h
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by fltg from Logical Table mapping files.
+ *
+ * Tool: $SDK/tools/fltg/bin/fltg
+ *
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ *
+ ******************************************************************************/
+
+#ifndef GEN_BCM56880_A0_DNA_6_5_31_6_0_LTD_VARIANT_ENTRY_H
+#define GEN_BCM56880_A0_DNA_6_5_31_6_0_LTD_VARIANT_ENTRY_H
+#include <bcmltd/defs/generated/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_ltd_variant_def.h>
+#endif /* GEN_BCM56880_A0_DNA_6_5_31_6_0_LTD_VARIANT_ENTRY_H */
+
+#ifndef DOXYGEN_IGNORE_AUTOGEN
+
+#if BCMLTD_CONFIG_INCLUDE_BCM56880_A0_DNA_6_5_31_6_0 == 1 || defined(BCMLTD_VARIANT_OVERRIDE)
+BCMLTD_VARIANT_ENTRY(bcm56880_a0,BCM56880_A0,dna_6_5_31_6_0,DNA_6_5_31_6_0,_,BCMLTD_VARIANT_BCM56880_A0_DNA_6_5_31_6_0,BCMLTD_VARIANT_LOCAL_BCM56880_A0_DNA_6_5_31_6_0,NULL,0,0)
+#endif
+
+#endif /* DOXYGEN_IGNORE_AUTOGEN */
+
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_ltd_variant_entry.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_ltd_variant_entry.h
deleted file mode 100755
index 9eeb8ddbb210..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_ltd_variant_entry.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by fltg from Logical Table mapping files.
- *
- * Tool: $SDK/tools/fltg/bin/fltg
- *
- * Edits to this file will be lost when it is regenerated.
- *
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- *
- ******************************************************************************/
-
-#ifndef GEN_BCM56880_A0_HNA_6_5_30_3_0_LTD_VARIANT_ENTRY_H
-#define GEN_BCM56880_A0_HNA_6_5_30_3_0_LTD_VARIANT_ENTRY_H
-#include <bcmltd/defs/generated/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_ltd_variant_def.h>
-#endif /* GEN_BCM56880_A0_HNA_6_5_30_3_0_LTD_VARIANT_ENTRY_H */
-
-#ifndef DOXYGEN_IGNORE_AUTOGEN
-
-#if BCMLTD_CONFIG_INCLUDE_BCM56880_A0_HNA_6_5_30_3_0 == 1 || defined(BCMLTD_VARIANT_OVERRIDE)
-BCMLTD_VARIANT_ENTRY(bcm56880_a0,BCM56880_A0,hna_6_5_30_3_0,HNA_6_5_30_3_0,_,BCMLTD_VARIANT_BCM56880_A0_HNA_6_5_30_3_0,BCMLTD_VARIANT_LOCAL_BCM56880_A0_HNA_6_5_30_3_0,NULL,0,0)
-#endif
-
-#endif /* DOXYGEN_IGNORE_AUTOGEN */
-
-
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_ltd_variant_entry.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_ltd_variant_entry.h
new file mode 100644
index 000000000000..84fca45e9086
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_ltd_variant_entry.h
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by fltg from Logical Table mapping files.
+ *
+ * Tool: $SDK/tools/fltg/bin/fltg
+ *
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ *
+ ******************************************************************************/
+
+#ifndef GEN_BCM56880_A0_HNA_6_5_31_3_0_LTD_VARIANT_ENTRY_H
+#define GEN_BCM56880_A0_HNA_6_5_31_3_0_LTD_VARIANT_ENTRY_H
+#include <bcmltd/defs/generated/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_ltd_variant_def.h>
+#endif /* GEN_BCM56880_A0_HNA_6_5_31_3_0_LTD_VARIANT_ENTRY_H */
+
+#ifndef DOXYGEN_IGNORE_AUTOGEN
+
+#if BCMLTD_CONFIG_INCLUDE_BCM56880_A0_HNA_6_5_31_3_0 == 1 || defined(BCMLTD_VARIANT_OVERRIDE)
+BCMLTD_VARIANT_ENTRY(bcm56880_a0,BCM56880_A0,hna_6_5_31_3_0,HNA_6_5_31_3_0,_,BCMLTD_VARIANT_BCM56880_A0_HNA_6_5_31_3_0,BCMLTD_VARIANT_LOCAL_BCM56880_A0_HNA_6_5_31_3_0,NULL,0,0)
+#endif
+
+#endif /* DOXYGEN_IGNORE_AUTOGEN */
+
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_ltd_variant_entry.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_ltd_variant_entry.h
deleted file mode 100755
index 99fed8f6ffdf..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_ltd_variant_entry.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by fltg from Logical Table mapping files.
- *
- * Tool: $SDK/tools/fltg/bin/fltg
- *
- * Edits to this file will be lost when it is regenerated.
- *
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- *
- ******************************************************************************/
-
-#ifndef GEN_BCM56880_A0_NFA_6_5_30_1_1_LTD_VARIANT_ENTRY_H
-#define GEN_BCM56880_A0_NFA_6_5_30_1_1_LTD_VARIANT_ENTRY_H
-#include <bcmltd/defs/generated/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_ltd_variant_def.h>
-#endif /* GEN_BCM56880_A0_NFA_6_5_30_1_1_LTD_VARIANT_ENTRY_H */
-
-#ifndef DOXYGEN_IGNORE_AUTOGEN
-
-#if BCMLTD_CONFIG_INCLUDE_BCM56880_A0_NFA_6_5_30_1_1 == 1 || defined(BCMLTD_VARIANT_OVERRIDE)
-BCMLTD_VARIANT_ENTRY(bcm56880_a0,BCM56880_A0,nfa_6_5_30_1_1,NFA_6_5_30_1_1,_,BCMLTD_VARIANT_BCM56880_A0_NFA_6_5_30_1_1,BCMLTD_VARIANT_LOCAL_BCM56880_A0_NFA_6_5_30_1_1,NULL,0,0)
-#endif
-
-#endif /* DOXYGEN_IGNORE_AUTOGEN */
-
-
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_ltd_variant_entry.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_ltd_variant_entry.h
new file mode 100644
index 000000000000..c99f56d39600
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_ltd_variant_entry.h
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by fltg from Logical Table mapping files.
+ *
+ * Tool: $SDK/tools/fltg/bin/fltg
+ *
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ *
+ ******************************************************************************/
+
+#ifndef GEN_BCM56880_A0_NFA_6_5_31_3_1_LTD_VARIANT_ENTRY_H
+#define GEN_BCM56880_A0_NFA_6_5_31_3_1_LTD_VARIANT_ENTRY_H
+#include <bcmltd/defs/generated/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_ltd_variant_def.h>
+#endif /* GEN_BCM56880_A0_NFA_6_5_31_3_1_LTD_VARIANT_ENTRY_H */
+
+#ifndef DOXYGEN_IGNORE_AUTOGEN
+
+#if BCMLTD_CONFIG_INCLUDE_BCM56880_A0_NFA_6_5_31_3_1 == 1 || defined(BCMLTD_VARIANT_OVERRIDE)
+BCMLTD_VARIANT_ENTRY(bcm56880_a0,BCM56880_A0,nfa_6_5_31_3_1,NFA_6_5_31_3_1,_,BCMLTD_VARIANT_BCM56880_A0_NFA_6_5_31_3_1,BCMLTD_VARIANT_LOCAL_BCM56880_A0_NFA_6_5_31_3_1,NULL,0,0)
+#endif
+
+#endif /* DOXYGEN_IGNORE_AUTOGEN */
+
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56890_a0/bcm56890_a0_ltd_variant_entry.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56890_a0/bcm56890_a0_ltd_variant_entry.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_ltd_variant_entry.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_ltd_variant_entry.h
deleted file mode 100755
index 4ac79fbe627e..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_ltd_variant_entry.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by fltg from Logical Table mapping files.
- *
- * Tool: $SDK/tools/fltg/bin/fltg
- *
- * Edits to this file will be lost when it is regenerated.
- *
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- *
- ******************************************************************************/
-
-#ifndef GEN_BCM56890_A0_CNA_6_5_30_2_0_LTD_VARIANT_ENTRY_H
-#define GEN_BCM56890_A0_CNA_6_5_30_2_0_LTD_VARIANT_ENTRY_H
-#include <bcmltd/defs/generated/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_ltd_variant_def.h>
-#endif /* GEN_BCM56890_A0_CNA_6_5_30_2_0_LTD_VARIANT_ENTRY_H */
-
-#ifndef DOXYGEN_IGNORE_AUTOGEN
-
-#if BCMLTD_CONFIG_INCLUDE_BCM56890_A0_CNA_6_5_30_2_0 == 1 || defined(BCMLTD_VARIANT_OVERRIDE)
-BCMLTD_VARIANT_ENTRY(bcm56890_a0,BCM56890_A0,cna_6_5_30_2_0,CNA_6_5_30_2_0,_,BCMLTD_VARIANT_BCM56890_A0_CNA_6_5_30_2_0,BCMLTD_VARIANT_LOCAL_BCM56890_A0_CNA_6_5_30_2_0,NULL,0,0)
-#endif
-
-#endif /* DOXYGEN_IGNORE_AUTOGEN */
-
-
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_ltd_variant_entry.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_ltd_variant_entry.h
new file mode 100644
index 000000000000..b0af4c032f96
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_ltd_variant_entry.h
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by fltg from Logical Table mapping files.
+ *
+ * Tool: $SDK/tools/fltg/bin/fltg
+ *
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ *
+ ******************************************************************************/
+
+#ifndef GEN_BCM56890_A0_CNA_6_5_31_3_0_LTD_VARIANT_ENTRY_H
+#define GEN_BCM56890_A0_CNA_6_5_31_3_0_LTD_VARIANT_ENTRY_H
+#include <bcmltd/defs/generated/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_ltd_variant_def.h>
+#endif /* GEN_BCM56890_A0_CNA_6_5_31_3_0_LTD_VARIANT_ENTRY_H */
+
+#ifndef DOXYGEN_IGNORE_AUTOGEN
+
+#if BCMLTD_CONFIG_INCLUDE_BCM56890_A0_CNA_6_5_31_3_0 == 1 || defined(BCMLTD_VARIANT_OVERRIDE)
+BCMLTD_VARIANT_ENTRY(bcm56890_a0,BCM56890_A0,cna_6_5_31_3_0,CNA_6_5_31_3_0,_,BCMLTD_VARIANT_BCM56890_A0_CNA_6_5_31_3_0,BCMLTD_VARIANT_LOCAL_BCM56890_A0_CNA_6_5_31_3_0,NULL,0,0)
+#endif
+
+#endif /* DOXYGEN_IGNORE_AUTOGEN */
+
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_ltd_variant_entry.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_ltd_variant_entry.h
deleted file mode 100755
index 6200261b3df9..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_ltd_variant_entry.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by fltg from Logical Table mapping files.
- *
- * Tool: $SDK/tools/fltg/bin/fltg
- *
- * Edits to this file will be lost when it is regenerated.
- *
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- *
- ******************************************************************************/
-
-#ifndef GEN_BCM56890_A0_DNA_6_5_30_8_0_LTD_VARIANT_ENTRY_H
-#define GEN_BCM56890_A0_DNA_6_5_30_8_0_LTD_VARIANT_ENTRY_H
-#include <bcmltd/defs/generated/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_ltd_variant_def.h>
-#endif /* GEN_BCM56890_A0_DNA_6_5_30_8_0_LTD_VARIANT_ENTRY_H */
-
-#ifndef DOXYGEN_IGNORE_AUTOGEN
-
-#if BCMLTD_CONFIG_INCLUDE_BCM56890_A0_DNA_6_5_30_8_0 == 1 || defined(BCMLTD_VARIANT_OVERRIDE)
-BCMLTD_VARIANT_ENTRY(bcm56890_a0,BCM56890_A0,dna_6_5_30_8_0,DNA_6_5_30_8_0,_,BCMLTD_VARIANT_BCM56890_A0_DNA_6_5_30_8_0,BCMLTD_VARIANT_LOCAL_BCM56890_A0_DNA_6_5_30_8_0,NULL,0,0)
-#endif
-
-#endif /* DOXYGEN_IGNORE_AUTOGEN */
-
-
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_ltd_variant_entry.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_ltd_variant_entry.h
new file mode 100644
index 000000000000..ae3385c9c03c
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_ltd_variant_entry.h
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by fltg from Logical Table mapping files.
+ *
+ * Tool: $SDK/tools/fltg/bin/fltg
+ *
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ *
+ ******************************************************************************/
+
+#ifndef GEN_BCM56890_A0_DNA_6_5_31_6_0_LTD_VARIANT_ENTRY_H
+#define GEN_BCM56890_A0_DNA_6_5_31_6_0_LTD_VARIANT_ENTRY_H
+#include <bcmltd/defs/generated/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_ltd_variant_def.h>
+#endif /* GEN_BCM56890_A0_DNA_6_5_31_6_0_LTD_VARIANT_ENTRY_H */
+
+#ifndef DOXYGEN_IGNORE_AUTOGEN
+
+#if BCMLTD_CONFIG_INCLUDE_BCM56890_A0_DNA_6_5_31_6_0 == 1 || defined(BCMLTD_VARIANT_OVERRIDE)
+BCMLTD_VARIANT_ENTRY(bcm56890_a0,BCM56890_A0,dna_6_5_31_6_0,DNA_6_5_31_6_0,_,BCMLTD_VARIANT_BCM56890_A0_DNA_6_5_31_6_0,BCMLTD_VARIANT_LOCAL_BCM56890_A0_DNA_6_5_31_6_0,NULL,0,0)
+#endif
+
+#endif /* DOXYGEN_IGNORE_AUTOGEN */
+
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56990_a0/bcm56990_a0_ltd_variant_entry.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56990_a0/bcm56990_a0_ltd_variant_entry.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56990_b0/bcm56990_b0_ltd_variant_entry.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56990_b0/bcm56990_b0_ltd_variant_entry.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56996_a0/bcm56996_a0_ltd_variant_entry.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56996_a0/bcm56996_a0_ltd_variant_entry.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56996_b0/bcm56996_b0_ltd_variant_entry.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56996_b0/bcm56996_b0_ltd_variant_entry.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56998_a0/bcm56998_a0_ltd_variant_entry.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56998_a0/bcm56998_a0_ltd_variant_entry.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56999_a0/bcm56999_a0_ltd_variant_entry.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm56999_a0/bcm56999_a0_ltd_variant_entry.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm78800_a0/bcm78800_a0_ltd_variant_entry.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm78800_a0/bcm78800_a0_ltd_variant_entry.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_ltd_variant_entry.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_ltd_variant_entry.h
deleted file mode 100755
index a69f9ba238c4..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_ltd_variant_entry.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by fltg from Logical Table mapping files.
- *
- * Tool: $SDK/tools/fltg/bin/fltg
- *
- * Edits to this file will be lost when it is regenerated.
- *
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- *
- ******************************************************************************/
-
-#ifndef GEN_BCM78800_A0_DNA_6_5_30_3_1_LTD_VARIANT_ENTRY_H
-#define GEN_BCM78800_A0_DNA_6_5_30_3_1_LTD_VARIANT_ENTRY_H
-#include <bcmltd/defs/generated/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_ltd_variant_def.h>
-#endif /* GEN_BCM78800_A0_DNA_6_5_30_3_1_LTD_VARIANT_ENTRY_H */
-
-#ifndef DOXYGEN_IGNORE_AUTOGEN
-
-#if BCMLTD_CONFIG_INCLUDE_BCM78800_A0_DNA_6_5_30_3_1 == 1 || defined(BCMLTD_VARIANT_OVERRIDE)
-BCMLTD_VARIANT_ENTRY(bcm78800_a0,BCM78800_A0,dna_6_5_30_3_1,DNA_6_5_30_3_1,_,BCMLTD_VARIANT_BCM78800_A0_DNA_6_5_30_3_1,BCMLTD_VARIANT_LOCAL_BCM78800_A0_DNA_6_5_30_3_1,NULL,0,0)
-#endif
-
-#endif /* DOXYGEN_IGNORE_AUTOGEN */
-
-
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_ltd_variant_entry.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_ltd_variant_entry.h
new file mode 100644
index 000000000000..7421d022d0f1
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_ltd_variant_entry.h
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by fltg from Logical Table mapping files.
+ *
+ * Tool: $SDK/tools/fltg/bin/fltg
+ *
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ *
+ ******************************************************************************/
+
+#ifndef GEN_BCM78800_A0_DNA_6_5_31_5_0_LTD_VARIANT_ENTRY_H
+#define GEN_BCM78800_A0_DNA_6_5_31_5_0_LTD_VARIANT_ENTRY_H
+#include <bcmltd/defs/generated/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_ltd_variant_def.h>
+#endif /* GEN_BCM78800_A0_DNA_6_5_31_5_0_LTD_VARIANT_ENTRY_H */
+
+#ifndef DOXYGEN_IGNORE_AUTOGEN
+
+#if BCMLTD_CONFIG_INCLUDE_BCM78800_A0_DNA_6_5_31_5_0 == 1 || defined(BCMLTD_VARIANT_OVERRIDE)
+BCMLTD_VARIANT_ENTRY(bcm78800_a0,BCM78800_A0,dna_6_5_31_5_0,DNA_6_5_31_5_0,_,BCMLTD_VARIANT_BCM78800_A0_DNA_6_5_31_5_0,BCMLTD_VARIANT_LOCAL_BCM78800_A0_DNA_6_5_31_5_0,NULL,0,0)
+#endif
+
+#endif /* DOXYGEN_IGNORE_AUTOGEN */
+
+
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm78900_b0/bcm78900_b0_ltd_variant_entry.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm78900_b0/bcm78900_b0_ltd_variant_entry.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm78905_a0/bcm78905_a0_ltd_variant_entry.h b/platform/broadcom/saibcm-modules/sdklt/bcmltd/include/bcmltd/entry/generated/bcm78905_a0/bcm78905_a0_ltd_variant_entry.h
old mode 100755
new mode 100644
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56080_a0/bcm56080_a0_pkt_lbhdr.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56080_a0/bcm56080_a0_pkt_lbhdr.c
index fb0db69dc947..296dbdedd674 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56080_a0/bcm56080_a0_pkt_lbhdr.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56080_a0/bcm56080_a0_pkt_lbhdr.c
@@ -250,6 +250,7 @@ const bcmpkt_lbhdr_fget_t bcm56080_a0_lbhdr_fget = {
         NULL,
         NULL,
         NULL,
+        NULL,
         NULL
     }
 };
@@ -311,6 +312,7 @@ const bcmpkt_lbhdr_fset_t bcm56080_a0_lbhdr_fset = {
         NULL,
         NULL,
         NULL,
+        NULL,
         NULL
     }
 };
@@ -331,7 +333,7 @@ static int bcm56080_a0_lbhdr_view_infos[BCMPKT_LBHDR_FID_COUNT] = {
      -1, -1, -1, -1, -1, -1, -1, -2, -2, -2, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -1, -1, -1, -1, -1, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
-     -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2,
 };
 
 
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56080_a0/bcm56080_a0_pkt_txpmd.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56080_a0/bcm56080_a0_pkt_txpmd.c
index 4c73216593c7..c5afc525b722 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56080_a0/bcm56080_a0_pkt_txpmd.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56080_a0/bcm56080_a0_pkt_txpmd.c
@@ -1197,6 +1197,45 @@ const bcmpkt_txpmd_fget_t bcm56080_a0_txpmd_fget = {
         NULL,
         NULL,
         NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
         NULL
     }
 };
@@ -1293,6 +1332,45 @@ const bcmpkt_txpmd_fset_t bcm56080_a0_txpmd_fset = {
         NULL,
         NULL,
         NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
         NULL
     }
 };
@@ -1318,7 +1396,10 @@ static int bcm56080_a0_txpmd_view_infos[BCMPKT_TXPMD_FID_COUNT] = {
       1,  1,  1,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
       2,  2,  2,  2, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
      12, 12, 12, 12, 12, 12, 12, -2, -2, -2, -2, -2, -2, -2, -2, -2,
-     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2,
 };
 
 
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56690_a0/bcm56690_a0_pkt_lbhdr.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56690_a0/bcm56690_a0_pkt_lbhdr.c
index cf8d9663d92e..41cedab39111 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56690_a0/bcm56690_a0_pkt_lbhdr.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56690_a0/bcm56690_a0_pkt_lbhdr.c
@@ -88,6 +88,7 @@ const bcmpkt_lbhdr_fget_t bcm56690_a0_lbhdr_fget = {
         NULL,
         NULL,
         NULL,
+        NULL,
         NULL
     }
 };
@@ -149,6 +150,7 @@ const bcmpkt_lbhdr_fset_t bcm56690_a0_lbhdr_fset = {
         NULL,
         NULL,
         NULL,
+        NULL,
         NULL
     }
 };
@@ -169,7 +171,7 @@ static int bcm56690_a0_lbhdr_view_infos[BCMPKT_LBHDR_FID_COUNT] = {
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
-     -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2,
 };
 
 
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56690_a0/bcm56690_a0_pkt_txpmd.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56690_a0/bcm56690_a0_pkt_txpmd.c
index d452bf6d8440..8dd5a62bed2d 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56690_a0/bcm56690_a0_pkt_txpmd.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56690_a0/bcm56690_a0_pkt_txpmd.c
@@ -482,6 +482,45 @@ const bcmpkt_txpmd_fget_t bcm56690_a0_txpmd_fget = {
         NULL,
         NULL,
         NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
         NULL
     }
 };
@@ -578,6 +617,45 @@ const bcmpkt_txpmd_fset_t bcm56690_a0_txpmd_fset = {
         NULL,
         NULL,
         NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
         NULL
     }
 };
@@ -600,7 +678,10 @@ static int bcm56690_a0_txpmd_view_infos[BCMPKT_TXPMD_FID_COUNT] = {
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -1, -2, -2, -2, -2, -2, -2, -2, -2,
-     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2,
 };
 
 
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56780_a0/bcm56780_a0_pkt_lbhdr.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56780_a0/bcm56780_a0_pkt_lbhdr.c
index 1337f4d115d2..4a987adc72bf 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56780_a0/bcm56780_a0_pkt_lbhdr.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56780_a0/bcm56780_a0_pkt_lbhdr.c
@@ -88,6 +88,7 @@ const bcmpkt_lbhdr_fget_t bcm56780_a0_lbhdr_fget = {
         NULL,
         NULL,
         NULL,
+        NULL,
         NULL
     }
 };
@@ -149,6 +150,7 @@ const bcmpkt_lbhdr_fset_t bcm56780_a0_lbhdr_fset = {
         NULL,
         NULL,
         NULL,
+        NULL,
         NULL
     }
 };
@@ -169,7 +171,7 @@ static int bcm56780_a0_lbhdr_view_infos[BCMPKT_LBHDR_FID_COUNT] = {
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
-     -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2,
 };
 
 
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56780_a0/bcm56780_a0_pkt_txpmd.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56780_a0/bcm56780_a0_pkt_txpmd.c
index 2a78f6b96a53..d02b97769a23 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56780_a0/bcm56780_a0_pkt_txpmd.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56780_a0/bcm56780_a0_pkt_txpmd.c
@@ -397,6 +397,45 @@ const bcmpkt_txpmd_fget_t bcm56780_a0_txpmd_fget = {
         NULL,
         NULL,
         NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
         NULL
     }
 };
@@ -493,6 +532,45 @@ const bcmpkt_txpmd_fset_t bcm56780_a0_txpmd_fset = {
         NULL,
         NULL,
         NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
         NULL
     }
 };
@@ -515,7 +593,10 @@ static int bcm56780_a0_txpmd_view_infos[BCMPKT_TXPMD_FID_COUNT] = {
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
-     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2,
 };
 
 
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56880_a0/bcm56880_a0_pkt_lbhdr.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56880_a0/bcm56880_a0_pkt_lbhdr.c
index 97c1234d65f2..b03a6b61958d 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56880_a0/bcm56880_a0_pkt_lbhdr.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56880_a0/bcm56880_a0_pkt_lbhdr.c
@@ -88,6 +88,7 @@ const bcmpkt_lbhdr_fget_t bcm56880_a0_lbhdr_fget = {
         NULL,
         NULL,
         NULL,
+        NULL,
         NULL
     }
 };
@@ -149,6 +150,7 @@ const bcmpkt_lbhdr_fset_t bcm56880_a0_lbhdr_fset = {
         NULL,
         NULL,
         NULL,
+        NULL,
         NULL
     }
 };
@@ -169,7 +171,7 @@ static int bcm56880_a0_lbhdr_view_infos[BCMPKT_LBHDR_FID_COUNT] = {
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
-     -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2,
 };
 
 
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56880_a0/bcm56880_a0_pkt_txpmd.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56880_a0/bcm56880_a0_pkt_txpmd.c
index 73e94d4efc02..10903d9878a9 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56880_a0/bcm56880_a0_pkt_txpmd.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56880_a0/bcm56880_a0_pkt_txpmd.c
@@ -397,6 +397,45 @@ const bcmpkt_txpmd_fget_t bcm56880_a0_txpmd_fget = {
         NULL,
         NULL,
         NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
         NULL
     }
 };
@@ -493,6 +532,45 @@ const bcmpkt_txpmd_fset_t bcm56880_a0_txpmd_fset = {
         NULL,
         NULL,
         NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
         NULL
     }
 };
@@ -515,7 +593,10 @@ static int bcm56880_a0_txpmd_view_infos[BCMPKT_TXPMD_FID_COUNT] = {
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
-     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2,
 };
 
 
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56890_a0/bcm56890_a0_pkt_lbhdr.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56890_a0/bcm56890_a0_pkt_lbhdr.c
index 435fedc94306..c2cc9de67797 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56890_a0/bcm56890_a0_pkt_lbhdr.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56890_a0/bcm56890_a0_pkt_lbhdr.c
@@ -88,6 +88,7 @@ const bcmpkt_lbhdr_fget_t bcm56890_a0_lbhdr_fget = {
         NULL,
         NULL,
         NULL,
+        NULL,
         NULL
     }
 };
@@ -149,6 +150,7 @@ const bcmpkt_lbhdr_fset_t bcm56890_a0_lbhdr_fset = {
         NULL,
         NULL,
         NULL,
+        NULL,
         NULL
     }
 };
@@ -169,7 +171,7 @@ static int bcm56890_a0_lbhdr_view_infos[BCMPKT_LBHDR_FID_COUNT] = {
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
-     -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2,
 };
 
 
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56890_a0/bcm56890_a0_pkt_txpmd.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56890_a0/bcm56890_a0_pkt_txpmd.c
index f76028c09ef5..560b2990dd37 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56890_a0/bcm56890_a0_pkt_txpmd.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56890_a0/bcm56890_a0_pkt_txpmd.c
@@ -483,6 +483,45 @@ const bcmpkt_txpmd_fget_t bcm56890_a0_txpmd_fget = {
         NULL,
         NULL,
         NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
         NULL
     }
 };
@@ -579,6 +618,45 @@ const bcmpkt_txpmd_fset_t bcm56890_a0_txpmd_fset = {
         NULL,
         NULL,
         NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
         NULL
     }
 };
@@ -601,7 +679,10 @@ static int bcm56890_a0_txpmd_view_infos[BCMPKT_TXPMD_FID_COUNT] = {
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -1, -2, -2, -2, -2, -2, -2, -2, -2,
-     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2,
 };
 
 
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56990_a0/bcm56990_a0_pkt_lbhdr.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56990_a0/bcm56990_a0_pkt_lbhdr.c
index 3fa7c9d881b2..0075799c7448 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56990_a0/bcm56990_a0_pkt_lbhdr.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56990_a0/bcm56990_a0_pkt_lbhdr.c
@@ -508,6 +508,7 @@ const bcmpkt_lbhdr_fget_t bcm56990_a0_lbhdr_fget = {
         NULL,
         NULL,
         NULL,
+        NULL,
         NULL
     }
 };
@@ -569,6 +570,7 @@ const bcmpkt_lbhdr_fset_t bcm56990_a0_lbhdr_fset = {
         NULL,
         NULL,
         NULL,
+        NULL,
         NULL
     }
 };
@@ -592,7 +594,7 @@ static int bcm56990_a0_lbhdr_view_infos[BCMPKT_LBHDR_FID_COUNT] = {
      -1, -1, -1, -1, -1, -1, -1,  2,  2, -2,  1,  1,  3,  3,  3,  3,
       3,  3,  3,  3,  3,  3,  3,  3,  3,  3, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
-     -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2,
 };
 
 
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56990_a0/bcm56990_a0_pkt_txpmd.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56990_a0/bcm56990_a0_pkt_txpmd.c
index bc93655d3e8d..3a3bbc451b29 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56990_a0/bcm56990_a0_pkt_txpmd.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56990_a0/bcm56990_a0_pkt_txpmd.c
@@ -410,6 +410,45 @@ const bcmpkt_txpmd_fget_t bcm56990_a0_txpmd_fget = {
         NULL,
         NULL,
         NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
         NULL
     }
 };
@@ -506,6 +545,45 @@ const bcmpkt_txpmd_fset_t bcm56990_a0_txpmd_fset = {
         NULL,
         NULL,
         NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
         NULL
     }
 };
@@ -528,7 +606,10 @@ static int bcm56990_a0_txpmd_view_infos[BCMPKT_TXPMD_FID_COUNT] = {
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
-     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2,
 };
 
 
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56990_b0/bcm56990_b0_pkt_lbhdr.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56990_b0/bcm56990_b0_pkt_lbhdr.c
index 49ac1724fbe7..62a0b38ce761 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56990_b0/bcm56990_b0_pkt_lbhdr.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56990_b0/bcm56990_b0_pkt_lbhdr.c
@@ -508,6 +508,7 @@ const bcmpkt_lbhdr_fget_t bcm56990_b0_lbhdr_fget = {
         NULL,
         NULL,
         NULL,
+        NULL,
         NULL
     }
 };
@@ -569,6 +570,7 @@ const bcmpkt_lbhdr_fset_t bcm56990_b0_lbhdr_fset = {
         NULL,
         NULL,
         NULL,
+        NULL,
         NULL
     }
 };
@@ -592,7 +594,7 @@ static int bcm56990_b0_lbhdr_view_infos[BCMPKT_LBHDR_FID_COUNT] = {
      -1, -1, -1, -1, -1, -1, -1,  2,  2, -2,  1,  1,  3,  3,  3,  3,
       3,  3,  3,  3,  3,  3,  3,  3,  3,  3, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
-     -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2,
 };
 
 
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56990_b0/bcm56990_b0_pkt_txpmd.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56990_b0/bcm56990_b0_pkt_txpmd.c
index d8d86e8770ce..209f2dad1cd4 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56990_b0/bcm56990_b0_pkt_txpmd.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56990_b0/bcm56990_b0_pkt_txpmd.c
@@ -410,6 +410,45 @@ const bcmpkt_txpmd_fget_t bcm56990_b0_txpmd_fget = {
         NULL,
         NULL,
         NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
         NULL
     }
 };
@@ -506,6 +545,45 @@ const bcmpkt_txpmd_fset_t bcm56990_b0_txpmd_fset = {
         NULL,
         NULL,
         NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
         NULL
     }
 };
@@ -528,7 +606,10 @@ static int bcm56990_b0_txpmd_view_infos[BCMPKT_TXPMD_FID_COUNT] = {
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
-     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2,
 };
 
 
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56996_a0/bcm56996_a0_pkt_lbhdr.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56996_a0/bcm56996_a0_pkt_lbhdr.c
index 4b1249b92617..e5af6791080c 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56996_a0/bcm56996_a0_pkt_lbhdr.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56996_a0/bcm56996_a0_pkt_lbhdr.c
@@ -508,6 +508,7 @@ const bcmpkt_lbhdr_fget_t bcm56996_a0_lbhdr_fget = {
         NULL,
         NULL,
         NULL,
+        NULL,
         NULL
     }
 };
@@ -569,6 +570,7 @@ const bcmpkt_lbhdr_fset_t bcm56996_a0_lbhdr_fset = {
         NULL,
         NULL,
         NULL,
+        NULL,
         NULL
     }
 };
@@ -592,7 +594,7 @@ static int bcm56996_a0_lbhdr_view_infos[BCMPKT_LBHDR_FID_COUNT] = {
      -1, -1, -1, -1, -1, -1, -1,  2,  2, -2,  1,  1,  3,  3,  3,  3,
       3,  3,  3,  3,  3,  3,  3,  3,  3,  3, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
-     -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2,
 };
 
 
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56996_a0/bcm56996_a0_pkt_txpmd.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56996_a0/bcm56996_a0_pkt_txpmd.c
index 7ac67f73f999..c9503facfc1b 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56996_a0/bcm56996_a0_pkt_txpmd.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56996_a0/bcm56996_a0_pkt_txpmd.c
@@ -410,6 +410,45 @@ const bcmpkt_txpmd_fget_t bcm56996_a0_txpmd_fget = {
         NULL,
         NULL,
         NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
         NULL
     }
 };
@@ -506,6 +545,45 @@ const bcmpkt_txpmd_fset_t bcm56996_a0_txpmd_fset = {
         NULL,
         NULL,
         NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
         NULL
     }
 };
@@ -528,7 +606,10 @@ static int bcm56996_a0_txpmd_view_infos[BCMPKT_TXPMD_FID_COUNT] = {
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
-     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2,
 };
 
 
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56996_b0/bcm56996_b0_pkt_lbhdr.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56996_b0/bcm56996_b0_pkt_lbhdr.c
index 12dc7734cba7..1a84e343cebc 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56996_b0/bcm56996_b0_pkt_lbhdr.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56996_b0/bcm56996_b0_pkt_lbhdr.c
@@ -508,6 +508,7 @@ const bcmpkt_lbhdr_fget_t bcm56996_b0_lbhdr_fget = {
         NULL,
         NULL,
         NULL,
+        NULL,
         NULL
     }
 };
@@ -569,6 +570,7 @@ const bcmpkt_lbhdr_fset_t bcm56996_b0_lbhdr_fset = {
         NULL,
         NULL,
         NULL,
+        NULL,
         NULL
     }
 };
@@ -592,7 +594,7 @@ static int bcm56996_b0_lbhdr_view_infos[BCMPKT_LBHDR_FID_COUNT] = {
      -1, -1, -1, -1, -1, -1, -1,  2,  2, -2,  1,  1,  3,  3,  3,  3,
       3,  3,  3,  3,  3,  3,  3,  3,  3,  3, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
-     -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2,
 };
 
 
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56996_b0/bcm56996_b0_pkt_txpmd.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56996_b0/bcm56996_b0_pkt_txpmd.c
index 4cf357466584..86155aa12723 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56996_b0/bcm56996_b0_pkt_txpmd.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56996_b0/bcm56996_b0_pkt_txpmd.c
@@ -410,6 +410,45 @@ const bcmpkt_txpmd_fget_t bcm56996_b0_txpmd_fget = {
         NULL,
         NULL,
         NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
         NULL
     }
 };
@@ -506,6 +545,45 @@ const bcmpkt_txpmd_fset_t bcm56996_b0_txpmd_fset = {
         NULL,
         NULL,
         NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
         NULL
     }
 };
@@ -528,7 +606,10 @@ static int bcm56996_b0_txpmd_view_infos[BCMPKT_TXPMD_FID_COUNT] = {
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
-     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2,
 };
 
 
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56998_a0/bcm56998_a0_pkt_lbhdr.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56998_a0/bcm56998_a0_pkt_lbhdr.c
index 530e6f33934f..0e2f538a3701 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56998_a0/bcm56998_a0_pkt_lbhdr.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56998_a0/bcm56998_a0_pkt_lbhdr.c
@@ -508,6 +508,7 @@ const bcmpkt_lbhdr_fget_t bcm56998_a0_lbhdr_fget = {
         NULL,
         NULL,
         NULL,
+        NULL,
         NULL
     }
 };
@@ -569,6 +570,7 @@ const bcmpkt_lbhdr_fset_t bcm56998_a0_lbhdr_fset = {
         NULL,
         NULL,
         NULL,
+        NULL,
         NULL
     }
 };
@@ -592,7 +594,7 @@ static int bcm56998_a0_lbhdr_view_infos[BCMPKT_LBHDR_FID_COUNT] = {
      -1, -1, -1, -1, -1, -1, -1,  2,  2, -2,  1,  1,  3,  3,  3,  3,
       3,  3,  3,  3,  3,  3,  3,  3,  3,  3, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
-     -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2,
 };
 
 
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56998_a0/bcm56998_a0_pkt_txpmd.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56998_a0/bcm56998_a0_pkt_txpmd.c
index 779a1650c85c..d5d17b82befe 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56998_a0/bcm56998_a0_pkt_txpmd.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56998_a0/bcm56998_a0_pkt_txpmd.c
@@ -410,6 +410,45 @@ const bcmpkt_txpmd_fget_t bcm56998_a0_txpmd_fget = {
         NULL,
         NULL,
         NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
         NULL
     }
 };
@@ -506,6 +545,45 @@ const bcmpkt_txpmd_fset_t bcm56998_a0_txpmd_fset = {
         NULL,
         NULL,
         NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
         NULL
     }
 };
@@ -528,7 +606,10 @@ static int bcm56998_a0_txpmd_view_infos[BCMPKT_TXPMD_FID_COUNT] = {
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
-     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2,
 };
 
 
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56999_a0/bcm56999_a0_pkt_lbhdr.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56999_a0/bcm56999_a0_pkt_lbhdr.c
index a7bdc0769714..c2870f507f63 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56999_a0/bcm56999_a0_pkt_lbhdr.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56999_a0/bcm56999_a0_pkt_lbhdr.c
@@ -508,6 +508,7 @@ const bcmpkt_lbhdr_fget_t bcm56999_a0_lbhdr_fget = {
         NULL,
         NULL,
         NULL,
+        NULL,
         NULL
     }
 };
@@ -569,6 +570,7 @@ const bcmpkt_lbhdr_fset_t bcm56999_a0_lbhdr_fset = {
         NULL,
         NULL,
         NULL,
+        NULL,
         NULL
     }
 };
@@ -592,7 +594,7 @@ static int bcm56999_a0_lbhdr_view_infos[BCMPKT_LBHDR_FID_COUNT] = {
      -1, -1, -1, -1, -1, -1, -1,  2,  2, -2,  1,  1,  3,  3,  3,  3,
       3,  3,  3,  3,  3,  3,  3,  3,  3,  3, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
-     -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2,
 };
 
 
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56999_a0/bcm56999_a0_pkt_txpmd.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56999_a0/bcm56999_a0_pkt_txpmd.c
index 525f34c0e67a..6ff890582d34 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56999_a0/bcm56999_a0_pkt_txpmd.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm56999_a0/bcm56999_a0_pkt_txpmd.c
@@ -410,6 +410,45 @@ const bcmpkt_txpmd_fget_t bcm56999_a0_txpmd_fget = {
         NULL,
         NULL,
         NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
         NULL
     }
 };
@@ -506,6 +545,45 @@ const bcmpkt_txpmd_fset_t bcm56999_a0_txpmd_fset = {
         NULL,
         NULL,
         NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
         NULL
     }
 };
@@ -528,7 +606,10 @@ static int bcm56999_a0_txpmd_view_infos[BCMPKT_TXPMD_FID_COUNT] = {
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
-     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2,
 };
 
 
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm78800_a0/bcm78800_a0_pkt_lbhdr.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm78800_a0/bcm78800_a0_pkt_lbhdr.c
index e977ea83fcd5..fd8db6259be0 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm78800_a0/bcm78800_a0_pkt_lbhdr.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm78800_a0/bcm78800_a0_pkt_lbhdr.c
@@ -88,6 +88,7 @@ const bcmpkt_lbhdr_fget_t bcm78800_a0_lbhdr_fget = {
         NULL,
         NULL,
         NULL,
+        NULL,
         NULL
     }
 };
@@ -149,6 +150,7 @@ const bcmpkt_lbhdr_fset_t bcm78800_a0_lbhdr_fset = {
         NULL,
         NULL,
         NULL,
+        NULL,
         NULL
     }
 };
@@ -169,7 +171,7 @@ static int bcm78800_a0_lbhdr_view_infos[BCMPKT_LBHDR_FID_COUNT] = {
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
-     -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2,
 };
 
 
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm78800_a0/bcm78800_a0_pkt_txpmd.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm78800_a0/bcm78800_a0_pkt_txpmd.c
index 76901a19f330..df3ecbf00cab 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm78800_a0/bcm78800_a0_pkt_txpmd.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm78800_a0/bcm78800_a0_pkt_txpmd.c
@@ -529,6 +529,45 @@ const bcmpkt_txpmd_fget_t bcm78800_a0_txpmd_fget = {
         NULL,
         NULL,
         NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
         NULL
     }
 };
@@ -625,6 +664,45 @@ const bcmpkt_txpmd_fset_t bcm78800_a0_txpmd_fset = {
         NULL,
         NULL,
         NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
         NULL
     }
 };
@@ -647,7 +725,10 @@ static int bcm78800_a0_txpmd_view_infos[BCMPKT_TXPMD_FID_COUNT] = {
      -2, -1, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -1, -1, -1, -2, -2, -2, -2, -2, -2,
-     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2,
 };
 
 
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm78900_b0/bcm78900_b0_pkt_lbhdr.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm78900_b0/bcm78900_b0_pkt_lbhdr.c
index 3e601cc5659e..42607a2ef874 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm78900_b0/bcm78900_b0_pkt_lbhdr.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm78900_b0/bcm78900_b0_pkt_lbhdr.c
@@ -266,6 +266,7 @@ const bcmpkt_lbhdr_fget_t bcm78900_b0_lbhdr_fget = {
         NULL,
         NULL,
         NULL,
+        NULL,
         NULL
     }
 };
@@ -327,6 +328,7 @@ const bcmpkt_lbhdr_fset_t bcm78900_b0_lbhdr_fset = {
         NULL,
         NULL,
         NULL,
+        NULL,
         NULL
     }
 };
@@ -347,7 +349,7 @@ static int bcm78900_b0_lbhdr_view_infos[BCMPKT_LBHDR_FID_COUNT] = {
      -1, -1, -2, -1, -1, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -1, -1, -1, -1, -1,
      -1, -1, -1, -1, -1, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
-     -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2,
 };
 
 
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm78900_b0/bcm78900_b0_pkt_txpmd.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm78900_b0/bcm78900_b0_pkt_txpmd.c
index 1d368e0c674a..e897c4001ea5 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm78900_b0/bcm78900_b0_pkt_txpmd.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm78900_b0/bcm78900_b0_pkt_txpmd.c
@@ -753,6 +753,45 @@ const bcmpkt_txpmd_fget_t bcm78900_b0_txpmd_fget = {
         NULL,
         NULL,
         NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
         NULL
     }
 };
@@ -849,6 +888,45 @@ const bcmpkt_txpmd_fset_t bcm78900_b0_txpmd_fset = {
         NULL,
         NULL,
         NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
         NULL
     }
 };
@@ -873,7 +951,10 @@ static int bcm78900_b0_txpmd_view_infos[BCMPKT_TXPMD_FID_COUNT] = {
       1,  1,  1,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, -2,
      -2,  2,  2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
-     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2,
 };
 
 
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm78905_a0/bcm78905_a0_pkt_lbhdr.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm78905_a0/bcm78905_a0_pkt_lbhdr.c
index ddded01f2183..4bae4436d0f7 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm78905_a0/bcm78905_a0_pkt_lbhdr.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm78905_a0/bcm78905_a0_pkt_lbhdr.c
@@ -266,6 +266,7 @@ const bcmpkt_lbhdr_fget_t bcm78905_a0_lbhdr_fget = {
         NULL,
         NULL,
         NULL,
+        NULL,
         NULL
     }
 };
@@ -327,6 +328,7 @@ const bcmpkt_lbhdr_fset_t bcm78905_a0_lbhdr_fset = {
         NULL,
         NULL,
         NULL,
+        NULL,
         NULL
     }
 };
@@ -347,7 +349,7 @@ static int bcm78905_a0_lbhdr_view_infos[BCMPKT_LBHDR_FID_COUNT] = {
      -1, -1, -2, -1, -1, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -1, -1, -1, -1, -1,
      -1, -1, -1, -1, -1, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
-     -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2,
 };
 
 
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm78905_a0/bcm78905_a0_pkt_txpmd.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm78905_a0/bcm78905_a0_pkt_txpmd.c
index 2da682502179..2884f8061351 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm78905_a0/bcm78905_a0_pkt_txpmd.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/chip/bcm78905_a0/bcm78905_a0_pkt_txpmd.c
@@ -753,6 +753,45 @@ const bcmpkt_txpmd_fget_t bcm78905_a0_txpmd_fget = {
         NULL,
         NULL,
         NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
         NULL
     }
 };
@@ -849,6 +888,45 @@ const bcmpkt_txpmd_fset_t bcm78905_a0_txpmd_fset = {
         NULL,
         NULL,
         NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
         NULL
     }
 };
@@ -873,7 +951,10 @@ static int bcm78905_a0_txpmd_view_infos[BCMPKT_TXPMD_FID_COUNT] = {
       1,  1,  1,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, -2,
      -2,  2,  2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
      -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
-     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+     -2,
 };
 
 
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/flexhdr/bcmpkt_flexhdr.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/flexhdr/bcmpkt_flexhdr.c
index 46d43820e6a1..b4a85434bcd3 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/flexhdr/bcmpkt_flexhdr.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/flexhdr/bcmpkt_flexhdr.c
@@ -166,6 +166,8 @@ bcmpkt_flexhdr_len_get(bcmlrd_variant_t variant, uint32_t hid,
     } else if (sal_strcasecmp(name, "hg3_base_t") == 0 ||
                sal_strcasecmp(name, "hg3_extension_0_t") == 0) {
         *len = 8;
+    } else if (sal_strcasecmp(name, "vlan_t") == 0) {
+        *len = 4;
     } else {
         /* no support*/
         *len = 0;
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/bcmpkt_flexhdr.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/bcmpkt_flexhdr.h
index c240b6e55f89..12184bda4833 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/bcmpkt_flexhdr.h
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/bcmpkt_flexhdr.h
@@ -37,6 +37,9 @@
 /*! Max profile count. */
 #define BCMPKT_FLEXHDR_PROFILE_MAX     64
 
+/*! Max profile count. */
+#define BCMPKT_FLEXHDR_PROFILE_BITMAP_MAX     4
+
 /*! CELL Error status bitmap. */
 #define BCMPKT_RXFLEXMETA_ST_CELL_ERROR (0x1 << 18)
 
@@ -139,6 +142,11 @@ typedef struct bcmpkt_flex_field_info_s {
     /*! Header field names. */
     bcmpkt_flex_field_metadata_t *info;
 
+    /*! Profile bitmap count. */
+    int profile_bmp_cnt;
+
+    /*! Profile bitmap. */
+    uint32_t profile_bmp[BCMPKT_FLEXHDR_PROFILE_BITMAP_MAX];
 } bcmpkt_flex_field_info_t;
 
 /*! RXPMD data update function pointer. */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/bcmpkt_lbhdr.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/bcmpkt_lbhdr.h
index c61ec2411891..a5b27b0609cc 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/bcmpkt_lbhdr.h
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/bcmpkt_lbhdr.h
@@ -35,7 +35,7 @@
 #define BCMPKT_LBHDR_SIZE_WORDS         4
 
 /*!
- * \name LBHDR Dumping flags.
+ * \name LBHDR Dump flags. (deprecated by BCMPKT_DUMP_F_XXX)
  * \anchor BCMPKT_LBHDR_DUMP_F_XXX
  */
 /*! \{ */
@@ -44,7 +44,7 @@
  */
 #define BCMPKT_LBHDR_DUMP_F_ALL         0
 /*!
- * Dump none zero field content only.
+ * Dump non-zero field content only.
  */
 #define BCMPKT_LBHDR_DUMP_F_NONE_ZERO   1
 /*! \} */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/bcmpkt_lbhdr_defs.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/bcmpkt_lbhdr_defs.h
index 85ded0cb45bc..ef2f1e1896d2 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/bcmpkt_lbhdr_defs.h
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/bcmpkt_lbhdr_defs.h
@@ -191,8 +191,10 @@
 #define BCMPKT_LBHDR_TRUNCATE_OFFSET_MD_ETH      53
 /*!  */
 #define BCMPKT_LBHDR_SVP_MD_ETH                  54
+/*!  */
+#define BCMPKT_LBHDR_CNP_OR_CNM_MD_ETH           55
 /*! LBHDR FIELD ID NUMBER */
-#define BCMPKT_LBHDR_FID_COUNT                   55
+#define BCMPKT_LBHDR_FID_COUNT                   56
 /*! \} */
 
 /*! LBHDR field name strings for debugging. */
@@ -252,6 +254,7 @@
     {"TRUNCATE_MD_ETH", BCMPKT_LBHDR_TRUNCATE_MD_ETH},\
     {"TRUNCATE_OFFSET_MD_ETH", BCMPKT_LBHDR_TRUNCATE_OFFSET_MD_ETH},\
     {"SVP_MD_ETH", BCMPKT_LBHDR_SVP_MD_ETH},\
+    {"CNP_OR_CNM_MD_ETH", BCMPKT_LBHDR_CNP_OR_CNM_MD_ETH},\
     {"fid count", BCMPKT_LBHDR_FID_COUNT}
 
 /*!
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/bcmpkt_pmd.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/bcmpkt_pmd.h
index dd9f99fff6ff..20ff6afda2d1 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/bcmpkt_pmd.h
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/bcmpkt_pmd.h
@@ -40,15 +40,6 @@
 /*! Bitmap array size. */
 #define BCMPKT_BITMAP_WORD_SIZE  16
 
-/*!
- * \name BCMPKT Dumping flags.
- * \anchor BCMPKT_DUMP_F_XXX
- */
-/*! Dump all fields contents. */
-#define BCMPKT_DUMP_F_ALL         0
-/*! Dump none zero field content only. */
-#define BCMPKT_DUMP_F_NONE_ZERO   1
-
 /*! PMD header field ID bit array. */
 typedef struct bcmpkt_bitmap_s {
     /*! Bit array */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/bcmpkt_rxpmd.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/bcmpkt_rxpmd.h
index c97a44978946..a028547fe910 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/bcmpkt_rxpmd.h
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/bcmpkt_rxpmd.h
@@ -51,7 +51,7 @@ typedef struct bcmpkt_rx_reasons_s {
 } bcmpkt_rx_reasons_t;
 
 /*!
- * \name RXPMD Dumping flags.
+ * \name RXPMD Dump flags. (deprecated by BCMPKT_DUMP_F_XXX)
  * \anchor BCMPKT_RXPMD_DUMP_F_XXX
  */
 /*! \{ */
@@ -60,7 +60,7 @@ typedef struct bcmpkt_rx_reasons_s {
  */
 #define BCMPKT_RXPMD_DUMP_F_ALL         0
 /*!
- * Dump none zero field content only.
+ * Dump non-zero field content only.
  */
 #define BCMPKT_RXPMD_DUMP_F_NONE_ZERO   1
 /*! \} */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/bcmpkt_rxpmd_defs.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/bcmpkt_rxpmd_defs.h
index c3e4ad128083..3b94fe60a2a9 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/bcmpkt_rxpmd_defs.h
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/bcmpkt_rxpmd_defs.h
@@ -790,20 +790,18 @@
 #define BCMPKT_RX_REASON_INVALID_GSH_NON_GSH     137
 /*! Copy to CPU triggered at egress pipeline. */
 #define BCMPKT_RX_REASON_EP_CTC                  138
-/*! Indicates SVTAG.ERROR !=0 or SVTAG.CPU = 1. */
-#define BCMPKT_RX_REASON_MACSEC                  139
 /*! APU Policy CTC. */
-#define BCMPKT_RX_REASON_APU_POLICY_CTC          140
+#define BCMPKT_RX_REASON_APU_POLICY_CTC          139
 /*! Delayed CTC. */
-#define BCMPKT_RX_REASON_DELAYED_CTC             141
+#define BCMPKT_RX_REASON_DELAYED_CTC             140
 /*! Indicates Copy to CPU is for PORT_DOWN event. */
-#define BCMPKT_RX_REASON_PORT_DOWN               142
+#define BCMPKT_RX_REASON_PORT_DOWN               141
 /*! SRV6 Control Packet */
-#define BCMPKT_RX_REASON_SRV6_CONTROL_PKT        143
+#define BCMPKT_RX_REASON_SRV6_CONTROL_PKT        142
 /*! OUI Compression miss */
-#define BCMPKT_RX_REASON_OUI_COMPRESSION_MISS    144
+#define BCMPKT_RX_REASON_OUI_COMPRESSION_MISS    143
 /*! BCMPKT_RX_REASON TYPE NUMBER */
-#define BCMPKT_RX_REASON_COUNT                   145
+#define BCMPKT_RX_REASON_COUNT                   144
 /*! \} */
 
 /*! RXPMD reason name strings for debugging. */
@@ -947,7 +945,6 @@
     {"RESERVED_REASON", 136},\
     {"INVALID_GSH_NON_GSH", BCMPKT_RX_REASON_INVALID_GSH_NON_GSH},\
     {"EP_CTC", BCMPKT_RX_REASON_EP_CTC},\
-    {"MACSEC", BCMPKT_RX_REASON_MACSEC},\
     {"APU_POLICY_CTC", BCMPKT_RX_REASON_APU_POLICY_CTC},\
     {"DELAYED_CTC", BCMPKT_RX_REASON_DELAYED_CTC},\
     {"PORT_DOWN", BCMPKT_RX_REASON_PORT_DOWN},\
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/bcmpkt_txpmd.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/bcmpkt_txpmd.h
index 2e5f10be9562..cb07deee4024 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/bcmpkt_txpmd.h
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/bcmpkt_txpmd.h
@@ -35,7 +35,7 @@
 #define BCMPKT_TXPMD_SIZE_WORDS         4
 
 /*!
- * \name TXPMD Dumping flags.
+ * \name TXPMD Dump flags. (deprecated by BCMPKT_DUMP_F_XXX)
  * \anchor BCMPKT_TXPMD_DUMP_F_XXX
  */
 /*! \{ */
@@ -44,7 +44,7 @@
  */
 #define BCMPKT_TXPMD_DUMP_F_ALL         0
 /*!
- * Dump none zero field content only.
+ * Dump non-zero field content only.
  */
 #define BCMPKT_TXPMD_DUMP_F_NONE_ZERO   1
 /*! \} */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/bcmpkt_txpmd_defs.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/bcmpkt_txpmd_defs.h
index e7cfa9d7cf5f..7658474bf622 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/bcmpkt_txpmd_defs.h
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/bcmpkt_txpmd_defs.h
@@ -199,32 +199,114 @@
 #define BCMPKT_TXPMD_COOKIE_7_0                  76
 /*! The MSB of Cookie corresponding to 1588 2-Step */
 #define BCMPKT_TXPMD_COOKIE_8                    77
-/*! Unicast Valid. */
-#define BCMPKT_TXPMD_UNICAST_VALID               78
-/*! Indicates the vpp port to send a SOBMH packet out. */
-#define BCMPKT_TXPMD_DST_VPP_PORT_NUM            79
-/*! Indicates for TS packet transmitted from CPU into IP that the outgoing packet needs to have its transmit timestamp captured by the port. */
-#define BCMPKT_TXPMD_IEEE1588_TX_TS              80
-/*! Destination chip port number. */
-#define BCMPKT_TXPMD_DST_CHIP_PORT_NUM           81
-/*! Source chip port number. */
-#define BCMPKT_TXPMD_SRC_CHIP_PORT_NUM           82
 /*! Unicast packet type. */
-#define BCMPKT_TXPMD_UNICAST_PKT_TYPE            83
-/*! Unicast packet. */
-#define BCMPKT_TXPMD_UNICAST_PKT_VALID           84
+#define BCMPKT_TXPMD_AUX_SOBMH_UNICAST_PKT       78
 /*! vpp_port to send a SOBMH packet out. */
-#define BCMPKT_TXPMD_TX_VPP_PORT                 85
+#define BCMPKT_TXPMD_AUX_SOBMH_TX_VPP_PORT       79
 /*! Destination chip_port number. */
-#define BCMPKT_TXPMD_TX_CHIP_PORT                86
+#define BCMPKT_TXPMD_AUX_SOBMH_TX_CHIP_PORT      80
 /*! RX chip port. */
-#define BCMPKT_TXPMD_RX_CHIP_PORT                87
-/*! Ingress vpp port. */
-#define BCMPKT_TXPMD_RX_VPP_PORT                 88
+#define BCMPKT_TXPMD_AUX_SOBMH_RX_CHIP_PORT      81
 /*! SVP */
-#define BCMPKT_TXPMD_CPU_TX_SVP                  89
+#define BCMPKT_TXPMD_CPU_TX_SVP                  82
+/*! Switch packet copy is accepted. */
+#define BCMPKT_TXPMD_SWITCH_COPY                 83
+/*! Switch packet copy type. */
+#define BCMPKT_TXPMD_SWITCH_COPY_TYPE            84
+/*! Destination port of switch packet copy. */
+#define BCMPKT_TXPMD_SWITCH_COPY_DEST_PORT       85
+/*! Queue number of the switch packet copy. */
+#define BCMPKT_TXPMD_SWITCH_COPY_COS             86
+/*! Adaptive routing group. */
+#define BCMPKT_TXPMD_CPU_TX_AR_GROUP             87
+/*! INCA group ID. */
+#define BCMPKT_TXPMD_CPU_TX_INCA_GROUP_ID        88
+/*! INCA collective ID. */
+#define BCMPKT_TXPMD_CPU_TX_INCA_COLLECTIVE_ID   89
+/*! INCA internal QP ID. */
+#define BCMPKT_TXPMD_CPU_TX_INCA_INTERNAL_QP_ID  90
+/*! INCA source host profile. */
+#define BCMPKT_TXPMD_CPU_TX_INCA_SRC_HOST_PROFILE 91
+/*! INCA flow type. */
+#define BCMPKT_TXPMD_CPU_TX_INCA_FLOW_TYPE       92
+/*! INCA Reduction required: 0 : Reduction not required (Broadcast), 1 : Reduction required         (AllReduce/Reduce) */
+#define BCMPKT_TXPMD_CPU_TX_INCA_REDN_REQD       93
+/*! INCA Replication required: 0 : Replication not required (Reduce), 1 : Replication required (AllReduce/Broadcast) */
+#define BCMPKT_TXPMD_CPU_TX_INCA_REPL_REQD       94
+/*! INCA Second pass destination. */
+#define BCMPKT_TXPMD_CPU_TX_INCA_SECOND_PASS_DEST 95
+/*!
+ * Operation type. 0-Sum, 1-Sum and Scale, 2-15 - Reserved.
+ * Valid only when the INCA_REDN_REQD==1 where INCA reduction is required.
+ * This field is consumed by ICE and not carried beyond to second pass.
+ */
+#define BCMPKT_TXPMD_CPU_TX_INCA_ICE_OPER_TYPE   96
+/*! Vlan profile. */
+#define BCMPKT_TXPMD_CPU_TX_VLAN_PROFILE         97
+/*! Forwarding profile. */
+#define BCMPKT_TXPMD_CPU_TX_FWD_PROFILE          98
+/*! Data format. Valid only when INCA_REDN_REQD==1 where INCA reduction is required. This field is consumed by ICE and not carried beyond to second pass. */
+#define BCMPKT_TXPMD_CPU_TX_INCA_ICE_DATA_FORMAT 99
+/*! Indicates the offset at 2B granularity from beginning of the pkt to the start  of INCA DATA for reduction.Valid only when INCA_REDN_REQD==1 where INCA reduction is required. This  is consumed by IDN and not carried beyond to second pass. */
+#define BCMPKT_TXPMD_CPU_TX_INCA_ICE_DATA_OFFSET 100
+/*! CNG field. */
+#define BCMPKT_TXPMD_CPU_TX_CNG                  101
+/*! Packet Entropy. */
+#define BCMPKT_TXPMD_CPU_TX_PACKET_ENTROPY       102
+/*! Source port number. */
+#define BCMPKT_TXPMD_CPU_TX_SRC_PORT_NUM         103
+/*! Packet control profile. */
+#define BCMPKT_TXPMD_CPU_TX_PKT_CTRL_PROFILE     104
+/*! Queue number. */
+#define BCMPKT_TXPMD_CPU_TX_COS                  105
+/*! Internal priority valid. */
+#define BCMPKT_TXPMD_CPU_TX_INT_PRI_VALID        106
+/*! CNG vaild. */
+#define BCMPKT_TXPMD_CPU_TX_CNG_VALID            107
+/*! Internal congestion valid. */
+#define BCMPKT_TXPMD_CPU_TX_INT_CN_VALID         108
+/*! Input priority valid. */
+#define BCMPKT_TXPMD_CPU_TX_INPUT_PRI_VALID      109
+/*! COS valid. */
+#define BCMPKT_TXPMD_CPU_TX_COS_VALID            110
+/*! CPU Tx Type. */
+#define BCMPKT_TXPMD_CPU_TX_CPU_TX_TYPE          111
+/*! DOP Trigger. */
+#define BCMPKT_TXPMD_CPU_TX_DOP_TRIGGER          112
+/*! Aux to LPP class ID. */
+#define BCMPKT_TXPMD_CPU_TX_VPP_TO_LPP_CLASS_ID  113
+/*! Cell length */
+#define BCMPKT_TXPMD_AUX_SOBMH_CELL_LENGTH       114
+/*! End of Packet indication. */
+#define BCMPKT_TXPMD_AUX_SOBMH_EOP               115
+/*! Start of packet indication. */
+#define BCMPKT_TXPMD_AUX_SOBMH_SOP               116
+/*! Packet length. */
+#define BCMPKT_TXPMD_AUX_SOBMH_PKT_LENGTH        117
+/*! Copy to CPU. */
+#define BCMPKT_TXPMD_AUX_SOBMH_COPY_TO_CPU       118
+/*! Copy to debug. */
+#define BCMPKT_TXPMD_AUX_SOBMH_COPY_TO_DEBUG     119
+/*! CNG field. */
+#define BCMPKT_TXPMD_AUX_SOBMH_CNG               120
+/*! Queue number. */
+#define BCMPKT_TXPMD_AUX_SOBMH_COS               121
+/*! Indicates that PBI.UNICAST should be set to queue as unicast packet. */
+#define BCMPKT_TXPMD_AUX_SOBMH_UNICAST           122
+/*! Indicates that PBI.L2_BITMAP should be set (to queue as L2MC packet). */
+#define BCMPKT_TXPMD_AUX_SOBMH_SET_L2BM          123
+/*! RQE queue number. */
+#define BCMPKT_TXPMD_AUX_SOBMH_RQE_Q_NUM         124
+/*! Input priority. */
+#define BCMPKT_TXPMD_AUX_SOBMH_INPUT_PRI         125
+/*! Cell error indication. */
+#define BCMPKT_TXPMD_AUX_SOBMH_CELL_ERROR        126
+/*! Header type. */
+#define BCMPKT_TXPMD_AUX_SOBMH_HEADER_TYPE       127
+/*! Start of frame indicator. */
+#define BCMPKT_TXPMD_AUX_SOBMH_START             128
 /*! TXPMD FIELD ID NUMBER */
-#define BCMPKT_TXPMD_FID_COUNT                   90
+#define BCMPKT_TXPMD_FID_COUNT                   129
 /*! \} */
 
 /*! TXPMD field name strings for debugging. */
@@ -307,18 +389,57 @@
     {"CPU_TX::COOKIE_VALID", BCMPKT_TXPMD_CPU_TX_COOKIE_VALID},\
     {"COOKIE_7_0", BCMPKT_TXPMD_COOKIE_7_0},\
     {"COOKIE_8", BCMPKT_TXPMD_COOKIE_8},\
-    {"UNICAST_VALID", BCMPKT_TXPMD_UNICAST_VALID},\
-    {"DST_VPP_PORT_NUM", BCMPKT_TXPMD_DST_VPP_PORT_NUM},\
-    {"IEEE1588_TX_TS", BCMPKT_TXPMD_IEEE1588_TX_TS},\
-    {"DST_CHIP_PORT_NUM", BCMPKT_TXPMD_DST_CHIP_PORT_NUM},\
-    {"SRC_CHIP_PORT_NUM", BCMPKT_TXPMD_SRC_CHIP_PORT_NUM},\
-    {"UNICAST_PKT_TYPE", BCMPKT_TXPMD_UNICAST_PKT_TYPE},\
-    {"UNICAST_PKT_VALID", BCMPKT_TXPMD_UNICAST_PKT_VALID},\
-    {"TX_VPP_PORT", BCMPKT_TXPMD_TX_VPP_PORT},\
-    {"TX_CHIP_PORT", BCMPKT_TXPMD_TX_CHIP_PORT},\
-    {"RX_CHIP_PORT", BCMPKT_TXPMD_RX_CHIP_PORT},\
-    {"RX_VPP_PORT", BCMPKT_TXPMD_RX_VPP_PORT},\
+    {"AUX_SOBMH::UNICAST_PKT", BCMPKT_TXPMD_AUX_SOBMH_UNICAST_PKT},\
+    {"AUX_SOBMH::TX_VPP_PORT", BCMPKT_TXPMD_AUX_SOBMH_TX_VPP_PORT},\
+    {"AUX_SOBMH::TX_CHIP_PORT", BCMPKT_TXPMD_AUX_SOBMH_TX_CHIP_PORT},\
+    {"AUX_SOBMH::RX_CHIP_PORT", BCMPKT_TXPMD_AUX_SOBMH_RX_CHIP_PORT},\
     {"CPU_TX::SVP", BCMPKT_TXPMD_CPU_TX_SVP},\
+    {"SWITCH_COPY", BCMPKT_TXPMD_SWITCH_COPY},\
+    {"SWITCH_COPY_TYPE", BCMPKT_TXPMD_SWITCH_COPY_TYPE},\
+    {"SWITCH_COPY_DEST_PORT", BCMPKT_TXPMD_SWITCH_COPY_DEST_PORT},\
+    {"SWITCH_COPY_COS", BCMPKT_TXPMD_SWITCH_COPY_COS},\
+    {"CPU_TX::AR_GROUP", BCMPKT_TXPMD_CPU_TX_AR_GROUP},\
+    {"CPU_TX::INCA_GROUP_ID", BCMPKT_TXPMD_CPU_TX_INCA_GROUP_ID},\
+    {"CPU_TX::INCA_COLLECTIVE_ID", BCMPKT_TXPMD_CPU_TX_INCA_COLLECTIVE_ID},\
+    {"CPU_TX::INCA_INTERNAL_QP_ID", BCMPKT_TXPMD_CPU_TX_INCA_INTERNAL_QP_ID},\
+    {"CPU_TX::INCA_SRC_HOST_PROFILE", BCMPKT_TXPMD_CPU_TX_INCA_SRC_HOST_PROFILE},\
+    {"CPU_TX::INCA_FLOW_TYPE", BCMPKT_TXPMD_CPU_TX_INCA_FLOW_TYPE},\
+    {"CPU_TX::INCA_REDN_REQD", BCMPKT_TXPMD_CPU_TX_INCA_REDN_REQD},\
+    {"CPU_TX::INCA_REPL_REQD", BCMPKT_TXPMD_CPU_TX_INCA_REPL_REQD},\
+    {"CPU_TX::INCA_SECOND_PASS_DEST", BCMPKT_TXPMD_CPU_TX_INCA_SECOND_PASS_DEST},\
+    {"CPU_TX::INCA_ICE_OPER_TYPE", BCMPKT_TXPMD_CPU_TX_INCA_ICE_OPER_TYPE},\
+    {"CPU_TX::VLAN_PROFILE", BCMPKT_TXPMD_CPU_TX_VLAN_PROFILE},\
+    {"CPU_TX::FWD_PROFILE", BCMPKT_TXPMD_CPU_TX_FWD_PROFILE},\
+    {"CPU_TX::INCA_ICE_DATA_FORMAT", BCMPKT_TXPMD_CPU_TX_INCA_ICE_DATA_FORMAT},\
+    {"CPU_TX::INCA_ICE_DATA_OFFSET", BCMPKT_TXPMD_CPU_TX_INCA_ICE_DATA_OFFSET},\
+    {"CPU_TX::CNG", BCMPKT_TXPMD_CPU_TX_CNG},\
+    {"CPU_TX::PACKET_ENTROPY", BCMPKT_TXPMD_CPU_TX_PACKET_ENTROPY},\
+    {"CPU_TX::SRC_PORT_NUM", BCMPKT_TXPMD_CPU_TX_SRC_PORT_NUM},\
+    {"CPU_TX::PKT_CTRL_PROFILE", BCMPKT_TXPMD_CPU_TX_PKT_CTRL_PROFILE},\
+    {"CPU_TX::COS", BCMPKT_TXPMD_CPU_TX_COS},\
+    {"CPU_TX::INT_PRI_VALID", BCMPKT_TXPMD_CPU_TX_INT_PRI_VALID},\
+    {"CPU_TX::CNG_VALID", BCMPKT_TXPMD_CPU_TX_CNG_VALID},\
+    {"CPU_TX::INT_CN_VALID", BCMPKT_TXPMD_CPU_TX_INT_CN_VALID},\
+    {"CPU_TX::INPUT_PRI_VALID", BCMPKT_TXPMD_CPU_TX_INPUT_PRI_VALID},\
+    {"CPU_TX::COS_VALID", BCMPKT_TXPMD_CPU_TX_COS_VALID},\
+    {"CPU_TX::CPU_TX_TYPE", BCMPKT_TXPMD_CPU_TX_CPU_TX_TYPE},\
+    {"CPU_TX::DOP_TRIGGER", BCMPKT_TXPMD_CPU_TX_DOP_TRIGGER},\
+    {"CPU_TX::VPP_TO_LPP_CLASS_ID", BCMPKT_TXPMD_CPU_TX_VPP_TO_LPP_CLASS_ID},\
+    {"AUX_SOBMH::CELL_LENGTH", BCMPKT_TXPMD_AUX_SOBMH_CELL_LENGTH},\
+    {"AUX_SOBMH::EOP", BCMPKT_TXPMD_AUX_SOBMH_EOP},\
+    {"AUX_SOBMH::SOP", BCMPKT_TXPMD_AUX_SOBMH_SOP},\
+    {"AUX_SOBMH::PKT_LENGTH", BCMPKT_TXPMD_AUX_SOBMH_PKT_LENGTH},\
+    {"AUX_SOBMH::COPY_TO_CPU", BCMPKT_TXPMD_AUX_SOBMH_COPY_TO_CPU},\
+    {"AUX_SOBMH::COPY_TO_DEBUG", BCMPKT_TXPMD_AUX_SOBMH_COPY_TO_DEBUG},\
+    {"AUX_SOBMH::CNG", BCMPKT_TXPMD_AUX_SOBMH_CNG},\
+    {"AUX_SOBMH::COS", BCMPKT_TXPMD_AUX_SOBMH_COS},\
+    {"AUX_SOBMH::UNICAST", BCMPKT_TXPMD_AUX_SOBMH_UNICAST},\
+    {"AUX_SOBMH::SET_L2BM", BCMPKT_TXPMD_AUX_SOBMH_SET_L2BM},\
+    {"AUX_SOBMH::RQE_Q_NUM", BCMPKT_TXPMD_AUX_SOBMH_RQE_Q_NUM},\
+    {"AUX_SOBMH::INPUT_PRI", BCMPKT_TXPMD_AUX_SOBMH_INPUT_PRI},\
+    {"AUX_SOBMH::CELL_ERROR", BCMPKT_TXPMD_AUX_SOBMH_CELL_ERROR},\
+    {"AUX_SOBMH::HEADER_TYPE", BCMPKT_TXPMD_AUX_SOBMH_HEADER_TYPE},\
+    {"AUX_SOBMH::START", BCMPKT_TXPMD_AUX_SOBMH_START},\
     {"fid count", BCMPKT_TXPMD_FID_COUNT}
 
 /*!
@@ -348,10 +469,16 @@
 #define BCMPKT_TXPMD_HEADER_T_TO_CPU             0
 /*! Packets from CPU with SOBMH header format to Passthru NLF */
 #define BCMPKT_TXPMD_HEADER_T_FROM_CPU           1
+/*! Header type CPU_TX in LPP pipeline */
+#define BCMPKT_TXPMD_HEADER_T_LPP_CPU_TX         1
 /*! Header type CPU_TX */
 #define BCMPKT_TXPMD_HEADER_T_CPU_TX             2
+/*! Header type TX_MD in LPP pipeline */
+#define BCMPKT_TXPMD_HEADER_T_LPP_TX_MD_HEADER   2
 /*! MAC in MAC packets to Passthru NLF */
 #define BCMPKT_TXPMD_HEADER_T_MIM                2
+/*! Packet with SOBMH header format */
+#define BCMPKT_TXPMD_HEADER_T_LPP_SOBMH          3
 /*! MPLS packets to Passthru NLF */
 #define BCMPKT_TXPMD_HEADER_T_MPLS_PMP           3
 /*! Trill Network Packets to Passthru NLF */
@@ -380,8 +507,11 @@
 #define BCMPKT_TXPMD_HEADER_TYPE_NAME_MAP_INIT \
     {"SOBMH_EP_COPY_TO_CPU", BCMPKT_TXPMD_HEADER_T_TO_CPU},\
     {"SOBMH_FROM_CPU", BCMPKT_TXPMD_HEADER_T_FROM_CPU},\
+    {"LPP_CPU_TX", BCMPKT_TXPMD_HEADER_T_LPP_CPU_TX},\
     {"CPU_TX", BCMPKT_TXPMD_HEADER_T_CPU_TX},\
+    {"LPP_TX_MD_HEADER", BCMPKT_TXPMD_HEADER_T_LPP_TX_MD_HEADER},\
     {"MIM", BCMPKT_TXPMD_HEADER_T_MIM},\
+    {"LPP_SOBMH", BCMPKT_TXPMD_HEADER_T_LPP_SOBMH},\
     {"MPLS_PMP", BCMPKT_TXPMD_HEADER_T_MPLS_PMP},\
     {"TRILL_NW", BCMPKT_TXPMD_HEADER_T_TRILL_NW},\
     {"TRILL_AC", BCMPKT_TXPMD_HEADER_T_TRILL_AC},\
@@ -433,12 +563,20 @@
 /*! \{ */
 /*! Egress Port */
 #define BCMPKT_TXPMD_CPU_TX_DESTINATION_T_EGRESS_PORT 0
+/*! Destination is Invalid */
+#define BCMPKT_TXPMD_CPU_TX_DESTINATION_T_NULL   0
+/*! Egress Port */
+#define BCMPKT_TXPMD_CPU_TX_DESTINATION_T_DEST_PORT 1
 /*! Next Hop Index */
 #define BCMPKT_TXPMD_CPU_TX_DESTINATION_T_NHI    1
 /*! ECMP Group */
 #define BCMPKT_TXPMD_CPU_TX_DESTINATION_T_ECMP   2
+/*! Trunk ID */
+#define BCMPKT_TXPMD_CPU_TX_DESTINATION_T_TGID   2
 /*! ECMP member id */
 #define BCMPKT_TXPMD_CPU_TX_DESTINATION_T_ECMP_MEMBER 3
+/*! Next Hop Index */
+#define BCMPKT_TXPMD_CPU_TX_DESTINATION_T_NEXT_HOP 3
 /*! IP Multicast Group */
 #define BCMPKT_TXPMD_CPU_TX_DESTINATION_T_IPMC   4
 /*! L2MC group */
@@ -458,18 +596,18 @@
 /*! BCMPKT_TXPMD_CPU_TX_DESTINATION_TYPE encoding name strings for debugging. */
 #define BCMPKT_TXPMD_CPU_TX_DESTINATION_TYPE_NAME_MAP_INIT \
     {"EGRESS_PORT", BCMPKT_TXPMD_CPU_TX_DESTINATION_T_EGRESS_PORT},\
+    {"NULL", BCMPKT_TXPMD_CPU_TX_DESTINATION_T_NULL},\
+    {"DEST_PORT", BCMPKT_TXPMD_CPU_TX_DESTINATION_T_DEST_PORT},\
     {"NHI", BCMPKT_TXPMD_CPU_TX_DESTINATION_T_NHI},\
     {"ECMP", BCMPKT_TXPMD_CPU_TX_DESTINATION_T_ECMP},\
+    {"TGID", BCMPKT_TXPMD_CPU_TX_DESTINATION_T_TGID},\
     {"ECMP_MEMBER", BCMPKT_TXPMD_CPU_TX_DESTINATION_T_ECMP_MEMBER},\
+    {"NEXT_HOP", BCMPKT_TXPMD_CPU_TX_DESTINATION_T_NEXT_HOP},\
     {"IPMC", BCMPKT_TXPMD_CPU_TX_DESTINATION_T_IPMC},\
     {"L2MC", BCMPKT_TXPMD_CPU_TX_DESTINATION_T_L2MC},\
     {"VLAN_FLOOD", BCMPKT_TXPMD_CPU_TX_DESTINATION_T_VLAN_FLOOD},\
     {"L2_PBM", BCMPKT_TXPMD_CPU_TX_DESTINATION_T_L2_PBM},\
     {"LAG_ID", BCMPKT_TXPMD_CPU_TX_DESTINATION_T_LAG_ID},\
-    {"RESERVED_COUNTER", 9},\
-    {"RESERVED_COUNTER", 10},\
-    {"RESERVED_COUNTER", 11},\
-    {"RESERVED_COUNTER", 12},\
     {"RESERVED_COUNTER", 13},\
     {"RESERVED_COUNTER", 14},\
     {"FORWARD", BCMPKT_TXPMD_CPU_TX_DESTINATION_T_FORWARD},\
@@ -546,6 +684,111 @@
     {"NO_OP", BCMPKT_TXPMD_OAM_DOWNMEP_TX_TIMESTAMP_ACTION_NO_OP},\
     {"SAMPLE", BCMPKT_TXPMD_OAM_DOWNMEP_TX_TIMESTAMP_ACTION_SAMPLE},\
 
+/*!
+ * \name BCMPKT_TXPMD_CPU_TX_INCA_REDN_REQD encodings.
+ * \anchor BCMPKT_TXPMD_CPU_TX_INCA_REDN_REQD_XXX
+ */
+/*! \{ */
+/*! Reduction not required. */
+#define BCMPKT_TXPMD_CPU_TX_INCA_REDN_REQD_BROADCAST 0
+/*! Reduction required. */
+#define BCMPKT_TXPMD_CPU_TX_INCA_REDN_REQD_REDUCE 1
+/*! \} */
+
+/*! BCMPKT_TXPMD_CPU_TX_INCA_REDN_REQD encoding name strings for debugging. */
+#define BCMPKT_TXPMD_CPU_TX_INCA_REDN_REQD_NAME_MAP_INIT \
+    {"BROADCAST", BCMPKT_TXPMD_CPU_TX_INCA_REDN_REQD_BROADCAST},\
+    {"REDUCE", BCMPKT_TXPMD_CPU_TX_INCA_REDN_REQD_REDUCE},\
+
+/*!
+ * \name BCMPKT_TXPMD_CPU_TX_INCA_REPL_REQD encodings.
+ * \anchor BCMPKT_TXPMD_CPU_TX_INCA_REPL_REQD_XXX
+ */
+/*! \{ */
+/*! Replication required. */
+#define BCMPKT_TXPMD_CPU_TX_INCA_REPL_REQD_REDUCE 0
+/*! Replication not required. */
+#define BCMPKT_TXPMD_CPU_TX_INCA_REPL_REQD_BROADCAST 1
+/*! \} */
+
+/*! BCMPKT_TXPMD_CPU_TX_INCA_REPL_REQD encoding name strings for debugging. */
+#define BCMPKT_TXPMD_CPU_TX_INCA_REPL_REQD_NAME_MAP_INIT \
+    {"REDUCE", BCMPKT_TXPMD_CPU_TX_INCA_REPL_REQD_REDUCE},\
+    {"BROADCAST", BCMPKT_TXPMD_CPU_TX_INCA_REPL_REQD_BROADCAST},\
+
+/*!
+ * \name BCMPKT_TXPMD_CPU_TX_INCA_ICE_OPER_TYPE encodings.
+ * \anchor BCMPKT_TXPMD_CPU_TX_INCA_ICE_OPER_TYPE_XXX
+ */
+/*! \{ */
+/*!  */
+#define BCMPKT_TXPMD_CPU_TX_INCA_ICE_OPER_T_SUM  0
+/*!  */
+#define BCMPKT_TXPMD_CPU_TX_INCA_ICE_OPER_T_SUM_AND_SCALE 1
+/*! \} */
+
+/*! BCMPKT_TXPMD_CPU_TX_INCA_ICE_OPER_TYPE encoding name strings for debugging. */
+#define BCMPKT_TXPMD_CPU_TX_INCA_ICE_OPER_TYPE_NAME_MAP_INIT \
+    {"SUM", BCMPKT_TXPMD_CPU_TX_INCA_ICE_OPER_T_SUM},\
+    {"SUM_AND_SCALE", BCMPKT_TXPMD_CPU_TX_INCA_ICE_OPER_T_SUM_AND_SCALE},\
+
+/*!
+ * \name BCMPKT_TXPMD_CPU_TX_INCA_ICE_DATA_FORMAT encodings.
+ * \anchor BCMPKT_TXPMD_CPU_TX_INCA_ICE_DATA_FORMAT_XXX
+ */
+/*! \{ */
+/*!  */
+#define BCMPKT_TXPMD_CPU_TX_INCA_ICE_DATA_FORMAT_FP32 0
+/*!  */
+#define BCMPKT_TXPMD_CPU_TX_INCA_ICE_DATA_FORMAT_FP16 1
+/*!  */
+#define BCMPKT_TXPMD_CPU_TX_INCA_ICE_DATA_FORMAT_BF16 2
+/*!  */
+#define BCMPKT_TXPMD_CPU_TX_INCA_ICE_DATA_FORMAT_INT32 3
+/*!  */
+#define BCMPKT_TXPMD_CPU_TX_INCA_ICE_DATA_FORMAT_FP8 4
+/*! \} */
+
+/*! BCMPKT_TXPMD_CPU_TX_INCA_ICE_DATA_FORMAT encoding name strings for debugging. */
+#define BCMPKT_TXPMD_CPU_TX_INCA_ICE_DATA_FORMAT_NAME_MAP_INIT \
+    {"FP32", BCMPKT_TXPMD_CPU_TX_INCA_ICE_DATA_FORMAT_FP32},\
+    {"FP16", BCMPKT_TXPMD_CPU_TX_INCA_ICE_DATA_FORMAT_FP16},\
+    {"BF16", BCMPKT_TXPMD_CPU_TX_INCA_ICE_DATA_FORMAT_BF16},\
+    {"INT32", BCMPKT_TXPMD_CPU_TX_INCA_ICE_DATA_FORMAT_INT32},\
+    {"FP8", BCMPKT_TXPMD_CPU_TX_INCA_ICE_DATA_FORMAT_FP8},\
+
+/*!
+ * \name BCMPKT_TXPMD_CPU_TX_CPU_TX_TYPE encodings.
+ * \anchor BCMPKT_TXPMD_CPU_TX_CPU_TX_TYPE_XXX
+ */
+/*! \{ */
+/*! Classic CPU TX (Masquerade, Dest-based). */
+#define BCMPKT_TXPMD_CPU_TX_CPU_TX_T_MASQUERADE  0
+/*! Sample timestamp. */
+#define BCMPKT_TXPMD_CPU_TX_CPU_TX_T_INCA        1
+/*! \} */
+
+/*! BCMPKT_TXPMD_CPU_TX_CPU_TX_TYPE encoding name strings for debugging. */
+#define BCMPKT_TXPMD_CPU_TX_CPU_TX_TYPE_NAME_MAP_INIT \
+    {"MASQUERADE", BCMPKT_TXPMD_CPU_TX_CPU_TX_T_MASQUERADE},\
+    {"INCA", BCMPKT_TXPMD_CPU_TX_CPU_TX_T_INCA},\
+
+/*!
+ * \name BCMPKT_TXPMD_AUX_SOBMH_HEADER_TYPE encodings.
+ * \anchor BCMPKT_TXPMD_AUX_SOBMH_HEADER_TYPE_XXX
+ */
+/*! \{ */
+/*! Reserved. */
+#define BCMPKT_TXPMD_AUX_SOBMH_HEADER_T_RESERVED 0
+/*! Packets from CPU with SOBMH header format to Passthru NLF */
+#define BCMPKT_TXPMD_AUX_SOBMH_HEADER_T_FROM_CPU 1
+/*! \} */
+
+/*! BCMPKT_TXPMD_AUX_SOBMH_HEADER_TYPE encoding name strings for debugging. */
+#define BCMPKT_TXPMD_AUX_SOBMH_HEADER_TYPE_NAME_MAP_INIT \
+    {"RESERVED", BCMPKT_TXPMD_AUX_SOBMH_HEADER_T_RESERVED},\
+    {"SOBMH_FROM_CPU", BCMPKT_TXPMD_AUX_SOBMH_HEADER_T_FROM_CPU},\
+
 /*!
  * \name TX packet metadata internal usage field IDs.
  * \anchor BCMPKT_TXPMD_I_XXX
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/bcmpkt_util.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/bcmpkt_util.h
index 136d4fd5471b..a9ad7bab3e43 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/bcmpkt_util.h
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/bcmpkt_util.h
@@ -45,7 +45,7 @@ bcmpkt_util_dev_type_get(const char *dev_name);
  * Device and variant names are case-insensitive.
  *
  * \param [in] dev_name Device name, e.g. "bcm56000_a0".
- * \param [in] var_name Variant name, e.g. "utltm".
+ * \param [in] var_name Variant name, e.g. "dna_6_5_30_1_1".
  *
  * \return Variant dispatch type or BCMLRD_VARIANT_T_NONE if not found.
  */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_bcmpkt_flexhdr.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_bcmpkt_flexhdr.h
deleted file mode 100644
index 65f14a67a9e4..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_bcmpkt_flexhdr.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) header.yml.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_FLEXHDR_H
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_FLEXHDR_H
-
-#include <bcmpkt/bcmpkt_flexhdr_internal.h>
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ARP_T                      0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_AUTHEN_T                   1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T                      2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CNTAG_T                    3
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_0_T         4
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_1_T         5
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_DEST_OPTION_T              6
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_EP_NIH_HEADER_T            7
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_FIXED_HDR_T        8
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_SUBHDR_5_T         9
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ESP_T                      10
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ETHERTYPE_T                11
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_FRAG_T                     12
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GBP_ETHERNET_SHIM_T        13
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T         14
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GPE_T                      15
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_CHKSUM_T               16
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_KEY_T                  17
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_ROUT_T                 18
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_SEQ_T                  19
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_T                      20
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T                 21
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_EXTENSION_0_T          22
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HOP_BY_HOP_T               23
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ICMP_T                     24
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_0_A_T          25
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_0_B_T          26
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_1_T            27
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_2_T            28
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_3_T            29
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_HEADER_T               30
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_MD_BASE_T              31
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_METADATA_T             32
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IGMP_T                     33
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IOAM_E2E_T                 34
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPFIX_T                    35
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV4_T                     36
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV6_T                     37
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_L2_T                       38
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MIRROR_ERSPAN_SN_T         39
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MIRROR_TRANSPORT_T         40
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_ACH_T                 41
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_BV_T                  42
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_CW_T                  43
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_T                     44
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_P_1588_T                   45
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PROG_EXT_HDR_T             46
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_0_T                  47
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_1_T                  48
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T   49
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T   50
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RARP_T                     51
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ROUTING_T                  52
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RSPAN_T                    53
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_SRH_T      54
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_T          55
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_0_T             56
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_1_T             57
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_2_T             58
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SNAP_LLC_T                 59
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_STD_SEGMENT_ID_T           60
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_TCP_FIRST_4BYTES_T         61
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_TCP_LAST_16BYTES_T         62
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UDP_T                      63
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L3_T               64
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L4_T               65
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L5_T               66
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_VLAN_T                     67
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_VXLAN_T                    68
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_WESP_T                     69
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_T               70
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_FLEXHDR_COUNT    71
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_FLEXHDR_NAME_MAP_INIT \
-    {"arp_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ARP_T},\
-    {"authen_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_AUTHEN_T},\
-    {"bfd_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T},\
-    {"cntag_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CNTAG_T},\
-    {"cpu_composites_0_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_0_T},\
-    {"cpu_composites_1_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_1_T},\
-    {"dest_option_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_DEST_OPTION_T},\
-    {"ep_nih_header_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_EP_NIH_HEADER_T},\
-    {"erspan3_fixed_hdr_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_FIXED_HDR_T},\
-    {"erspan3_subhdr_5_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_SUBHDR_5_T},\
-    {"esp_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ESP_T},\
-    {"ethertype_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ETHERTYPE_T},\
-    {"frag_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_FRAG_T},\
-    {"gbp_ethernet_shim_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GBP_ETHERNET_SHIM_T},\
-    {"generic_loopback_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T},\
-    {"gpe_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GPE_T},\
-    {"gre_chksum_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_CHKSUM_T},\
-    {"gre_key_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_KEY_T},\
-    {"gre_rout_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_ROUT_T},\
-    {"gre_seq_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_SEQ_T},\
-    {"gre_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_T},\
-    {"hg3_base_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T},\
-    {"hg3_extension_0_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_EXTENSION_0_T},\
-    {"hop_by_hop_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HOP_BY_HOP_T},\
-    {"icmp_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ICMP_T},\
-    {"ifa_flex_md_0_a_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_0_A_T},\
-    {"ifa_flex_md_0_b_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_0_B_T},\
-    {"ifa_flex_md_1_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_1_T},\
-    {"ifa_flex_md_2_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_2_T},\
-    {"ifa_flex_md_3_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_3_T},\
-    {"ifa_header_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_HEADER_T},\
-    {"ifa_md_base_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_MD_BASE_T},\
-    {"ifa_metadata_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_METADATA_T},\
-    {"igmp_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IGMP_T},\
-    {"ioam_e2e_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IOAM_E2E_T},\
-    {"ipfix_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPFIX_T},\
-    {"ipv4_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV4_T},\
-    {"ipv6_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV6_T},\
-    {"l2_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_L2_T},\
-    {"mirror_erspan_sn_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MIRROR_ERSPAN_SN_T},\
-    {"mirror_transport_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MIRROR_TRANSPORT_T},\
-    {"mpls_ach_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_ACH_T},\
-    {"mpls_bv_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_BV_T},\
-    {"mpls_cw_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_CW_T},\
-    {"mpls_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_T},\
-    {"p_1588_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_P_1588_T},\
-    {"prog_ext_hdr_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PROG_EXT_HDR_T},\
-    {"psamp_0_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_0_T},\
-    {"psamp_1_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_1_T},\
-    {"psamp_mirror_on_drop_0_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T},\
-    {"psamp_mirror_on_drop_3_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T},\
-    {"rarp_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RARP_T},\
-    {"routing_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ROUTING_T},\
-    {"rspan_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RSPAN_T},\
-    {"segment_routing_srh_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_SRH_T},\
-    {"segment_routing_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_T},\
-    {"sflow_shim_0_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_0_T},\
-    {"sflow_shim_1_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_1_T},\
-    {"sflow_shim_2_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_2_T},\
-    {"snap_llc_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SNAP_LLC_T},\
-    {"std_segment_id_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_STD_SEGMENT_ID_T},\
-    {"tcp_first_4bytes_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_TCP_FIRST_4BYTES_T},\
-    {"tcp_last_16bytes_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_TCP_LAST_16BYTES_T},\
-    {"udp_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UDP_T},\
-    {"unknown_l3_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L3_T},\
-    {"unknown_l4_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L4_T},\
-    {"unknown_l5_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L5_T},\
-    {"vlan_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_VLAN_T},\
-    {"vxlan_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_VXLAN_T},\
-    {"wesp_t", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_WESP_T},\
-    {"RXPMD_FLEX_T", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_T},\
-    {"flexhdr count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_FLEXHDR_COUNT}
-
-#endif /* BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_FLEXHDR_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_bcmpkt_flexhdr_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_bcmpkt_flexhdr_data.h
deleted file mode 100644
index 6c9aacbba374..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_bcmpkt_flexhdr_data.h
+++ /dev/null
@@ -1,1392 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) header.yml.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_FLEXHDR_DATA_H
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_FLEXHDR_DATA_H
-
-/*!
- * \name ARP_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ARP_T_HARDWARE_LEN  0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ARP_T_HARDWARE_TYPE 1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ARP_T_OPERATION     2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ARP_T_PROT_ADDR_LEN 3
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ARP_T_PROTOCOL_TYPE 4
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ARP_T_SENDER_HA     5
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ARP_T_SENDER_IP     6
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ARP_T_TARGET_HA     7
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ARP_T_TARGET_IP     8
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ARP_T_FID_COUNT          9
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT \
-    {"HARDWARE_LEN", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ARP_T_HARDWARE_LEN},\
-    {"HARDWARE_TYPE", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ARP_T_HARDWARE_TYPE},\
-    {"OPERATION", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ARP_T_OPERATION},\
-    {"PROT_ADDR_LEN", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ARP_T_PROT_ADDR_LEN},\
-    {"PROTOCOL_TYPE", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ARP_T_PROTOCOL_TYPE},\
-    {"SENDER_HA", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ARP_T_SENDER_HA},\
-    {"SENDER_IP", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ARP_T_SENDER_IP},\
-    {"TARGET_HA", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ARP_T_TARGET_HA},\
-    {"TARGET_IP", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ARP_T_TARGET_IP},\
-    {"arp_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ARP_T_FID_COUNT}
-
-/*!
- * \name AUTHEN_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_AUTHEN_T_DATA        0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_AUTHEN_T_NEXT_HEADER 1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_AUTHEN_T_PAYLOAD_LEN 2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_AUTHEN_T_RESERVED    3
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_AUTHEN_T_SEQ_NUM     4
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_AUTHEN_T_SPI         5
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_AUTHEN_T_FID_COUNT          6
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_AUTHEN_T_FIELD_NAME_MAP_INIT \
-    {"DATA", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_AUTHEN_T_DATA},\
-    {"NEXT_HEADER", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_AUTHEN_T_NEXT_HEADER},\
-    {"PAYLOAD_LEN", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_AUTHEN_T_PAYLOAD_LEN},\
-    {"RESERVED", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_AUTHEN_T_RESERVED},\
-    {"SEQ_NUM", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_AUTHEN_T_SEQ_NUM},\
-    {"SPI", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_AUTHEN_T_SPI},\
-    {"authen_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_AUTHEN_T_FID_COUNT}
-
-/*!
- * \name BFD_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_AP            0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_BFD_LENGTH    1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_CPI           2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_DEM           3
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_DESMINTXINTV  4
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_DETECTMULT    5
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_DIAG          6
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_FIN           7
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_MINECHORXINTV 8
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_MPT           9
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_MYDISCRIM     10
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_POLL          11
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_REQMINRXINTV  12
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_STA           13
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_URDISCRIM     14
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_VERSION       15
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_FID_COUNT          16
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_FIELD_NAME_MAP_INIT \
-    {"AP", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_AP},\
-    {"BFD_LENGTH", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_BFD_LENGTH},\
-    {"CPI", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_CPI},\
-    {"DEM", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_DEM},\
-    {"DESMINTXINTV", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_DESMINTXINTV},\
-    {"DETECTMULT", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_DETECTMULT},\
-    {"DIAG", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_DIAG},\
-    {"FIN", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_FIN},\
-    {"MINECHORXINTV", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_MINECHORXINTV},\
-    {"MPT", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_MPT},\
-    {"MYDISCRIM", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_MYDISCRIM},\
-    {"POLL", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_POLL},\
-    {"REQMINRXINTV", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_REQMINRXINTV},\
-    {"STA", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_STA},\
-    {"URDISCRIM", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_URDISCRIM},\
-    {"VERSION", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_VERSION},\
-    {"bfd_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_FID_COUNT}
-
-/*!
- * \name CNTAG_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CNTAG_T_RPID 0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CNTAG_T_TPID 1
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CNTAG_T_FID_COUNT          2
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CNTAG_T_FIELD_NAME_MAP_INIT \
-    {"RPID", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CNTAG_T_RPID},\
-    {"TPID", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CNTAG_T_TPID},\
-    {"cntag_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CNTAG_T_FID_COUNT}
-
-/*!
- * \name CPU_COMPOSITES_0_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0 0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1 1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2 2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3 3
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4 4
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5 5
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6 6
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT          7
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT \
-    {"DMA_CONT0", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0},\
-    {"DMA_CONT1", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1},\
-    {"DMA_CONT2", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2},\
-    {"DMA_CONT3", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3},\
-    {"DMA_CONT4", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4},\
-    {"DMA_CONT5", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5},\
-    {"DMA_CONT6", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6},\
-    {"cpu_composites_0_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT}
-
-/*!
- * \name CPU_COMPOSITES_1_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10 0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11 1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12 2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13 3
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14 4
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15 5
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16 6
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17 7
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7  8
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8  9
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9  10
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT          11
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT \
-    {"DMA_CONT10", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10},\
-    {"DMA_CONT11", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11},\
-    {"DMA_CONT12", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12},\
-    {"DMA_CONT13", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13},\
-    {"DMA_CONT14", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14},\
-    {"DMA_CONT15", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15},\
-    {"DMA_CONT16", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16},\
-    {"DMA_CONT17", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17},\
-    {"DMA_CONT7", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7},\
-    {"DMA_CONT8", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8},\
-    {"DMA_CONT9", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9},\
-    {"cpu_composites_1_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT}
-
-/*!
- * \name DEST_OPTION_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_DEST_OPTION_T_HDR_EXT_LEN 0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_DEST_OPTION_T_NEXT_HEADER 1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_DEST_OPTION_T_OPTION      2
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_DEST_OPTION_T_FID_COUNT          3
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_DEST_OPTION_T_FIELD_NAME_MAP_INIT \
-    {"HDR_EXT_LEN", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_DEST_OPTION_T_HDR_EXT_LEN},\
-    {"NEXT_HEADER", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_DEST_OPTION_T_NEXT_HEADER},\
-    {"OPTION", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_DEST_OPTION_T_OPTION},\
-    {"dest_option_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_DEST_OPTION_T_FID_COUNT}
-
-/*!
- * \name EP_NIH_HEADER_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_EP_NIH_HEADER_T_HEADER_SUBTYPE       0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_EP_NIH_HEADER_T_HEADER_TYPE          1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_A        2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_B        3
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_C        4
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_A      5
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_B      6
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_C      7
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_EP_NIH_HEADER_T_RECIRC_PROFILE_INDEX 8
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_EP_NIH_HEADER_T_RESERVED_0           9
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_EP_NIH_HEADER_T_START                10
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_EP_NIH_HEADER_T_TIMESTAMP            11
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_EP_NIH_HEADER_T_FID_COUNT          12
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_EP_NIH_HEADER_T_FIELD_NAME_MAP_INIT \
-    {"HEADER_SUBTYPE", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_EP_NIH_HEADER_T_HEADER_SUBTYPE},\
-    {"HEADER_TYPE", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_EP_NIH_HEADER_T_HEADER_TYPE},\
-    {"OPAQUE_CTRL_A", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_A},\
-    {"OPAQUE_CTRL_B", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_B},\
-    {"OPAQUE_CTRL_C", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_C},\
-    {"OPAQUE_OBJECT_A", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_A},\
-    {"OPAQUE_OBJECT_B", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_B},\
-    {"OPAQUE_OBJECT_C", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_C},\
-    {"RECIRC_PROFILE_INDEX", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_EP_NIH_HEADER_T_RECIRC_PROFILE_INDEX},\
-    {"RESERVED_0", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_EP_NIH_HEADER_T_RESERVED_0},\
-    {"START", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_EP_NIH_HEADER_T_START},\
-    {"TIMESTAMP", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_EP_NIH_HEADER_T_TIMESTAMP},\
-    {"ep_nih_header_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_EP_NIH_HEADER_T_FID_COUNT}
-
-/*!
- * \name ERSPAN3_FIXED_HDR_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO               0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_FIXED_HDR_T_COS               1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID           2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O 3
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID        4
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_FIXED_HDR_T_T                 5
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP         6
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_FIXED_HDR_T_VER               7
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN              8
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT          9
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT \
-    {"BSO", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO},\
-    {"COS", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_FIXED_HDR_T_COS},\
-    {"GBP_SID", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID},\
-    {"P_FT_HWID_D_GRA_O", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O},\
-    {"SESSION_ID", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID},\
-    {"T", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_FIXED_HDR_T_T},\
-    {"TIMESTAMP", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP},\
-    {"VER", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_FIXED_HDR_T_VER},\
-    {"VLAN", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN},\
-    {"erspan3_fixed_hdr_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT}
-
-/*!
- * \name ERSPAN3_SUBHDR_5_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID 0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID     1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID   2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP   3
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT          4
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT \
-    {"PLATFORM_ID", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID},\
-    {"PORT_ID", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID},\
-    {"SWITCH_ID", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID},\
-    {"TIMESTAMP", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP},\
-    {"erspan3_subhdr_5_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT}
-
-/*!
- * \name ESP_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ESP_T_NEXT_HEADER 0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ESP_T_PAD         1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ESP_T_PAD_LEN     2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ESP_T_SEQ_NUM     3
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ESP_T_SPI         4
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ESP_T_FID_COUNT          5
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ESP_T_FIELD_NAME_MAP_INIT \
-    {"NEXT_HEADER", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ESP_T_NEXT_HEADER},\
-    {"PAD", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ESP_T_PAD},\
-    {"PAD_LEN", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ESP_T_PAD_LEN},\
-    {"SEQ_NUM", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ESP_T_SEQ_NUM},\
-    {"SPI", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ESP_T_SPI},\
-    {"esp_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ESP_T_FID_COUNT}
-
-/*!
- * \name ETHERTYPE_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ETHERTYPE_T_TYPE 0
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ETHERTYPE_T_FID_COUNT          1
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT \
-    {"TYPE", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ETHERTYPE_T_TYPE},\
-    {"ethertype_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ETHERTYPE_T_FID_COUNT}
-
-/*!
- * \name FRAG_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_FRAG_T_FRAG_INFO   0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_FRAG_T_ID          1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_FRAG_T_NEXT_HEADER 2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_FRAG_T_RESERVED    3
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_FRAG_T_FID_COUNT          4
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_FRAG_T_FIELD_NAME_MAP_INIT \
-    {"FRAG_INFO", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_FRAG_T_FRAG_INFO},\
-    {"ID", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_FRAG_T_ID},\
-    {"NEXT_HEADER", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_FRAG_T_NEXT_HEADER},\
-    {"RESERVED", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_FRAG_T_RESERVED},\
-    {"frag_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_FRAG_T_FID_COUNT}
-
-/*!
- * \name GBP_ETHERNET_SHIM_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GBP_ETHERNET_SHIM_T_ETHERTYPE 0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GBP_ETHERNET_SHIM_T_FLAGS     1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GBP_ETHERNET_SHIM_T_RESERVED  2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GBP_ETHERNET_SHIM_T_SID       3
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GBP_ETHERNET_SHIM_T_SUBTYPE   4
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GBP_ETHERNET_SHIM_T_VER       5
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GBP_ETHERNET_SHIM_T_FID_COUNT          6
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GBP_ETHERNET_SHIM_T_FIELD_NAME_MAP_INIT \
-    {"ETHERTYPE", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GBP_ETHERNET_SHIM_T_ETHERTYPE},\
-    {"FLAGS", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GBP_ETHERNET_SHIM_T_FLAGS},\
-    {"RESERVED", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GBP_ETHERNET_SHIM_T_RESERVED},\
-    {"SID", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GBP_ETHERNET_SHIM_T_SID},\
-    {"SUBTYPE", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GBP_ETHERNET_SHIM_T_SUBTYPE},\
-    {"VER", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GBP_ETHERNET_SHIM_T_VER},\
-    {"gbp_ethernet_shim_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GBP_ETHERNET_SHIM_T_FID_COUNT}
-
-/*!
- * \name GENERIC_LOOPBACK_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ    0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE   1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ        2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_FLAGS              3
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE        4
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY     5
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL     6
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ      7
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0  8
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1  9
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ            10
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1         11
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT 12
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_SRC_SUBPORT_NUM    13
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE         14
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT          15
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT \
-    {"DESTINATION_OBJ", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ},\
-    {"DESTINATION_TYPE", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE},\
-    {"ENTROPY_OBJ", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ},\
-    {"FLAGS", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_FLAGS},\
-    {"HEADER_TYPE", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE},\
-    {"INPUT_PRIORITY", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY},\
-    {"INTERFACE_CTRL", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL},\
-    {"INTERFACE_OBJ", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ},\
-    {"PROCESSING_CTRL_0", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0},\
-    {"PROCESSING_CTRL_1", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1},\
-    {"QOS_OBJ", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ},\
-    {"RESERVED_1", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1},\
-    {"SOURCE_SYSTEM_PORT", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT},\
-    {"SRC_SUBPORT_NUM", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_SRC_SUBPORT_NUM},\
-    {"START_BYTE", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE},\
-    {"generic_loopback_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT}
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NO_OP         0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2_OIF        1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED      2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__VP            3
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP          4
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NHOP          5
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2MC_GROUP    6
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L3MC_GROUP    7
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED_1    8
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP_MEMBER   9
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__DEVICE_PORT   10
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__UNDERLAY_ECMP 11
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_TYPE__TUNNEL  0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_TYPE__GENERIC 1
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__NOOP   0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__VFI    1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__L3_IIF 2
-
-/*!
- * \name GPE_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GPE_T_FLAGS         0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GPE_T_NEXT_PROTOCOL 1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GPE_T_RESERVED0     2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GPE_T_RESERVED1     3
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GPE_T_VNI           4
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GPE_T_FID_COUNT          5
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GPE_T_FIELD_NAME_MAP_INIT \
-    {"FLAGS", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GPE_T_FLAGS},\
-    {"NEXT_PROTOCOL", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GPE_T_NEXT_PROTOCOL},\
-    {"RESERVED0", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GPE_T_RESERVED0},\
-    {"RESERVED1", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GPE_T_RESERVED1},\
-    {"VNI", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GPE_T_VNI},\
-    {"gpe_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GPE_T_FID_COUNT}
-
-/*!
- * \name GRE_CHKSUM_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_CHKSUM_T_CHECKSUM 0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_CHKSUM_T_OFFSET   1
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_CHKSUM_T_FID_COUNT          2
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_CHKSUM_T_FIELD_NAME_MAP_INIT \
-    {"CHECKSUM", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_CHKSUM_T_CHECKSUM},\
-    {"OFFSET", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_CHKSUM_T_OFFSET},\
-    {"gre_chksum_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_CHKSUM_T_FID_COUNT}
-
-/*!
- * \name GRE_KEY_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_KEY_T_KEY 0
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_KEY_T_FID_COUNT          1
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_KEY_T_FIELD_NAME_MAP_INIT \
-    {"KEY", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_KEY_T_KEY},\
-    {"gre_key_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_KEY_T_FID_COUNT}
-
-/*!
- * \name GRE_ROUT_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_ROUT_T_ROUTING 0
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_ROUT_T_FID_COUNT          1
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_ROUT_T_FIELD_NAME_MAP_INIT \
-    {"ROUTING", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_ROUT_T_ROUTING},\
-    {"gre_rout_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_ROUT_T_FID_COUNT}
-
-/*!
- * \name GRE_SEQ_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_SEQ_T_SEQUENCE 0
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_SEQ_T_FID_COUNT          1
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_SEQ_T_FIELD_NAME_MAP_INIT \
-    {"SEQUENCE", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_SEQ_T_SEQUENCE},\
-    {"gre_seq_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_SEQ_T_FID_COUNT}
-
-/*!
- * \name GRE_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_T_C_R_K_S  0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_T_PROTOCOL 1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_T_RESERVED 2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_T_VERSION  3
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_T_FID_COUNT          4
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_T_FIELD_NAME_MAP_INIT \
-    {"C_R_K_S", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_T_C_R_K_S},\
-    {"PROTOCOL", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_T_PROTOCOL},\
-    {"RESERVED", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_T_RESERVED},\
-    {"VERSION", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_T_VERSION},\
-    {"gre_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_T_FID_COUNT}
-
-/*!
- * \name HG3_BASE_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_CN                      0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_CNG                     1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_ENTROPY                 2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_EXT_HDR_PRESENT         3
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_HG3_RESERVED            4
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_L3_ROUTED               5
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_MIRROR_COPY             6
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_RESERVED_ETYPE          7
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION      8
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION_TYPE 9
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_SYSTEM_SOURCE           10
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_TC                      11
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_VERSION                 12
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_FID_COUNT          13
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_FIELD_NAME_MAP_INIT \
-    {"CN", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_CN},\
-    {"CNG", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_CNG},\
-    {"ENTROPY", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_ENTROPY},\
-    {"EXT_HDR_PRESENT", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_EXT_HDR_PRESENT},\
-    {"HG3_RESERVED", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_HG3_RESERVED},\
-    {"L3_ROUTED", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_L3_ROUTED},\
-    {"MIRROR_COPY", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_MIRROR_COPY},\
-    {"RESERVED_ETYPE", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_RESERVED_ETYPE},\
-    {"SYSTEM_DESTINATION", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION},\
-    {"SYSTEM_DESTINATION_TYPE", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION_TYPE},\
-    {"SYSTEM_SOURCE", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_SYSTEM_SOURCE},\
-    {"TC", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_TC},\
-    {"VERSION", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_VERSION},\
-    {"hg3_base_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_FID_COUNT}
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__NO_OP         0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__L2_OIF        1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__RESERVED      2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__VP            3
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__ECMP          4
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__NHOP          5
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__L2MC_GROUP    6
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__L3MC_GROUP    7
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__RESERVED_1    8
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__ECMP_MEMBER   9
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__DEVICE_PORT   10
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__UNDERLAY_ECMP 11
-
-/*!
- * \name HG3_EXTENSION_0_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_LSB      0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_MSB      1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_EXTENSION_0_T_DVP_OR_L3_IIF     2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_EXTENSION_0_T_FLAGS             3
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_EXTENSION_0_T_FORWARDING_DOMAIN 4
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_EXTENSION_0_T_SVP               5
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT          6
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_EXTENSION_0_T_FIELD_NAME_MAP_INIT \
-    {"CLASS_ID_LSB", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_LSB},\
-    {"CLASS_ID_MSB", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_MSB},\
-    {"DVP_OR_L3_IIF", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_EXTENSION_0_T_DVP_OR_L3_IIF},\
-    {"FLAGS", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_EXTENSION_0_T_FLAGS},\
-    {"FORWARDING_DOMAIN", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_EXTENSION_0_T_FORWARDING_DOMAIN},\
-    {"SVP", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_EXTENSION_0_T_SVP},\
-    {"hg3_extension_0_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT}
-
-/*!
- * \name HOP_BY_HOP_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HOP_BY_HOP_T_HDR_EXT_LEN 0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HOP_BY_HOP_T_NEXT_HEADER 1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HOP_BY_HOP_T_OPTION      2
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HOP_BY_HOP_T_FID_COUNT          3
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HOP_BY_HOP_T_FIELD_NAME_MAP_INIT \
-    {"HDR_EXT_LEN", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HOP_BY_HOP_T_HDR_EXT_LEN},\
-    {"NEXT_HEADER", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HOP_BY_HOP_T_NEXT_HEADER},\
-    {"OPTION", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HOP_BY_HOP_T_OPTION},\
-    {"hop_by_hop_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HOP_BY_HOP_T_FID_COUNT}
-
-/*!
- * \name ICMP_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ICMP_T_CHECKSUM  0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ICMP_T_CODE      1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ICMP_T_ICMP_TYPE 2
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ICMP_T_FID_COUNT          3
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT \
-    {"CHECKSUM", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ICMP_T_CHECKSUM},\
-    {"CODE", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ICMP_T_CODE},\
-    {"ICMP_TYPE", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ICMP_T_ICMP_TYPE},\
-    {"icmp_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ICMP_T_FID_COUNT}
-
-/*!
- * \name IFA_FLEX_MD_0_A_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_0_A_T_FWD_HDR_TTL   0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_0_A_T_LNS_DEVICE_ID 1
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT          2
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_0_A_T_FIELD_NAME_MAP_INIT \
-    {"FWD_HDR_TTL", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_0_A_T_FWD_HDR_TTL},\
-    {"LNS_DEVICE_ID", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_0_A_T_LNS_DEVICE_ID},\
-    {"ifa_flex_md_0_a_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT}
-
-/*!
- * \name IFA_FLEX_MD_0_B_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_0_B_T_CN               0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_0_B_T_PORT_SPEED       1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_0_B_T_QUEUE_ID         2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_0_B_T_RX_TIMESTAMP_SEC 3
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT          4
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_0_B_T_FIELD_NAME_MAP_INIT \
-    {"CN", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_0_B_T_CN},\
-    {"PORT_SPEED", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_0_B_T_PORT_SPEED},\
-    {"QUEUE_ID", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_0_B_T_QUEUE_ID},\
-    {"RX_TIMESTAMP_SEC", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_0_B_T_RX_TIMESTAMP_SEC},\
-    {"ifa_flex_md_0_b_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT}
-
-/*!
- * \name IFA_FLEX_MD_1_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_1_T_EGRESS_PORT_ID       0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_1_T_INGRESS_PORT_ID      1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_1_T_RX_TIMESTAMP_NANOSEC 2
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT          3
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_1_T_FIELD_NAME_MAP_INIT \
-    {"EGRESS_PORT_ID", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_1_T_EGRESS_PORT_ID},\
-    {"INGRESS_PORT_ID", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_1_T_INGRESS_PORT_ID},\
-    {"RX_TIMESTAMP_NANOSEC", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_1_T_RX_TIMESTAMP_NANOSEC},\
-    {"ifa_flex_md_1_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT}
-
-/*!
- * \name IFA_FLEX_MD_2_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_2_T_RESIDENCE_TIME_NANOSEC 0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_2_T_TX_QUEUE_BYTE_COUNT    1
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT          2
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_2_T_FIELD_NAME_MAP_INIT \
-    {"RESIDENCE_TIME_NANOSEC", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_2_T_RESIDENCE_TIME_NANOSEC},\
-    {"TX_QUEUE_BYTE_COUNT", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_2_T_TX_QUEUE_BYTE_COUNT},\
-    {"ifa_flex_md_2_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT}
-
-/*!
- * \name IFA_FLEX_MD_3_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_3_T_MMU_STAT_0 0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_3_T_MMU_STAT_1 1
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT          2
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_3_T_FIELD_NAME_MAP_INIT \
-    {"MMU_STAT_0", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_3_T_MMU_STAT_0},\
-    {"MMU_STAT_1", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_3_T_MMU_STAT_1},\
-    {"ifa_flex_md_3_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT}
-
-/*!
- * \name IFA_HEADER_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_HEADER_T_FLAGS      0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_HEADER_T_GNS        1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_HEADER_T_MAX_LENGTH 2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_HEADER_T_NEXT_HDR   3
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_HEADER_T_VER        4
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_HEADER_T_FID_COUNT          5
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_HEADER_T_FIELD_NAME_MAP_INIT \
-    {"FLAGS", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_HEADER_T_FLAGS},\
-    {"GNS", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_HEADER_T_GNS},\
-    {"MAX_LENGTH", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_HEADER_T_MAX_LENGTH},\
-    {"NEXT_HDR", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_HEADER_T_NEXT_HDR},\
-    {"VER", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_HEADER_T_VER},\
-    {"ifa_header_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_HEADER_T_FID_COUNT}
-
-/*!
- * \name IFA_MD_BASE_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_MD_BASE_T_ACTION_VECTOR            0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_MD_BASE_T_HOP_LIMIT_CURRENT_LENGTH 1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_MD_BASE_T_REQUEST_VECTOR           2
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_MD_BASE_T_FID_COUNT          3
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_MD_BASE_T_FIELD_NAME_MAP_INIT \
-    {"ACTION_VECTOR", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_MD_BASE_T_ACTION_VECTOR},\
-    {"HOP_LIMIT_CURRENT_LENGTH", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_MD_BASE_T_HOP_LIMIT_CURRENT_LENGTH},\
-    {"REQUEST_VECTOR", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_MD_BASE_T_REQUEST_VECTOR},\
-    {"ifa_md_base_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_MD_BASE_T_FID_COUNT}
-
-/*!
- * \name IFA_METADATA_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_METADATA_T_ACTION_VECTOR            0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_METADATA_T_HOP_LIMIT_CURRENT_LENGTH 1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_METADATA_T_METADATA                 2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_METADATA_T_REQUEST_VECTOR           3
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_METADATA_T_FID_COUNT          4
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_METADATA_T_FIELD_NAME_MAP_INIT \
-    {"ACTION_VECTOR", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_METADATA_T_ACTION_VECTOR},\
-    {"HOP_LIMIT_CURRENT_LENGTH", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_METADATA_T_HOP_LIMIT_CURRENT_LENGTH},\
-    {"METADATA", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_METADATA_T_METADATA},\
-    {"REQUEST_VECTOR", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_METADATA_T_REQUEST_VECTOR},\
-    {"ifa_metadata_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_METADATA_T_FID_COUNT}
-
-/*!
- * \name IGMP_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IGMP_T_CHECKSUM      0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IGMP_T_GROUP_ADDRESS 1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IGMP_T_IGMP_TYPE     2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IGMP_T_MAX_RESP_TIME 3
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IGMP_T_FID_COUNT          4
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IGMP_T_FIELD_NAME_MAP_INIT \
-    {"CHECKSUM", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IGMP_T_CHECKSUM},\
-    {"GROUP_ADDRESS", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IGMP_T_GROUP_ADDRESS},\
-    {"IGMP_TYPE", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IGMP_T_IGMP_TYPE},\
-    {"MAX_RESP_TIME", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IGMP_T_MAX_RESP_TIME},\
-    {"igmp_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IGMP_T_FID_COUNT}
-
-/*!
- * \name IOAM_E2E_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IOAM_E2E_T_IOAM_E2E_DATA 0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IOAM_E2E_T_IOAM_E2E_TYPE 1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IOAM_E2E_T_IOAM_HDR_LEN  2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IOAM_E2E_T_NAMESPACE_ID  3
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IOAM_E2E_T_NEXT_PROTOCOL 4
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IOAM_E2E_T_RESERVED      5
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IOAM_E2E_T_TYPE          6
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IOAM_E2E_T_FID_COUNT          7
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IOAM_E2E_T_FIELD_NAME_MAP_INIT \
-    {"IOAM_E2E_DATA", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IOAM_E2E_T_IOAM_E2E_DATA},\
-    {"IOAM_E2E_TYPE", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IOAM_E2E_T_IOAM_E2E_TYPE},\
-    {"IOAM_HDR_LEN", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IOAM_E2E_T_IOAM_HDR_LEN},\
-    {"NAMESPACE_ID", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IOAM_E2E_T_NAMESPACE_ID},\
-    {"NEXT_PROTOCOL", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IOAM_E2E_T_NEXT_PROTOCOL},\
-    {"RESERVED", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IOAM_E2E_T_RESERVED},\
-    {"TYPE", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IOAM_E2E_T_TYPE},\
-    {"ioam_e2e_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IOAM_E2E_T_FID_COUNT}
-
-/*!
- * \name IPFIX_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPFIX_T_EXPORT_TIME   0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPFIX_T_LENGTH        1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPFIX_T_OBS_DOMAIN_ID 2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPFIX_T_SEQUENCE_NUM  3
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPFIX_T_VERSION       4
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPFIX_T_FID_COUNT          5
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT \
-    {"EXPORT_TIME", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPFIX_T_EXPORT_TIME},\
-    {"LENGTH", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPFIX_T_LENGTH},\
-    {"OBS_DOMAIN_ID", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPFIX_T_OBS_DOMAIN_ID},\
-    {"SEQUENCE_NUM", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPFIX_T_SEQUENCE_NUM},\
-    {"VERSION", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPFIX_T_VERSION},\
-    {"ipfix_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPFIX_T_FID_COUNT}
-
-/*!
- * \name IPV4_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV4_T_DA                0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET 1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV4_T_HDR_CHECKSUM      2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV4_T_ID                3
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV4_T_OPTION            4
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV4_T_PROTOCOL          5
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV4_T_SA                6
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV4_T_TOS               7
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV4_T_TOTAL_LENGTH      8
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV4_T_TTL               9
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV4_T_VERSION_HDR_LEN   10
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV4_T_FID_COUNT          11
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT \
-    {"DA", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV4_T_DA},\
-    {"FLAGS_FRAG_OFFSET", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET},\
-    {"HDR_CHECKSUM", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV4_T_HDR_CHECKSUM},\
-    {"ID", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV4_T_ID},\
-    {"OPTION", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV4_T_OPTION},\
-    {"PROTOCOL", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV4_T_PROTOCOL},\
-    {"SA", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV4_T_SA},\
-    {"TOS", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV4_T_TOS},\
-    {"TOTAL_LENGTH", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV4_T_TOTAL_LENGTH},\
-    {"TTL", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV4_T_TTL},\
-    {"VERSION_HDR_LEN", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV4_T_VERSION_HDR_LEN},\
-    {"ipv4_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV4_T_FID_COUNT}
-
-/*!
- * \name IPV6_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV6_T_DA             0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV6_T_FLOW_LABEL     1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV6_T_HOP_LIMIT      2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV6_T_NEXT_HEADER    3
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV6_T_PAYLOAD_LENGTH 4
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV6_T_SA             5
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV6_T_TRAFFIC_CLASS  6
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV6_T_VERSION        7
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV6_T_FID_COUNT          8
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT \
-    {"DA", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV6_T_DA},\
-    {"FLOW_LABEL", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV6_T_FLOW_LABEL},\
-    {"HOP_LIMIT", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV6_T_HOP_LIMIT},\
-    {"NEXT_HEADER", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV6_T_NEXT_HEADER},\
-    {"PAYLOAD_LENGTH", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV6_T_PAYLOAD_LENGTH},\
-    {"SA", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV6_T_SA},\
-    {"TRAFFIC_CLASS", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV6_T_TRAFFIC_CLASS},\
-    {"VERSION", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV6_T_VERSION},\
-    {"ipv6_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV6_T_FID_COUNT}
-
-/*!
- * \name L2_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_L2_T_MACDA 0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_L2_T_MACSA 1
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_L2_T_FID_COUNT          2
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_L2_T_FIELD_NAME_MAP_INIT \
-    {"MACDA", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_L2_T_MACDA},\
-    {"MACSA", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_L2_T_MACSA},\
-    {"l2_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_L2_T_FID_COUNT}
-
-/*!
- * \name MIRROR_ERSPAN_SN_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM 0
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT          1
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT \
-    {"SEQ_NUM", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM},\
-    {"mirror_erspan_sn_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT}
-
-/*!
- * \name MIRROR_TRANSPORT_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MIRROR_TRANSPORT_T_DATA 0
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT          1
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT \
-    {"DATA", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MIRROR_TRANSPORT_T_DATA},\
-    {"mirror_transport_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT}
-
-/*!
- * \name MPLS_ACH_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_ACH_T_CHANNEL_TYPE 0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_ACH_T_CW_TYPE      1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_ACH_T_RESERVED     2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_ACH_T_VERSION      3
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_ACH_T_FID_COUNT          4
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_ACH_T_FIELD_NAME_MAP_INIT \
-    {"CHANNEL_TYPE", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_ACH_T_CHANNEL_TYPE},\
-    {"CW_TYPE", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_ACH_T_CW_TYPE},\
-    {"RESERVED", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_ACH_T_RESERVED},\
-    {"VERSION", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_ACH_T_VERSION},\
-    {"mpls_ach_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_ACH_T_FID_COUNT}
-
-/*!
- * \name MPLS_BV_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_BV_T_VALUE 0
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_BV_T_FID_COUNT          1
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_BV_T_FIELD_NAME_MAP_INIT \
-    {"VALUE", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_BV_T_VALUE},\
-    {"mpls_bv_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_BV_T_FID_COUNT}
-
-/*!
- * \name MPLS_CW_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_CW_T_CW_TYPE    0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_CW_T_RESERVED   1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_CW_T_SEQ_NUMBER 2
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_CW_T_FID_COUNT          3
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_CW_T_FIELD_NAME_MAP_INIT \
-    {"CW_TYPE", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_CW_T_CW_TYPE},\
-    {"RESERVED", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_CW_T_RESERVED},\
-    {"SEQ_NUMBER", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_CW_T_SEQ_NUMBER},\
-    {"mpls_cw_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_CW_T_FID_COUNT}
-
-/*!
- * \name MPLS_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_T_BOS   0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_T_EXP   1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_T_LABEL 2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_T_TTL   3
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_T_FID_COUNT          4
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_T_FIELD_NAME_MAP_INIT \
-    {"BOS", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_T_BOS},\
-    {"EXP", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_T_EXP},\
-    {"LABEL", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_T_LABEL},\
-    {"TTL", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_T_TTL},\
-    {"mpls_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_T_FID_COUNT}
-
-/*!
- * \name P_1588_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_P_1588_T_CNTRL          0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_P_1588_T_CORRECTION     1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_P_1588_T_DOMAIN_NB      2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_P_1588_T_FLAGS          3
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_P_1588_T_LOGMSGINTERVAL 4
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_P_1588_T_MSG_LENGTH     5
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_P_1588_T_MSG_TYPE       6
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_P_1588_T_RESERVED1      7
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_P_1588_T_RESERVED2      8
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_P_1588_T_RESERVED3      9
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_P_1588_T_SEQ_ID         10
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_P_1588_T_SRCPORTID      11
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_P_1588_T_TRANSPORTSPEC  12
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_P_1588_T_VERSION        13
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_P_1588_T_FID_COUNT          14
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_P_1588_T_FIELD_NAME_MAP_INIT \
-    {"CNTRL", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_P_1588_T_CNTRL},\
-    {"CORRECTION", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_P_1588_T_CORRECTION},\
-    {"DOMAIN_NB", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_P_1588_T_DOMAIN_NB},\
-    {"FLAGS", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_P_1588_T_FLAGS},\
-    {"LOGMSGINTERVAL", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_P_1588_T_LOGMSGINTERVAL},\
-    {"MSG_LENGTH", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_P_1588_T_MSG_LENGTH},\
-    {"MSG_TYPE", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_P_1588_T_MSG_TYPE},\
-    {"RESERVED1", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_P_1588_T_RESERVED1},\
-    {"RESERVED2", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_P_1588_T_RESERVED2},\
-    {"RESERVED3", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_P_1588_T_RESERVED3},\
-    {"SEQ_ID", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_P_1588_T_SEQ_ID},\
-    {"SRCPORTID", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_P_1588_T_SRCPORTID},\
-    {"TRANSPORTSPEC", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_P_1588_T_TRANSPORTSPEC},\
-    {"VERSION", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_P_1588_T_VERSION},\
-    {"p_1588_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_P_1588_T_FID_COUNT}
-
-/*!
- * \name PROG_EXT_HDR_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PROG_EXT_HDR_T_HDR_EXT_LEN 0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PROG_EXT_HDR_T_NEXT_HEADER 1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PROG_EXT_HDR_T_OPTION      2
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PROG_EXT_HDR_T_FID_COUNT          3
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PROG_EXT_HDR_T_FIELD_NAME_MAP_INIT \
-    {"HDR_EXT_LEN", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PROG_EXT_HDR_T_HDR_EXT_LEN},\
-    {"NEXT_HEADER", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PROG_EXT_HDR_T_NEXT_HEADER},\
-    {"OPTION", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PROG_EXT_HDR_T_OPTION},\
-    {"prog_ext_hdr_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PROG_EXT_HDR_T_FID_COUNT}
-
-/*!
- * \name PSAMP_0_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_0_T_FLOWSET        0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_0_T_LENGTH         1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_0_T_NEXT_HOP_INDEX 2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_0_T_OBS_TIME_NS    3
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_0_T_OBS_TIME_S     4
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_0_T_TEMPLATE_ID    5
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_0_T_FID_COUNT          6
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_0_T_FIELD_NAME_MAP_INIT \
-    {"FLOWSET", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_0_T_FLOWSET},\
-    {"LENGTH", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_0_T_LENGTH},\
-    {"NEXT_HOP_INDEX", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_0_T_NEXT_HOP_INDEX},\
-    {"OBS_TIME_NS", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_0_T_OBS_TIME_NS},\
-    {"OBS_TIME_S", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_0_T_OBS_TIME_S},\
-    {"TEMPLATE_ID", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_0_T_TEMPLATE_ID},\
-    {"psamp_0_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_0_T_FID_COUNT}
-
-/*!
- * \name PSAMP_1_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_1_T_DLB_ID         0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_1_T_EGRESS_PORT    1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_1_T_EPOCH          2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_1_T_INGRESS_PORT   3
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_1_T_SAMPLED_LENGTH 4
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_1_T_USER_META_DATA 5
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_1_T_VARIABLE_FLAG  6
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_1_T_FID_COUNT          7
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_1_T_FIELD_NAME_MAP_INIT \
-    {"DLB_ID", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_1_T_DLB_ID},\
-    {"EGRESS_PORT", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_1_T_EGRESS_PORT},\
-    {"EPOCH", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_1_T_EPOCH},\
-    {"INGRESS_PORT", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_1_T_INGRESS_PORT},\
-    {"SAMPLED_LENGTH", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_1_T_SAMPLED_LENGTH},\
-    {"USER_META_DATA", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_1_T_USER_META_DATA},\
-    {"VARIABLE_FLAG", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_1_T_VARIABLE_FLAG},\
-    {"psamp_1_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_1_T_FID_COUNT}
-
-/*!
- * \name PSAMP_MIRROR_ON_DROP_0_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT 0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT    1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH          2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS     3
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S      4
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID       5
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID     6
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT          7
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT \
-    {"EGRESS_MOD_PORT", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT},\
-    {"INGRESS_PORT", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT},\
-    {"LENGTH", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH},\
-    {"OBS_TIME_NS", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS},\
-    {"OBS_TIME_S", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S},\
-    {"SWITCH_ID", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID},\
-    {"TEMPLATE_ID", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID},\
-    {"psamp_mirror_on_drop_0_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT}
-
-/*!
- * \name PSAMP_MIRROR_ON_DROP_3_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_DROP_REASON             0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_RESERVED_0              1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SAMPLED_LENGTH          2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SMOD_STATE              3
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_UC_COS__COLOR__PROB_IDX 4
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_USER_META_DATA          5
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_VAR_LEN_INDICATOR       6
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT          7
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FIELD_NAME_MAP_INIT \
-    {"DROP_REASON", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_DROP_REASON},\
-    {"RESERVED_0", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_RESERVED_0},\
-    {"SAMPLED_LENGTH", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SAMPLED_LENGTH},\
-    {"SMOD_STATE", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SMOD_STATE},\
-    {"UC_COS__COLOR__PROB_IDX", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_UC_COS__COLOR__PROB_IDX},\
-    {"USER_META_DATA", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_USER_META_DATA},\
-    {"VAR_LEN_INDICATOR", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_VAR_LEN_INDICATOR},\
-    {"psamp_mirror_on_drop_3_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT}
-
-/*!
- * \name RARP_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RARP_T_HARDWARE_LEN  0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RARP_T_HARDWARE_TYPE 1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RARP_T_OPERATION     2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RARP_T_PROT_ADDR_LEN 3
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RARP_T_PROTOCOL_TYPE 4
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RARP_T_SENDER_HA     5
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RARP_T_SENDER_IP     6
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RARP_T_TARGET_HA     7
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RARP_T_TARGET_IP     8
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RARP_T_FID_COUNT          9
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT \
-    {"HARDWARE_LEN", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RARP_T_HARDWARE_LEN},\
-    {"HARDWARE_TYPE", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RARP_T_HARDWARE_TYPE},\
-    {"OPERATION", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RARP_T_OPERATION},\
-    {"PROT_ADDR_LEN", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RARP_T_PROT_ADDR_LEN},\
-    {"PROTOCOL_TYPE", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RARP_T_PROTOCOL_TYPE},\
-    {"SENDER_HA", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RARP_T_SENDER_HA},\
-    {"SENDER_IP", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RARP_T_SENDER_IP},\
-    {"TARGET_HA", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RARP_T_TARGET_HA},\
-    {"TARGET_IP", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RARP_T_TARGET_IP},\
-    {"rarp_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RARP_T_FID_COUNT}
-
-/*!
- * \name ROUTING_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ROUTING_T_DATA          0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ROUTING_T_HDR_EXT_LEN   1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ROUTING_T_NEXT_HEADER   2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ROUTING_T_ROUTING_TYPE  3
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ROUTING_T_SEGMENTS_LEFT 4
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ROUTING_T_FID_COUNT          5
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ROUTING_T_FIELD_NAME_MAP_INIT \
-    {"DATA", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ROUTING_T_DATA},\
-    {"HDR_EXT_LEN", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ROUTING_T_HDR_EXT_LEN},\
-    {"NEXT_HEADER", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ROUTING_T_NEXT_HEADER},\
-    {"ROUTING_TYPE", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ROUTING_T_ROUTING_TYPE},\
-    {"SEGMENTS_LEFT", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ROUTING_T_SEGMENTS_LEFT},\
-    {"routing_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ROUTING_T_FID_COUNT}
-
-/*!
- * \name RSPAN_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RSPAN_T_TAG  0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RSPAN_T_TPID 1
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RSPAN_T_FID_COUNT          2
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RSPAN_T_FIELD_NAME_MAP_INIT \
-    {"TAG", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RSPAN_T_TAG},\
-    {"TPID", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RSPAN_T_TPID},\
-    {"rspan_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RSPAN_T_FID_COUNT}
-
-/*!
- * \name SEGMENT_ROUTING_SRH_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_SRH_T_FLAGS         0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_SRH_T_HDR_EXT_LEN   1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_SRH_T_LAST_ENTRY    2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_SRH_T_NEXT_HEADER   3
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_SRH_T_ROUTING_TYPE  4
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_SRH_T_SEGMENTS_LEFT 5
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_SRH_T_TAG           6
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_SRH_T_FID_COUNT          7
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_SRH_T_FIELD_NAME_MAP_INIT \
-    {"FLAGS", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_SRH_T_FLAGS},\
-    {"HDR_EXT_LEN", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_SRH_T_HDR_EXT_LEN},\
-    {"LAST_ENTRY", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_SRH_T_LAST_ENTRY},\
-    {"NEXT_HEADER", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_SRH_T_NEXT_HEADER},\
-    {"ROUTING_TYPE", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_SRH_T_ROUTING_TYPE},\
-    {"SEGMENTS_LEFT", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_SRH_T_SEGMENTS_LEFT},\
-    {"TAG", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_SRH_T_TAG},\
-    {"segment_routing_srh_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_SRH_T_FID_COUNT}
-
-/*!
- * \name SEGMENT_ROUTING_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_T_HDR_EXT_LEN      0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_T_LAST_ENTRY_FLAGS 1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_T_NEXT_HEADER      2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_T_ROUTING_TYPE     3
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_T_SEG_LIST         4
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_T_SEGMENTS_LEFT    5
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_T_TAG              6
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_T_FID_COUNT          7
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_T_FIELD_NAME_MAP_INIT \
-    {"HDR_EXT_LEN", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_T_HDR_EXT_LEN},\
-    {"LAST_ENTRY_FLAGS", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_T_LAST_ENTRY_FLAGS},\
-    {"NEXT_HEADER", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_T_NEXT_HEADER},\
-    {"ROUTING_TYPE", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_T_ROUTING_TYPE},\
-    {"SEG_LIST", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_T_SEG_LIST},\
-    {"SEGMENTS_LEFT", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_T_SEGMENTS_LEFT},\
-    {"TAG", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_T_TAG},\
-    {"segment_routing_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_T_FID_COUNT}
-
-/*!
- * \name SFLOW_SHIM_0_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_0_T_SYS_DESTINATION 0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_0_T_SYS_SOURCE      1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_0_T_VERSION         2
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT          3
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_0_T_FIELD_NAME_MAP_INIT \
-    {"SYS_DESTINATION", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_0_T_SYS_DESTINATION},\
-    {"SYS_SOURCE", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_0_T_SYS_SOURCE},\
-    {"VERSION", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_0_T_VERSION},\
-    {"sflow_shim_0_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT}
-
-/*!
- * \name SFLOW_SHIM_1_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_DEST_SAMPLE 0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_DISCARDED   1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_FLEX_SAMPLE 2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_MCAST       3
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_SRC_SAMPLE  4
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_TRUNCATED   5
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_1_T_RESERVED         6
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_1_T_SYS_OPCODE       7
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT          8
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_1_T_FIELD_NAME_MAP_INIT \
-    {"FLAG_DEST_SAMPLE", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_DEST_SAMPLE},\
-    {"FLAG_DISCARDED", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_DISCARDED},\
-    {"FLAG_FLEX_SAMPLE", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_FLEX_SAMPLE},\
-    {"FLAG_MCAST", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_MCAST},\
-    {"FLAG_SRC_SAMPLE", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_SRC_SAMPLE},\
-    {"FLAG_TRUNCATED", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_TRUNCATED},\
-    {"RESERVED", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_1_T_RESERVED},\
-    {"SYS_OPCODE", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_1_T_SYS_OPCODE},\
-    {"sflow_shim_1_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT}
-
-/*!
- * \name SFLOW_SHIM_2_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_2_T_SEQUENCE_NUM   0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_2_T_USER_META_DATA 1
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT          2
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_2_T_FIELD_NAME_MAP_INIT \
-    {"SEQUENCE_NUM", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_2_T_SEQUENCE_NUM},\
-    {"USER_META_DATA", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_2_T_USER_META_DATA},\
-    {"sflow_shim_2_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT}
-
-/*!
- * \name SNAP_LLC_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SNAP_LLC_T_LENGTH   0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SNAP_LLC_T_SNAP_LLC 1
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SNAP_LLC_T_FID_COUNT          2
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SNAP_LLC_T_FIELD_NAME_MAP_INIT \
-    {"LENGTH", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SNAP_LLC_T_LENGTH},\
-    {"SNAP_LLC", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SNAP_LLC_T_SNAP_LLC},\
-    {"snap_llc_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SNAP_LLC_T_FID_COUNT}
-
-/*!
- * \name STD_SEGMENT_ID_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_STD_SEGMENT_ID_T_DATA 0
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_STD_SEGMENT_ID_T_FID_COUNT          1
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_STD_SEGMENT_ID_T_FIELD_NAME_MAP_INIT \
-    {"DATA", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_STD_SEGMENT_ID_T_DATA},\
-    {"std_segment_id_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_STD_SEGMENT_ID_T_FID_COUNT}
-
-/*!
- * \name TCP_FIRST_4BYTES_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT 0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT 1
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT          2
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT \
-    {"DST_PORT", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT},\
-    {"SRC_PORT", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT},\
-    {"tcp_first_4bytes_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT}
-
-/*!
- * \name TCP_LAST_16BYTES_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM           0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM          1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS 2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM           3
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR        4
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE          5
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT          6
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT \
-    {"ACK_NUM", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM},\
-    {"CHECKSUM", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM},\
-    {"HDR_LEN_AND_FLAGS", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS},\
-    {"SEQ_NUM", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM},\
-    {"URGENT_PTR", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR},\
-    {"WIN_SIZE", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE},\
-    {"tcp_last_16bytes_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT}
-
-/*!
- * \name UDP_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UDP_T_CHECKSUM   0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UDP_T_DST_PORT   1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UDP_T_SRC_PORT   2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UDP_T_UDP_LENGTH 3
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UDP_T_FID_COUNT          4
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT \
-    {"CHECKSUM", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UDP_T_CHECKSUM},\
-    {"DST_PORT", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UDP_T_DST_PORT},\
-    {"SRC_PORT", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UDP_T_SRC_PORT},\
-    {"UDP_LENGTH", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UDP_T_UDP_LENGTH},\
-    {"udp_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UDP_T_FID_COUNT}
-
-/*!
- * \name UNKNOWN_L3_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD 0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD  1
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L3_T_FID_COUNT          2
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT \
-    {"FIRST_16BYTES_OF_L3_PAYLOAD", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD},\
-    {"NEXT_16BYTES_OF_L3_PAYLOAD", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD},\
-    {"unknown_l3_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L3_T_FID_COUNT}
-
-/*!
- * \name UNKNOWN_L4_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD 0
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L4_T_FID_COUNT          1
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT \
-    {"FIRST_4BYTES_OF_L4_PAYLOAD", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD},\
-    {"unknown_l4_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L4_T_FID_COUNT}
-
-/*!
- * \name UNKNOWN_L5_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1 0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3 1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7 2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L5_T_L5_BYTES_8_9 3
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L5_T_FID_COUNT          4
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT \
-    {"L5_BYTES_0_1", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1},\
-    {"L5_BYTES_2_3", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3},\
-    {"L5_BYTES_4_7", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7},\
-    {"L5_BYTES_8_9", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L5_T_L5_BYTES_8_9},\
-    {"unknown_l5_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L5_T_FID_COUNT}
-
-/*!
- * \name VLAN_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_VLAN_T_CFI  0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_VLAN_T_PCP  1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_VLAN_T_TPID 2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_VLAN_T_VID  3
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_VLAN_T_FID_COUNT          4
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT \
-    {"CFI", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_VLAN_T_CFI},\
-    {"PCP", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_VLAN_T_PCP},\
-    {"TPID", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_VLAN_T_TPID},\
-    {"VID", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_VLAN_T_VID},\
-    {"vlan_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_VLAN_T_FID_COUNT}
-
-/*!
- * \name VXLAN_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_VXLAN_T_FLAGS_RESERVED_1 0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_VXLAN_T_RESERVED2        1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_VXLAN_T_VN_ID            2
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_VXLAN_T_FID_COUNT          3
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT \
-    {"FLAGS_RESERVED_1", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_VXLAN_T_FLAGS_RESERVED_1},\
-    {"RESERVED2", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_VXLAN_T_RESERVED2},\
-    {"VN_ID", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_VXLAN_T_VN_ID},\
-    {"vxlan_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_VXLAN_T_FID_COUNT}
-
-/*!
- * \name WESP_T field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_WESP_T_FLAGS       0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_WESP_T_HEADER_LEN  1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_WESP_T_NEXT_HEADER 2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_WESP_T_SEQ_NUM     3
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_WESP_T_SPI         4
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_WESP_T_TRAILER_LEN 5
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_WESP_T_WESP_IV     6
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_WESP_T_FID_COUNT          7
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_WESP_T_FIELD_NAME_MAP_INIT \
-    {"FLAGS", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_WESP_T_FLAGS},\
-    {"HEADER_LEN", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_WESP_T_HEADER_LEN},\
-    {"NEXT_HEADER", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_WESP_T_NEXT_HEADER},\
-    {"SEQ_NUM", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_WESP_T_SEQ_NUM},\
-    {"SPI", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_WESP_T_SPI},\
-    {"TRAILER_LEN", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_WESP_T_TRAILER_LEN},\
-    {"WESP_IV", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_WESP_T_WESP_IV},\
-    {"wesp_t fid count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_WESP_T_FID_COUNT}
-
-
-#endif /* BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_FLEXHDR_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_bcmpkt_rxpmd_flex_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_bcmpkt_rxpmd_flex_data.h
deleted file mode 100644
index de8fe7cae024..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_bcmpkt_rxpmd_flex_data.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) map.yml.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_DATA_H
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_DATA_H
-
-/*!
- * \name RX flex metadata field IDs.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_DLB_ECMP_DESTINATION_15_0                      0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_DNAT_CTRL_3_0                                  1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0                                 2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_DVP_15_0                                       3
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_AND_SNAT_CTRL_15_0               4
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_EM_FT_OPAQUE_OBJ_OR_IFP_OPAQUE_OBJ_15_0        5
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_HIGH_3_0                         6
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0                         7
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_EP_NIH_DROP_CODE_OR_IFP_OPAQUE_OBJ_15_0        8
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_RECIRC_CODE_3_0                     9
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_15_0                      10
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_31_16                     11
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_15_0                        12
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_16                       13
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32                       14
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0                              15
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_IFP_IOAM_GBP_ACTION_3_0                        16
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_IFP_TS_CONTROL_ACTION_3_0                      17
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_15_0                             18
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_16                            19
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_INGRESS_DEVICE_PORT_6_0                        20
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0 21
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0                    22
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_INT_PRI_3_0                                    23
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_L2_IIF_11_0                                    24
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_L2_OIF_11_0                                    25
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_L3_DNAT_INDEX_15_0                             26
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_L3_IIF_13_0                                    27
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0                                  28
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_L3_SNAT_INDEX_15_0                             29
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_MPLS_LABEL_DECAP_COUNT_3_0                     30
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0              31
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_15_0                              32
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0                            33
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0                            34
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_SRV6_EDIT_AND_SL_UPDATE_CTRL_3_0               35
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_SRV6_NEW_GSID_SI_2_0                           36
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_SRV6_SID_AND_PREFIX_LEN_ENC_3_0                37
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_SRV6_TUNNEL_NEXT_SID_SELECT_3_0                38
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_SVP_15_0                                       39
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0                   40
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_SVTAG_SC_INDEX_STR_ALLOW_NAT_3_0               41
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0                        42
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0                              43
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_SYSTEM_SOURCE_15_0                             44
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_TIMESTAMP_CTRL_3_0                             45
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0                46
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_VFI_15_0                                       47
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_VLAN_TAG_PRESERVE_CTRL_SVP_MIRROR_ENABLE_3_0   48
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_FID_COUNT                       49
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_COUNT                    48
-
-/*!
- * \name Packet Flex Reason Types.
- */
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE                         0
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS                               1
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_DEFAULT                                 2
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED 3
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED                    4
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED  5
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED                     6
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_DST_FP                                  7
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_EM_FT                                   8
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_EM_FT_HPAE_MISS                         9
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_IFP                                     10
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_IFP_METER                               11
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED      12
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_IVXLT                                   13
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP                           14
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS                      15
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE                      16
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP                           17
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS                      18
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR                            19
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF                        20
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR                            21
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL                        22
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD                    23
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0                      24
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1                      25
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2                      26
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3                      27
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4                      28
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5                      29
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6                      30
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7                      31
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD            32
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED              33
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED                  34
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU                    35
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU                          36
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED              37
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT                            38
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_SER_DROP                                39
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD         40
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_SRV6                                    41
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_SVP                                     42
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP                               43
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU                44
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR                     45
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED                       46
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_VFP                                     47
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT \
-    {"CB_STATION_MOVE", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE},\
-    {"CML_FLAGS", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS},\
-    {"DEFAULT", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_DEFAULT},\
-    {"DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED},\
-    {"DLB_ECMP_PKT_SAMPLED", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED},\
-    {"DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED},\
-    {"DLB_LAG_PKT_SAMPLED", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED},\
-    {"DST_FP", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_DST_FP},\
-    {"EM_FT", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_EM_FT},\
-    {"EM_FT_HPAE_MISS", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_EM_FT_HPAE_MISS},\
-    {"IFP", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_IFP},\
-    {"IFP_METER", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_IFP_METER},\
-    {"IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED},\
-    {"IVXLT", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_IVXLT},\
-    {"L2_DST_LOOKUP", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP},\
-    {"L2_DST_LOOKUP_MISS", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS},\
-    {"L2_SRC_STATIC_MOVE", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE},\
-    {"L3_DST_LOOKUP", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP},\
-    {"L3_DST_LOOKUP_MISS", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS},\
-    {"L3_HDR_ERROR", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR},\
-    {"L3_IIF_EQ_L3_OIF", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF},\
-    {"L3_TTL_ERROR", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR},\
-    {"LEARN_CACHE_FULL", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL},\
-    {"MACSA_MULTICAST_RSVD", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD},\
-    {"MATCHED_RULE_BIT_0", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0},\
-    {"MATCHED_RULE_BIT_1", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1},\
-    {"MATCHED_RULE_BIT_2", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2},\
-    {"MATCHED_RULE_BIT_3", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3},\
-    {"MATCHED_RULE_BIT_4", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4},\
-    {"MATCHED_RULE_BIT_5", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5},\
-    {"MATCHED_RULE_BIT_6", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6},\
-    {"MATCHED_RULE_BIT_7", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7},\
-    {"MEMBERSHIP_CHECK_FAILED_RSVD", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD},\
-    {"MIRROR_SAMPLER_EGR_SAMPLED", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED},\
-    {"MIRROR_SAMPLER_SAMPLED", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED},\
-    {"MPLS_CTRL_PKT_TO_CPU", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU},\
-    {"NO_COPY_TO_CPU", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU},\
-    {"PKT_INTEGRITY_CHECK_FAILED", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED},\
-    {"PROTOCOL_PKT", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT},\
-    {"SER_DROP", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_SER_DROP},\
-    {"SPANNING_TREE_CHECK_FAILED_RSVD", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD},\
-    {"SRV6", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_SRV6},\
-    {"SVP", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_SVP},\
-    {"TRACE_DOP", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP},\
-    {"TRACE_DO_NOT_COPY_TO_CPU", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU},\
-    {"TRACE_DO_NOT_MIRROR", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR},\
-    {"URPF_CHECK_FAILED", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED},\
-    {"VFP", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_VFP},\
-    {"flex reason count", BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_COUNT}
-
-#endif /* BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_bcmpkt_rxpmd_match_id_defs.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_bcmpkt_rxpmd_match_id_defs.h
deleted file mode 100644
index 6a4d0c14cd5b..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_bcmpkt_rxpmd_match_id_defs.h
+++ /dev/null
@@ -1,505 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) bcm56690_a0_dna_6_5_29_0_1_sf_match_id_info.yml
- * for device bcm56690_a0 and variant dna_6_5_29_0_1.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_MATCH_ID_DEFS_H
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_MATCH_ID_DEFS_H
-
-#include <bcmpkt/bcmpkt_rxpmd_match_id.h>
-
-/*!
- * \brief Get the Match ID DataBase information.
- *
- * \retval bcmpkt_rxpmd_match_id_db_info_t Match ID DataBase information.
-*/
-extern bcmpkt_rxpmd_match_id_db_info_t *
-    bcm56690_a0_dna_6_5_29_0_1_rxpmd_match_id_db_info_get(void);
-
-/*!
- * \brief Get the Match ID Mapping information.
- *
- * \retval bcmpkt_rxpmd_match_id_map_info_t Match ID Mapping information.
-*/
-extern bcmpkt_rxpmd_match_id_map_info_t *
-    bcm56690_a0_dna_6_5_29_0_1_rxpmd_match_id_map_info_get(void);
-
-/*!
-  \name RXPMD Match IDs
-*/
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_CNTAG  0
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_GBP_ETHERNET_SHIM  1
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_BASE  2
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0  3
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG  4
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2  5
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE  6
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG  7
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC  8
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP  9
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1  10
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2  11
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD  12
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_1  13
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_2  14
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT  15
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE  16
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1  17
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2  18
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE  19
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE  20
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM  21
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY  22
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT  23
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ  24
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_1  25
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_2  26
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP  27
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_HEADER  28
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA  29
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP  30
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IOAM_E2E  31
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4  32
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6  33
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0  34
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1  35
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2  36
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3  37
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4  38
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5  39
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6  40
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH  41
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW  42
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE  43
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588  44
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_1  45
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_2  46
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP  47
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_1  48
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_2  49
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_SEG_ROUT_EXT_1  50
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES  51
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES  52
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP  53
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3  54
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4  55
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5  56
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN  57
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_1  58
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_2  59
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH  60
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK  61
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE  62
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_CNTAG  63
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_GBP_ETHERNET_SHIM  64
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE  65
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0  66
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG  67
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2  68
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE  69
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG  70
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC  71
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP  72
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1  73
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2  74
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD  75
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_1  76
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_2  77
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT  78
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE  79
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1  80
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2  81
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE  82
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE  83
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM  84
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY  85
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT  86
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ  87
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_1  88
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_2  89
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP  90
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_HEADER  91
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA  92
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP  93
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IOAM_E2E  94
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4  95
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6  96
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0  97
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1  98
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2  99
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3  100
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4  101
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5  102
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6  103
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH  104
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW  105
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE  106
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588  107
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_1  108
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_2  109
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP  110
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_1  111
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_2  112
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_SEG_ROUT_EXT_1  113
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES  114
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES  115
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP  116
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3  117
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4  118
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5  119
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN  120
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_1  121
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_2  122
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_CNTAG  123
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG  124
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2  125
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE  126
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG  127
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC  128
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP  129
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1  130
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2  131
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD  132
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_1  133
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_2  134
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT  135
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE  136
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1  137
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2  138
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_1  139
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_2  140
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP  141
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP  142
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4  143
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6  144
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE  145
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588  146
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_1  147
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_2  148
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP  149
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_1  150
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_2  151
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES  152
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES  153
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP  154
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3  155
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4  156
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5  157
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_1  158
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_2  159
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_CNTAG  160
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_GBP_ETHERNET_SHIM  161
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_BASE  162
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0  163
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG  164
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2  165
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE  166
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG  167
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC  168
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP  169
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1  170
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2  171
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD  172
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_1  173
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_2  174
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT  175
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE  176
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1  177
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2  178
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE  179
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE  180
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM  181
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY  182
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT  183
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ  184
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_1  185
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_2  186
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP  187
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_HEADER  188
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA  189
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP  190
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IOAM_E2E  191
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4  192
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6  193
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0  194
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1  195
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2  196
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3  197
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4  198
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5  199
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6  200
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH  201
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW  202
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE  203
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588  204
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_1  205
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_2  206
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP  207
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_1  208
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_2  209
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_SEG_ROUT_EXT_1  210
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES  211
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES  212
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP  213
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3  214
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4  215
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5  216
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN  217
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_1  218
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_2  219
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH  220
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK  221
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE  222
-#define BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_COUNT  223
-
-#define BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT \
-    {"EGRESS_PKT_FWD_L2_HDR_CNTAG", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_CNTAG}, \
-    {"EGRESS_PKT_FWD_L2_HDR_GBP_ETHERNET_SHIM", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_GBP_ETHERNET_SHIM}, \
-    {"EGRESS_PKT_FWD_L2_HDR_HG3_BASE", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_BASE}, \
-    {"EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0}, \
-    {"EGRESS_PKT_FWD_L2_HDR_ITAG", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG}, \
-    {"EGRESS_PKT_FWD_L2_HDR_L2", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2}, \
-    {"EGRESS_PKT_FWD_L2_HDR_NONE", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE}, \
-    {"EGRESS_PKT_FWD_L2_HDR_OTAG", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG}, \
-    {"EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ARP", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_BFD", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_1", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_2", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_2}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GPE", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_1", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_2", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_2}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ICMP", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IFA_HEADER", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_HEADER}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IGMP", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IOAM_E2E", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IOAM_E2E}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV4", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV6", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS0", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS1", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS2", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS3", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS4", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS5", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS6", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_NONE", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_P_1588", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_1", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_2", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_2}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_RARP", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_1", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_2", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_2}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_SEG_ROUT_EXT_1", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_SEG_ROUT_EXT_1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UDP", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_VXLAN", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_1", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_2", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_2}, \
-    {"EGRESS_PKT_SYS_HDR_EP_NIH", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH}, \
-    {"EGRESS_PKT_SYS_HDR_LOOPBACK", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK}, \
-    {"EGRESS_PKT_SYS_HDR_NONE", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_CNTAG", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_CNTAG}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_GBP_ETHERNET_SHIM", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_GBP_ETHERNET_SHIM}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_ITAG", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_L2", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_NONE", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_OTAG", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_1", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_2", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_2}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_1", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_2", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_2}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_HEADER", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_HEADER}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IOAM_E2E", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IOAM_E2E}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_1", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_2", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_2}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_1", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_2", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_2}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_SEG_ROUT_EXT_1", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_SEG_ROUT_EXT_1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_1", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_2", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_2}, \
-    {"INGRESS_PKT_INNER_L2_HDR_CNTAG", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_CNTAG}, \
-    {"INGRESS_PKT_INNER_L2_HDR_ITAG", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG}, \
-    {"INGRESS_PKT_INNER_L2_HDR_L2", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2}, \
-    {"INGRESS_PKT_INNER_L2_HDR_NONE", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE}, \
-    {"INGRESS_PKT_INNER_L2_HDR_OTAG", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG}, \
-    {"INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ARP", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_BFD", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_1", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_1}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_2", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_2}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_1", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_1}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_2", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_2}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ICMP", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_IGMP", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV4", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV6", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_NONE", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_P_1588", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_1", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_1}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_2", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_2}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_RARP", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_1", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_1}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_2", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_2}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UDP", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_1", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_1}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_2", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_2}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_CNTAG", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_CNTAG}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_GBP_ETHERNET_SHIM", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_GBP_ETHERNET_SHIM}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_HG3_BASE", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_BASE}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_ITAG", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_L2", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_NONE", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_OTAG", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ARP", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_BFD", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_1", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_2", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_2}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GPE", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_1", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_2", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_2}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ICMP", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IFA_HEADER", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_HEADER}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IGMP", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IOAM_E2E", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IOAM_E2E}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV4", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV6", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_NONE", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_P_1588", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_1", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_2", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_2}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_RARP", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_1", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_2", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_2}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_SEG_ROUT_EXT_1", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_SEG_ROUT_EXT_1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UDP", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_1", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_2", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_2}, \
-    {"INGRESS_PKT_SYS_HDR_EP_NIH", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH}, \
-    {"INGRESS_PKT_SYS_HDR_LOOPBACK", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK}, \
-    {"INGRESS_PKT_SYS_HDR_NONE", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE}, \
-    {"rxpmd_match_id_count", BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_COUNT}
-
-#endif /*! BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_MATCH_ID_DEFS_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_bcmpkt_flexhdr.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_bcmpkt_flexhdr.h
new file mode 100644
index 000000000000..e439f6b7b418
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_bcmpkt_flexhdr.h
@@ -0,0 +1,168 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) header.yml.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_FLEXHDR_H
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_FLEXHDR_H
+
+#include <bcmpkt/bcmpkt_flexhdr_internal.h>
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T                      0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T                   1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T                      2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CNTAG_T                    3
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T         4
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T         5
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_DEST_OPTION_T              6
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T            7
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T        8
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_SUBHDR_5_T         9
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ESP_T                      10
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ETHERTYPE_T                11
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_FRAG_T                     12
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GBP_ETHERNET_SHIM_T        13
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T         14
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GPE_T                      15
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_CHKSUM_T               16
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_KEY_T                  17
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_ROUT_T                 18
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_SEQ_T                  19
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_T                      20
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T                 21
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T          22
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HOP_BY_HOP_T               23
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ICMP_T                     24
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_HEADER_T               25
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_A_T           26
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_B_T           27
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_BASE_T        28
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IGMP_T                     29
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IOAM_E2E_T                 30
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPFIX_T                    31
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T                     32
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T                     33
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_L2_T                       34
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_ERSPAN_SN_T         35
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_TRANSPORT_T         36
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_ACH_T                 37
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_BV_T                  38
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_CW_T                  39
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_T                     40
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T                   41
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PROG_EXT_HDR_T             42
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T                  43
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T                  44
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T   45
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T   46
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T                     47
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ROUTING_T                  48
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RSPAN_T                    49
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_0_T             50
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T             51
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_2_T             52
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SNAP_LLC_T                 53
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_TCP_FIRST_4BYTES_T         54
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T         55
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UDP_T                      56
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L3_T               57
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L4_T               58
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L5_T               59
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_VLAN_T                     60
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_VXLAN_T                    61
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T                     62
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_T               63
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_FLEXHDR_COUNT    64
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_FLEXHDR_NAME_MAP_INIT \
+    {"arp_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T},\
+    {"authen_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T},\
+    {"bfd_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T},\
+    {"cntag_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CNTAG_T},\
+    {"cpu_composites_0_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T},\
+    {"cpu_composites_1_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T},\
+    {"dest_option_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_DEST_OPTION_T},\
+    {"ep_nih_header_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T},\
+    {"erspan3_fixed_hdr_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T},\
+    {"erspan3_subhdr_5_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_SUBHDR_5_T},\
+    {"esp_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ESP_T},\
+    {"ethertype_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ETHERTYPE_T},\
+    {"frag_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_FRAG_T},\
+    {"gbp_ethernet_shim_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GBP_ETHERNET_SHIM_T},\
+    {"generic_loopback_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T},\
+    {"gpe_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GPE_T},\
+    {"gre_chksum_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_CHKSUM_T},\
+    {"gre_key_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_KEY_T},\
+    {"gre_rout_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_ROUT_T},\
+    {"gre_seq_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_SEQ_T},\
+    {"gre_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_T},\
+    {"hg3_base_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T},\
+    {"hg3_extension_0_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T},\
+    {"hop_by_hop_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HOP_BY_HOP_T},\
+    {"icmp_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ICMP_T},\
+    {"ifa_header_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_HEADER_T},\
+    {"ifa_metadata_a_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_A_T},\
+    {"ifa_metadata_b_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_B_T},\
+    {"ifa_metadata_base_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_BASE_T},\
+    {"igmp_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IGMP_T},\
+    {"ioam_e2e_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IOAM_E2E_T},\
+    {"ipfix_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPFIX_T},\
+    {"ipv4_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T},\
+    {"ipv6_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T},\
+    {"l2_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_L2_T},\
+    {"mirror_erspan_sn_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_ERSPAN_SN_T},\
+    {"mirror_transport_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_TRANSPORT_T},\
+    {"mpls_ach_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_ACH_T},\
+    {"mpls_bv_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_BV_T},\
+    {"mpls_cw_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_CW_T},\
+    {"mpls_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_T},\
+    {"p_1588_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T},\
+    {"prog_ext_hdr_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PROG_EXT_HDR_T},\
+    {"psamp_0_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T},\
+    {"psamp_1_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T},\
+    {"psamp_mirror_on_drop_0_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T},\
+    {"psamp_mirror_on_drop_3_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T},\
+    {"rarp_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T},\
+    {"routing_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ROUTING_T},\
+    {"rspan_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RSPAN_T},\
+    {"sflow_shim_0_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_0_T},\
+    {"sflow_shim_1_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T},\
+    {"sflow_shim_2_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_2_T},\
+    {"snap_llc_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SNAP_LLC_T},\
+    {"tcp_first_4bytes_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_TCP_FIRST_4BYTES_T},\
+    {"tcp_last_16bytes_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T},\
+    {"udp_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UDP_T},\
+    {"unknown_l3_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L3_T},\
+    {"unknown_l4_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L4_T},\
+    {"unknown_l5_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L5_T},\
+    {"vlan_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_VLAN_T},\
+    {"vxlan_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_VXLAN_T},\
+    {"wesp_t", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T},\
+    {"RXPMD_FLEX_T", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_T},\
+    {"flexhdr count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_FLEXHDR_COUNT}
+
+#endif /* BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_FLEXHDR_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_bcmpkt_flexhdr_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_bcmpkt_flexhdr_data.h
new file mode 100644
index 000000000000..3141fd211e54
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_bcmpkt_flexhdr_data.h
@@ -0,0 +1,1291 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) header.yml.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_FLEXHDR_DATA_H
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_FLEXHDR_DATA_H
+
+/*!
+ * \name ARP_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_HARDWARE_LEN  0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_HARDWARE_TYPE 1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_OPERATION     2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_PROT_ADDR_LEN 3
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_PROTOCOL_TYPE 4
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_SENDER_HA     5
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_SENDER_IP     6
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_TARGET_HA     7
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_TARGET_IP     8
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_FID_COUNT          9
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT \
+    {"HARDWARE_LEN", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_HARDWARE_LEN},\
+    {"HARDWARE_TYPE", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_HARDWARE_TYPE},\
+    {"OPERATION", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_OPERATION},\
+    {"PROT_ADDR_LEN", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_PROT_ADDR_LEN},\
+    {"PROTOCOL_TYPE", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_PROTOCOL_TYPE},\
+    {"SENDER_HA", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_SENDER_HA},\
+    {"SENDER_IP", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_SENDER_IP},\
+    {"TARGET_HA", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_TARGET_HA},\
+    {"TARGET_IP", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_TARGET_IP},\
+    {"arp_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_FID_COUNT}
+
+/*!
+ * \name AUTHEN_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T_DATA        0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T_NEXT_HEADER 1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T_PAYLOAD_LEN 2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T_RESERVED    3
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T_SEQ_NUM     4
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T_SPI         5
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T_FID_COUNT          6
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T_FIELD_NAME_MAP_INIT \
+    {"DATA", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T_DATA},\
+    {"NEXT_HEADER", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T_NEXT_HEADER},\
+    {"PAYLOAD_LEN", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T_PAYLOAD_LEN},\
+    {"RESERVED", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T_RESERVED},\
+    {"SEQ_NUM", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T_SEQ_NUM},\
+    {"SPI", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T_SPI},\
+    {"authen_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T_FID_COUNT}
+
+/*!
+ * \name BFD_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_AP            0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_BFD_LENGTH    1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_CPI           2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_DEM           3
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_DESMINTXINTV  4
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_DETECTMULT    5
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_DIAG          6
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_FIN           7
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_MINECHORXINTV 8
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_MPT           9
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_MYDISCRIM     10
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_POLL          11
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_REQMINRXINTV  12
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_STA           13
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_URDISCRIM     14
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_VERSION       15
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_FID_COUNT          16
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_FIELD_NAME_MAP_INIT \
+    {"AP", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_AP},\
+    {"BFD_LENGTH", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_BFD_LENGTH},\
+    {"CPI", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_CPI},\
+    {"DEM", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_DEM},\
+    {"DESMINTXINTV", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_DESMINTXINTV},\
+    {"DETECTMULT", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_DETECTMULT},\
+    {"DIAG", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_DIAG},\
+    {"FIN", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_FIN},\
+    {"MINECHORXINTV", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_MINECHORXINTV},\
+    {"MPT", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_MPT},\
+    {"MYDISCRIM", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_MYDISCRIM},\
+    {"POLL", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_POLL},\
+    {"REQMINRXINTV", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_REQMINRXINTV},\
+    {"STA", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_STA},\
+    {"URDISCRIM", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_URDISCRIM},\
+    {"VERSION", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_VERSION},\
+    {"bfd_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_FID_COUNT}
+
+/*!
+ * \name CNTAG_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CNTAG_T_RPID 0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CNTAG_T_TPID 1
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CNTAG_T_FID_COUNT          2
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CNTAG_T_FIELD_NAME_MAP_INIT \
+    {"RPID", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CNTAG_T_RPID},\
+    {"TPID", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CNTAG_T_TPID},\
+    {"cntag_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CNTAG_T_FID_COUNT}
+
+/*!
+ * \name CPU_COMPOSITES_0_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0 0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1 1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2 2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3 3
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4 4
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5 5
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6 6
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT          7
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT \
+    {"DMA_CONT0", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0},\
+    {"DMA_CONT1", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1},\
+    {"DMA_CONT2", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2},\
+    {"DMA_CONT3", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3},\
+    {"DMA_CONT4", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4},\
+    {"DMA_CONT5", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5},\
+    {"DMA_CONT6", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6},\
+    {"cpu_composites_0_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT}
+
+/*!
+ * \name CPU_COMPOSITES_1_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10 0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11 1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12 2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13 3
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14 4
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15 5
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16 6
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17 7
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7  8
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8  9
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9  10
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT          11
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT \
+    {"DMA_CONT10", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10},\
+    {"DMA_CONT11", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11},\
+    {"DMA_CONT12", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12},\
+    {"DMA_CONT13", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13},\
+    {"DMA_CONT14", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14},\
+    {"DMA_CONT15", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15},\
+    {"DMA_CONT16", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16},\
+    {"DMA_CONT17", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17},\
+    {"DMA_CONT7", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7},\
+    {"DMA_CONT8", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8},\
+    {"DMA_CONT9", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9},\
+    {"cpu_composites_1_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT}
+
+/*!
+ * \name DEST_OPTION_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_DEST_OPTION_T_HDR_EXT_LEN 0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_DEST_OPTION_T_NEXT_HEADER 1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_DEST_OPTION_T_OPTION      2
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_DEST_OPTION_T_FID_COUNT          3
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_DEST_OPTION_T_FIELD_NAME_MAP_INIT \
+    {"HDR_EXT_LEN", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_DEST_OPTION_T_HDR_EXT_LEN},\
+    {"NEXT_HEADER", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_DEST_OPTION_T_NEXT_HEADER},\
+    {"OPTION", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_DEST_OPTION_T_OPTION},\
+    {"dest_option_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_DEST_OPTION_T_FID_COUNT}
+
+/*!
+ * \name EP_NIH_HEADER_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_HEADER_SUBTYPE       0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_HEADER_TYPE          1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_A        2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_B        3
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_C        4
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_A      5
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_B      6
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_C      7
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_RECIRC_PROFILE_INDEX 8
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_RESERVED_0           9
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_START                10
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_TIMESTAMP            11
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT          12
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_FIELD_NAME_MAP_INIT \
+    {"HEADER_SUBTYPE", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_HEADER_SUBTYPE},\
+    {"HEADER_TYPE", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_HEADER_TYPE},\
+    {"OPAQUE_CTRL_A", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_A},\
+    {"OPAQUE_CTRL_B", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_B},\
+    {"OPAQUE_CTRL_C", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_C},\
+    {"OPAQUE_OBJECT_A", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_A},\
+    {"OPAQUE_OBJECT_B", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_B},\
+    {"OPAQUE_OBJECT_C", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_C},\
+    {"RECIRC_PROFILE_INDEX", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_RECIRC_PROFILE_INDEX},\
+    {"RESERVED_0", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_RESERVED_0},\
+    {"START", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_START},\
+    {"TIMESTAMP", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_TIMESTAMP},\
+    {"ep_nih_header_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT}
+
+/*!
+ * \name ERSPAN3_FIXED_HDR_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO               0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_COS               1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID           2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O 3
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID        4
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_T                 5
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP         6
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VER               7
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN              8
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT          9
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT \
+    {"BSO", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO},\
+    {"COS", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_COS},\
+    {"GBP_SID", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID},\
+    {"P_FT_HWID_D_GRA_O", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O},\
+    {"SESSION_ID", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID},\
+    {"T", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_T},\
+    {"TIMESTAMP", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP},\
+    {"VER", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VER},\
+    {"VLAN", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN},\
+    {"erspan3_fixed_hdr_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT}
+
+/*!
+ * \name ERSPAN3_SUBHDR_5_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID 0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID     1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID   2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP   3
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT          4
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT \
+    {"PLATFORM_ID", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID},\
+    {"PORT_ID", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID},\
+    {"SWITCH_ID", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID},\
+    {"TIMESTAMP", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP},\
+    {"erspan3_subhdr_5_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT}
+
+/*!
+ * \name ESP_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ESP_T_NEXT_HEADER 0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ESP_T_PAD         1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ESP_T_PAD_LEN     2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ESP_T_SEQ_NUM     3
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ESP_T_SPI         4
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ESP_T_FID_COUNT          5
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ESP_T_FIELD_NAME_MAP_INIT \
+    {"NEXT_HEADER", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ESP_T_NEXT_HEADER},\
+    {"PAD", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ESP_T_PAD},\
+    {"PAD_LEN", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ESP_T_PAD_LEN},\
+    {"SEQ_NUM", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ESP_T_SEQ_NUM},\
+    {"SPI", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ESP_T_SPI},\
+    {"esp_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ESP_T_FID_COUNT}
+
+/*!
+ * \name ETHERTYPE_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ETHERTYPE_T_TYPE 0
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ETHERTYPE_T_FID_COUNT          1
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT \
+    {"TYPE", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ETHERTYPE_T_TYPE},\
+    {"ethertype_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ETHERTYPE_T_FID_COUNT}
+
+/*!
+ * \name FRAG_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_FRAG_T_FRAG_INFO   0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_FRAG_T_ID          1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_FRAG_T_NEXT_HEADER 2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_FRAG_T_RESERVED    3
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_FRAG_T_FID_COUNT          4
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_FRAG_T_FIELD_NAME_MAP_INIT \
+    {"FRAG_INFO", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_FRAG_T_FRAG_INFO},\
+    {"ID", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_FRAG_T_ID},\
+    {"NEXT_HEADER", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_FRAG_T_NEXT_HEADER},\
+    {"RESERVED", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_FRAG_T_RESERVED},\
+    {"frag_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_FRAG_T_FID_COUNT}
+
+/*!
+ * \name GBP_ETHERNET_SHIM_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GBP_ETHERNET_SHIM_T_ETHERTYPE 0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GBP_ETHERNET_SHIM_T_FLAGS     1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GBP_ETHERNET_SHIM_T_RESERVED  2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GBP_ETHERNET_SHIM_T_SID       3
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GBP_ETHERNET_SHIM_T_SUBTYPE   4
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GBP_ETHERNET_SHIM_T_VER       5
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GBP_ETHERNET_SHIM_T_FID_COUNT          6
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GBP_ETHERNET_SHIM_T_FIELD_NAME_MAP_INIT \
+    {"ETHERTYPE", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GBP_ETHERNET_SHIM_T_ETHERTYPE},\
+    {"FLAGS", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GBP_ETHERNET_SHIM_T_FLAGS},\
+    {"RESERVED", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GBP_ETHERNET_SHIM_T_RESERVED},\
+    {"SID", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GBP_ETHERNET_SHIM_T_SID},\
+    {"SUBTYPE", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GBP_ETHERNET_SHIM_T_SUBTYPE},\
+    {"VER", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GBP_ETHERNET_SHIM_T_VER},\
+    {"gbp_ethernet_shim_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GBP_ETHERNET_SHIM_T_FID_COUNT}
+
+/*!
+ * \name GENERIC_LOOPBACK_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ    0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE   1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ        2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_FLAGS              3
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE        4
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY     5
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL     6
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ      7
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0  8
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1  9
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ            10
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1         11
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT 12
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_SRC_SUBPORT_NUM    13
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE         14
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT          15
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT \
+    {"DESTINATION_OBJ", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ},\
+    {"DESTINATION_TYPE", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE},\
+    {"ENTROPY_OBJ", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ},\
+    {"FLAGS", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_FLAGS},\
+    {"HEADER_TYPE", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE},\
+    {"INPUT_PRIORITY", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY},\
+    {"INTERFACE_CTRL", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL},\
+    {"INTERFACE_OBJ", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ},\
+    {"PROCESSING_CTRL_0", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0},\
+    {"PROCESSING_CTRL_1", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1},\
+    {"QOS_OBJ", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ},\
+    {"RESERVED_1", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1},\
+    {"SOURCE_SYSTEM_PORT", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT},\
+    {"SRC_SUBPORT_NUM", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_SRC_SUBPORT_NUM},\
+    {"START_BYTE", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE},\
+    {"generic_loopback_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT}
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NO_OP         0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2_OIF        1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED      2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__VP            3
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP          4
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NHOP          5
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2MC_GROUP    6
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L3MC_GROUP    7
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED_1    8
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP_MEMBER   9
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__DEVICE_PORT   10
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__UNDERLAY_ECMP 11
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_TYPE__TUNNEL  0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_TYPE__GENERIC 1
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__NOOP   0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__VFI    1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__L3_IIF 2
+
+/*!
+ * \name GPE_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GPE_T_FLAGS         0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GPE_T_NEXT_PROTOCOL 1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GPE_T_RESERVED0     2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GPE_T_RESERVED1     3
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GPE_T_VNI           4
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GPE_T_FID_COUNT          5
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GPE_T_FIELD_NAME_MAP_INIT \
+    {"FLAGS", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GPE_T_FLAGS},\
+    {"NEXT_PROTOCOL", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GPE_T_NEXT_PROTOCOL},\
+    {"RESERVED0", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GPE_T_RESERVED0},\
+    {"RESERVED1", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GPE_T_RESERVED1},\
+    {"VNI", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GPE_T_VNI},\
+    {"gpe_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GPE_T_FID_COUNT}
+
+/*!
+ * \name GRE_CHKSUM_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_CHKSUM_T_CHECKSUM 0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_CHKSUM_T_OFFSET   1
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT          2
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_CHKSUM_T_FIELD_NAME_MAP_INIT \
+    {"CHECKSUM", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_CHKSUM_T_CHECKSUM},\
+    {"OFFSET", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_CHKSUM_T_OFFSET},\
+    {"gre_chksum_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT}
+
+/*!
+ * \name GRE_KEY_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_KEY_T_KEY 0
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_KEY_T_FID_COUNT          1
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_KEY_T_FIELD_NAME_MAP_INIT \
+    {"KEY", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_KEY_T_KEY},\
+    {"gre_key_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_KEY_T_FID_COUNT}
+
+/*!
+ * \name GRE_ROUT_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_ROUT_T_ROUTING 0
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_ROUT_T_FID_COUNT          1
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_ROUT_T_FIELD_NAME_MAP_INIT \
+    {"ROUTING", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_ROUT_T_ROUTING},\
+    {"gre_rout_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_ROUT_T_FID_COUNT}
+
+/*!
+ * \name GRE_SEQ_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_SEQ_T_SEQUENCE 0
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_SEQ_T_FID_COUNT          1
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_SEQ_T_FIELD_NAME_MAP_INIT \
+    {"SEQUENCE", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_SEQ_T_SEQUENCE},\
+    {"gre_seq_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_SEQ_T_FID_COUNT}
+
+/*!
+ * \name GRE_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_T_C_R_K_S  0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_T_PROTOCOL 1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_T_RESERVED 2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_T_VERSION  3
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_T_FID_COUNT          4
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_T_FIELD_NAME_MAP_INIT \
+    {"C_R_K_S", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_T_C_R_K_S},\
+    {"PROTOCOL", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_T_PROTOCOL},\
+    {"RESERVED", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_T_RESERVED},\
+    {"VERSION", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_T_VERSION},\
+    {"gre_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_T_FID_COUNT}
+
+/*!
+ * \name HG3_BASE_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_CN                      0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_CNG                     1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_ENTROPY                 2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_EXT_HDR_PRESENT         3
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_HG3_RESERVED            4
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_L3_ROUTED               5
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_MIRROR_COPY             6
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_RESERVED_ETYPE          7
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION      8
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION_TYPE 9
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_SYSTEM_SOURCE           10
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_TC                      11
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_VERSION                 12
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_FID_COUNT          13
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_FIELD_NAME_MAP_INIT \
+    {"CN", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_CN},\
+    {"CNG", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_CNG},\
+    {"ENTROPY", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_ENTROPY},\
+    {"EXT_HDR_PRESENT", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_EXT_HDR_PRESENT},\
+    {"HG3_RESERVED", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_HG3_RESERVED},\
+    {"L3_ROUTED", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_L3_ROUTED},\
+    {"MIRROR_COPY", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_MIRROR_COPY},\
+    {"RESERVED_ETYPE", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_RESERVED_ETYPE},\
+    {"SYSTEM_DESTINATION", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION},\
+    {"SYSTEM_DESTINATION_TYPE", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION_TYPE},\
+    {"SYSTEM_SOURCE", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_SYSTEM_SOURCE},\
+    {"TC", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_TC},\
+    {"VERSION", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_VERSION},\
+    {"hg3_base_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_FID_COUNT}
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__NO_OP         0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__L2_OIF        1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__RESERVED      2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__VP            3
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__ECMP          4
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__NHOP          5
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__L2MC_GROUP    6
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__L3MC_GROUP    7
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__RESERVED_1    8
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__ECMP_MEMBER   9
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__DEVICE_PORT   10
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__UNDERLAY_ECMP 11
+
+/*!
+ * \name HG3_EXTENSION_0_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_LSB      0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_MSB      1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T_DVP_OR_L3_IIF     2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T_FLAGS             3
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T_FORWARDING_DOMAIN 4
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T_SVP               5
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT          6
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T_FIELD_NAME_MAP_INIT \
+    {"CLASS_ID_LSB", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_LSB},\
+    {"CLASS_ID_MSB", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_MSB},\
+    {"DVP_OR_L3_IIF", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T_DVP_OR_L3_IIF},\
+    {"FLAGS", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T_FLAGS},\
+    {"FORWARDING_DOMAIN", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T_FORWARDING_DOMAIN},\
+    {"SVP", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T_SVP},\
+    {"hg3_extension_0_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT}
+
+/*!
+ * \name HOP_BY_HOP_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HOP_BY_HOP_T_HDR_EXT_LEN 0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HOP_BY_HOP_T_NEXT_HEADER 1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HOP_BY_HOP_T_OPTION      2
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT          3
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HOP_BY_HOP_T_FIELD_NAME_MAP_INIT \
+    {"HDR_EXT_LEN", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HOP_BY_HOP_T_HDR_EXT_LEN},\
+    {"NEXT_HEADER", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HOP_BY_HOP_T_NEXT_HEADER},\
+    {"OPTION", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HOP_BY_HOP_T_OPTION},\
+    {"hop_by_hop_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT}
+
+/*!
+ * \name ICMP_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ICMP_T_CHECKSUM  0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ICMP_T_CODE      1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ICMP_T_ICMP_TYPE 2
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ICMP_T_FID_COUNT          3
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT \
+    {"CHECKSUM", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ICMP_T_CHECKSUM},\
+    {"CODE", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ICMP_T_CODE},\
+    {"ICMP_TYPE", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ICMP_T_ICMP_TYPE},\
+    {"icmp_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ICMP_T_FID_COUNT}
+
+/*!
+ * \name IFA_HEADER_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_HEADER_T_FLAGS      0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_HEADER_T_GNS        1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_HEADER_T_MAX_LENGTH 2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_HEADER_T_NEXT_HDR   3
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_HEADER_T_VER        4
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_HEADER_T_FID_COUNT          5
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_HEADER_T_FIELD_NAME_MAP_INIT \
+    {"FLAGS", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_HEADER_T_FLAGS},\
+    {"GNS", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_HEADER_T_GNS},\
+    {"MAX_LENGTH", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_HEADER_T_MAX_LENGTH},\
+    {"NEXT_HDR", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_HEADER_T_NEXT_HDR},\
+    {"VER", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_HEADER_T_VER},\
+    {"ifa_header_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_HEADER_T_FID_COUNT}
+
+/*!
+ * \name IFA_METADATA_A_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_A_T_CN               0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_A_T_FWD_HDR_TTL      1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_A_T_LNS_DEVICE_ID    2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_A_T_PORT_SPEED       3
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_A_T_QUEUE_ID         4
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_A_T_RX_TIMESTAMP_SEC 5
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_A_T_FID_COUNT          6
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_A_T_FIELD_NAME_MAP_INIT \
+    {"CN", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_A_T_CN},\
+    {"FWD_HDR_TTL", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_A_T_FWD_HDR_TTL},\
+    {"LNS_DEVICE_ID", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_A_T_LNS_DEVICE_ID},\
+    {"PORT_SPEED", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_A_T_PORT_SPEED},\
+    {"QUEUE_ID", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_A_T_QUEUE_ID},\
+    {"RX_TIMESTAMP_SEC", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_A_T_RX_TIMESTAMP_SEC},\
+    {"ifa_metadata_a_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_A_T_FID_COUNT}
+
+/*!
+ * \name IFA_METADATA_B_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_B_T_EGRESS_PORT_ID         0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_B_T_INGRESS_PORT_ID        1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_B_T_MMU_STAT_0             2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_B_T_MMU_STAT_1             3
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_B_T_RESIDENCE_TIME_NANOSEC 4
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_B_T_RX_TIMESTAMP_NANOSEC   5
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_B_T_TX_QUEUE_BYTE_COUNT    6
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_B_T_FID_COUNT          7
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_B_T_FIELD_NAME_MAP_INIT \
+    {"EGRESS_PORT_ID", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_B_T_EGRESS_PORT_ID},\
+    {"INGRESS_PORT_ID", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_B_T_INGRESS_PORT_ID},\
+    {"MMU_STAT_0", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_B_T_MMU_STAT_0},\
+    {"MMU_STAT_1", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_B_T_MMU_STAT_1},\
+    {"RESIDENCE_TIME_NANOSEC", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_B_T_RESIDENCE_TIME_NANOSEC},\
+    {"RX_TIMESTAMP_NANOSEC", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_B_T_RX_TIMESTAMP_NANOSEC},\
+    {"TX_QUEUE_BYTE_COUNT", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_B_T_TX_QUEUE_BYTE_COUNT},\
+    {"ifa_metadata_b_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_B_T_FID_COUNT}
+
+/*!
+ * \name IFA_METADATA_BASE_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_BASE_T_ACTION_VECTOR            0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_BASE_T_HOP_LIMIT_CURRENT_LENGTH 1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_BASE_T_REQUEST_VECTOR           2
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_BASE_T_FID_COUNT          3
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_BASE_T_FIELD_NAME_MAP_INIT \
+    {"ACTION_VECTOR", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_BASE_T_ACTION_VECTOR},\
+    {"HOP_LIMIT_CURRENT_LENGTH", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_BASE_T_HOP_LIMIT_CURRENT_LENGTH},\
+    {"REQUEST_VECTOR", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_BASE_T_REQUEST_VECTOR},\
+    {"ifa_metadata_base_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_BASE_T_FID_COUNT}
+
+/*!
+ * \name IGMP_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IGMP_T_CHECKSUM      0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IGMP_T_GROUP_ADDRESS 1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IGMP_T_IGMP_TYPE     2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IGMP_T_MAX_RESP_TIME 3
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IGMP_T_FID_COUNT          4
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IGMP_T_FIELD_NAME_MAP_INIT \
+    {"CHECKSUM", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IGMP_T_CHECKSUM},\
+    {"GROUP_ADDRESS", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IGMP_T_GROUP_ADDRESS},\
+    {"IGMP_TYPE", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IGMP_T_IGMP_TYPE},\
+    {"MAX_RESP_TIME", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IGMP_T_MAX_RESP_TIME},\
+    {"igmp_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IGMP_T_FID_COUNT}
+
+/*!
+ * \name IOAM_E2E_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IOAM_E2E_T_IOAM_E2E_DATA 0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IOAM_E2E_T_IOAM_E2E_TYPE 1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IOAM_E2E_T_IOAM_HDR_LEN  2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IOAM_E2E_T_NAMESPACE_ID  3
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IOAM_E2E_T_NEXT_PROTOCOL 4
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IOAM_E2E_T_RESERVED      5
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IOAM_E2E_T_TYPE          6
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IOAM_E2E_T_FID_COUNT          7
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IOAM_E2E_T_FIELD_NAME_MAP_INIT \
+    {"IOAM_E2E_DATA", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IOAM_E2E_T_IOAM_E2E_DATA},\
+    {"IOAM_E2E_TYPE", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IOAM_E2E_T_IOAM_E2E_TYPE},\
+    {"IOAM_HDR_LEN", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IOAM_E2E_T_IOAM_HDR_LEN},\
+    {"NAMESPACE_ID", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IOAM_E2E_T_NAMESPACE_ID},\
+    {"NEXT_PROTOCOL", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IOAM_E2E_T_NEXT_PROTOCOL},\
+    {"RESERVED", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IOAM_E2E_T_RESERVED},\
+    {"TYPE", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IOAM_E2E_T_TYPE},\
+    {"ioam_e2e_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IOAM_E2E_T_FID_COUNT}
+
+/*!
+ * \name IPFIX_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPFIX_T_EXPORT_TIME   0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPFIX_T_LENGTH        1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPFIX_T_OBS_DOMAIN_ID 2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPFIX_T_SEQUENCE_NUM  3
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPFIX_T_VERSION       4
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPFIX_T_FID_COUNT          5
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT \
+    {"EXPORT_TIME", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPFIX_T_EXPORT_TIME},\
+    {"LENGTH", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPFIX_T_LENGTH},\
+    {"OBS_DOMAIN_ID", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPFIX_T_OBS_DOMAIN_ID},\
+    {"SEQUENCE_NUM", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPFIX_T_SEQUENCE_NUM},\
+    {"VERSION", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPFIX_T_VERSION},\
+    {"ipfix_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPFIX_T_FID_COUNT}
+
+/*!
+ * \name IPV4_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_DA                0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET 1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_HDR_CHECKSUM      2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_ID                3
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_OPTION            4
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_PROTOCOL          5
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_SA                6
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_TOS               7
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_TOTAL_LENGTH      8
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_TTL               9
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_VERSION_HDR_LEN   10
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_FID_COUNT          11
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT \
+    {"DA", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_DA},\
+    {"FLAGS_FRAG_OFFSET", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET},\
+    {"HDR_CHECKSUM", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_HDR_CHECKSUM},\
+    {"ID", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_ID},\
+    {"OPTION", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_OPTION},\
+    {"PROTOCOL", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_PROTOCOL},\
+    {"SA", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_SA},\
+    {"TOS", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_TOS},\
+    {"TOTAL_LENGTH", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_TOTAL_LENGTH},\
+    {"TTL", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_TTL},\
+    {"VERSION_HDR_LEN", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_VERSION_HDR_LEN},\
+    {"ipv4_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_FID_COUNT}
+
+/*!
+ * \name IPV6_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_DA             0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_FLOW_LABEL     1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_HOP_LIMIT      2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_NEXT_HEADER    3
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_PAYLOAD_LENGTH 4
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_SA             5
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_TRAFFIC_CLASS  6
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_VERSION        7
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_FID_COUNT          8
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT \
+    {"DA", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_DA},\
+    {"FLOW_LABEL", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_FLOW_LABEL},\
+    {"HOP_LIMIT", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_HOP_LIMIT},\
+    {"NEXT_HEADER", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_NEXT_HEADER},\
+    {"PAYLOAD_LENGTH", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_PAYLOAD_LENGTH},\
+    {"SA", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_SA},\
+    {"TRAFFIC_CLASS", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_TRAFFIC_CLASS},\
+    {"VERSION", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_VERSION},\
+    {"ipv6_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_FID_COUNT}
+
+/*!
+ * \name L2_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_L2_T_MACDA 0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_L2_T_MACSA 1
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_L2_T_FID_COUNT          2
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_L2_T_FIELD_NAME_MAP_INIT \
+    {"MACDA", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_L2_T_MACDA},\
+    {"MACSA", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_L2_T_MACSA},\
+    {"l2_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_L2_T_FID_COUNT}
+
+/*!
+ * \name MIRROR_ERSPAN_SN_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM 0
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT          1
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT \
+    {"SEQ_NUM", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM},\
+    {"mirror_erspan_sn_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT}
+
+/*!
+ * \name MIRROR_TRANSPORT_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_TRANSPORT_T_DATA 0
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT          1
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT \
+    {"DATA", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_TRANSPORT_T_DATA},\
+    {"mirror_transport_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT}
+
+/*!
+ * \name MPLS_ACH_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_ACH_T_CHANNEL_TYPE 0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_ACH_T_CW_TYPE      1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_ACH_T_RESERVED     2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_ACH_T_VERSION      3
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_ACH_T_FID_COUNT          4
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_ACH_T_FIELD_NAME_MAP_INIT \
+    {"CHANNEL_TYPE", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_ACH_T_CHANNEL_TYPE},\
+    {"CW_TYPE", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_ACH_T_CW_TYPE},\
+    {"RESERVED", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_ACH_T_RESERVED},\
+    {"VERSION", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_ACH_T_VERSION},\
+    {"mpls_ach_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_ACH_T_FID_COUNT}
+
+/*!
+ * \name MPLS_BV_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_BV_T_VALUE 0
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_BV_T_FID_COUNT          1
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_BV_T_FIELD_NAME_MAP_INIT \
+    {"VALUE", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_BV_T_VALUE},\
+    {"mpls_bv_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_BV_T_FID_COUNT}
+
+/*!
+ * \name MPLS_CW_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_CW_T_CW_TYPE    0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_CW_T_RESERVED   1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_CW_T_SEQ_NUMBER 2
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_CW_T_FID_COUNT          3
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_CW_T_FIELD_NAME_MAP_INIT \
+    {"CW_TYPE", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_CW_T_CW_TYPE},\
+    {"RESERVED", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_CW_T_RESERVED},\
+    {"SEQ_NUMBER", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_CW_T_SEQ_NUMBER},\
+    {"mpls_cw_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_CW_T_FID_COUNT}
+
+/*!
+ * \name MPLS_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_T_BOS   0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_T_EXP   1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_T_LABEL 2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_T_TTL   3
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_T_FID_COUNT          4
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_T_FIELD_NAME_MAP_INIT \
+    {"BOS", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_T_BOS},\
+    {"EXP", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_T_EXP},\
+    {"LABEL", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_T_LABEL},\
+    {"TTL", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_T_TTL},\
+    {"mpls_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_T_FID_COUNT}
+
+/*!
+ * \name P_1588_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_CNTRL          0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_CORRECTION     1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_DOMAIN_NB      2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_FLAGS          3
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_LOGMSGINTERVAL 4
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_MSG_LENGTH     5
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_MSG_TYPE       6
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_RESERVED1      7
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_RESERVED2      8
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_RESERVED3      9
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_SEQ_ID         10
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_SRCPORTID      11
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_TRANSPORTSPEC  12
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_VERSION        13
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_FID_COUNT          14
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_FIELD_NAME_MAP_INIT \
+    {"CNTRL", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_CNTRL},\
+    {"CORRECTION", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_CORRECTION},\
+    {"DOMAIN_NB", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_DOMAIN_NB},\
+    {"FLAGS", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_FLAGS},\
+    {"LOGMSGINTERVAL", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_LOGMSGINTERVAL},\
+    {"MSG_LENGTH", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_MSG_LENGTH},\
+    {"MSG_TYPE", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_MSG_TYPE},\
+    {"RESERVED1", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_RESERVED1},\
+    {"RESERVED2", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_RESERVED2},\
+    {"RESERVED3", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_RESERVED3},\
+    {"SEQ_ID", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_SEQ_ID},\
+    {"SRCPORTID", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_SRCPORTID},\
+    {"TRANSPORTSPEC", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_TRANSPORTSPEC},\
+    {"VERSION", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_VERSION},\
+    {"p_1588_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_FID_COUNT}
+
+/*!
+ * \name PROG_EXT_HDR_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PROG_EXT_HDR_T_HDR_EXT_LEN 0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PROG_EXT_HDR_T_NEXT_HEADER 1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PROG_EXT_HDR_T_OPTION      2
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT          3
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PROG_EXT_HDR_T_FIELD_NAME_MAP_INIT \
+    {"HDR_EXT_LEN", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PROG_EXT_HDR_T_HDR_EXT_LEN},\
+    {"NEXT_HEADER", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PROG_EXT_HDR_T_NEXT_HEADER},\
+    {"OPTION", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PROG_EXT_HDR_T_OPTION},\
+    {"prog_ext_hdr_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_0_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T_FLOWSET        0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T_LENGTH         1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T_NEXT_HOP_INDEX 2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T_OBS_TIME_NS    3
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T_OBS_TIME_S     4
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T_TEMPLATE_ID    5
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T_FID_COUNT          6
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T_FIELD_NAME_MAP_INIT \
+    {"FLOWSET", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T_FLOWSET},\
+    {"LENGTH", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T_LENGTH},\
+    {"NEXT_HOP_INDEX", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T_NEXT_HOP_INDEX},\
+    {"OBS_TIME_NS", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T_OBS_TIME_NS},\
+    {"OBS_TIME_S", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T_OBS_TIME_S},\
+    {"TEMPLATE_ID", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T_TEMPLATE_ID},\
+    {"psamp_0_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_1_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_DLB_ID         0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_EGRESS_PORT    1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_EPOCH          2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_INGRESS_PORT   3
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_SAMPLED_LENGTH 4
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_USER_META_DATA 5
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_VARIABLE_FLAG  6
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_FID_COUNT          7
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_FIELD_NAME_MAP_INIT \
+    {"DLB_ID", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_DLB_ID},\
+    {"EGRESS_PORT", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_EGRESS_PORT},\
+    {"EPOCH", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_EPOCH},\
+    {"INGRESS_PORT", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_INGRESS_PORT},\
+    {"SAMPLED_LENGTH", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_SAMPLED_LENGTH},\
+    {"USER_META_DATA", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_USER_META_DATA},\
+    {"VARIABLE_FLAG", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_VARIABLE_FLAG},\
+    {"psamp_1_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_MIRROR_ON_DROP_0_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT 0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT    1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH          2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS     3
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S      4
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID       5
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID     6
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT          7
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT \
+    {"EGRESS_MOD_PORT", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT},\
+    {"INGRESS_PORT", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT},\
+    {"LENGTH", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH},\
+    {"OBS_TIME_NS", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS},\
+    {"OBS_TIME_S", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S},\
+    {"SWITCH_ID", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID},\
+    {"TEMPLATE_ID", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID},\
+    {"psamp_mirror_on_drop_0_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_MIRROR_ON_DROP_3_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_DROP_REASON             0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_RESERVED_0              1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SAMPLED_LENGTH          2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SMOD_STATE              3
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_UC_COS__COLOR__PROB_IDX 4
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_USER_META_DATA          5
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_VAR_LEN_INDICATOR       6
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT          7
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FIELD_NAME_MAP_INIT \
+    {"DROP_REASON", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_DROP_REASON},\
+    {"RESERVED_0", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_RESERVED_0},\
+    {"SAMPLED_LENGTH", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SAMPLED_LENGTH},\
+    {"SMOD_STATE", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SMOD_STATE},\
+    {"UC_COS__COLOR__PROB_IDX", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_UC_COS__COLOR__PROB_IDX},\
+    {"USER_META_DATA", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_USER_META_DATA},\
+    {"VAR_LEN_INDICATOR", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_VAR_LEN_INDICATOR},\
+    {"psamp_mirror_on_drop_3_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT}
+
+/*!
+ * \name RARP_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_HARDWARE_LEN  0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_HARDWARE_TYPE 1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_OPERATION     2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_PROT_ADDR_LEN 3
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_PROTOCOL_TYPE 4
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_SENDER_HA     5
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_SENDER_IP     6
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_TARGET_HA     7
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_TARGET_IP     8
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_FID_COUNT          9
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT \
+    {"HARDWARE_LEN", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_HARDWARE_LEN},\
+    {"HARDWARE_TYPE", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_HARDWARE_TYPE},\
+    {"OPERATION", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_OPERATION},\
+    {"PROT_ADDR_LEN", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_PROT_ADDR_LEN},\
+    {"PROTOCOL_TYPE", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_PROTOCOL_TYPE},\
+    {"SENDER_HA", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_SENDER_HA},\
+    {"SENDER_IP", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_SENDER_IP},\
+    {"TARGET_HA", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_TARGET_HA},\
+    {"TARGET_IP", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_TARGET_IP},\
+    {"rarp_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_FID_COUNT}
+
+/*!
+ * \name ROUTING_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ROUTING_T_DATA          0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ROUTING_T_HDR_EXT_LEN   1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ROUTING_T_NEXT_HEADER   2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ROUTING_T_ROUTING_TYPE  3
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ROUTING_T_SEGMENTS_LEFT 4
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ROUTING_T_FID_COUNT          5
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ROUTING_T_FIELD_NAME_MAP_INIT \
+    {"DATA", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ROUTING_T_DATA},\
+    {"HDR_EXT_LEN", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ROUTING_T_HDR_EXT_LEN},\
+    {"NEXT_HEADER", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ROUTING_T_NEXT_HEADER},\
+    {"ROUTING_TYPE", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ROUTING_T_ROUTING_TYPE},\
+    {"SEGMENTS_LEFT", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ROUTING_T_SEGMENTS_LEFT},\
+    {"routing_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ROUTING_T_FID_COUNT}
+
+/*!
+ * \name RSPAN_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RSPAN_T_TAG  0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RSPAN_T_TPID 1
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RSPAN_T_FID_COUNT          2
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RSPAN_T_FIELD_NAME_MAP_INIT \
+    {"TAG", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RSPAN_T_TAG},\
+    {"TPID", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RSPAN_T_TPID},\
+    {"rspan_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RSPAN_T_FID_COUNT}
+
+/*!
+ * \name SFLOW_SHIM_0_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_0_T_SYS_DESTINATION 0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_0_T_SYS_SOURCE      1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_0_T_VERSION         2
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT          3
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_0_T_FIELD_NAME_MAP_INIT \
+    {"SYS_DESTINATION", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_0_T_SYS_DESTINATION},\
+    {"SYS_SOURCE", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_0_T_SYS_SOURCE},\
+    {"VERSION", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_0_T_VERSION},\
+    {"sflow_shim_0_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT}
+
+/*!
+ * \name SFLOW_SHIM_1_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DEST_SAMPLE 0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DISCARDED   1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_FLEX_SAMPLE 2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_MCAST       3
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_SRC_SAMPLE  4
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_TRUNCATED   5
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_RESERVED         6
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_SYS_OPCODE       7
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT          8
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_FIELD_NAME_MAP_INIT \
+    {"FLAG_DEST_SAMPLE", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DEST_SAMPLE},\
+    {"FLAG_DISCARDED", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DISCARDED},\
+    {"FLAG_FLEX_SAMPLE", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_FLEX_SAMPLE},\
+    {"FLAG_MCAST", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_MCAST},\
+    {"FLAG_SRC_SAMPLE", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_SRC_SAMPLE},\
+    {"FLAG_TRUNCATED", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_TRUNCATED},\
+    {"RESERVED", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_RESERVED},\
+    {"SYS_OPCODE", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_SYS_OPCODE},\
+    {"sflow_shim_1_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT}
+
+/*!
+ * \name SFLOW_SHIM_2_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_2_T_SEQUENCE_NUM   0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_2_T_USER_META_DATA 1
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT          2
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_2_T_FIELD_NAME_MAP_INIT \
+    {"SEQUENCE_NUM", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_2_T_SEQUENCE_NUM},\
+    {"USER_META_DATA", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_2_T_USER_META_DATA},\
+    {"sflow_shim_2_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT}
+
+/*!
+ * \name SNAP_LLC_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SNAP_LLC_T_LENGTH   0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SNAP_LLC_T_SNAP_LLC 1
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SNAP_LLC_T_FID_COUNT          2
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SNAP_LLC_T_FIELD_NAME_MAP_INIT \
+    {"LENGTH", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SNAP_LLC_T_LENGTH},\
+    {"SNAP_LLC", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SNAP_LLC_T_SNAP_LLC},\
+    {"snap_llc_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SNAP_LLC_T_FID_COUNT}
+
+/*!
+ * \name TCP_FIRST_4BYTES_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT 0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT 1
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT          2
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT \
+    {"DST_PORT", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT},\
+    {"SRC_PORT", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT},\
+    {"tcp_first_4bytes_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT}
+
+/*!
+ * \name TCP_LAST_16BYTES_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM           0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM          1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS 2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM           3
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR        4
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE          5
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT          6
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT \
+    {"ACK_NUM", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM},\
+    {"CHECKSUM", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM},\
+    {"HDR_LEN_AND_FLAGS", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS},\
+    {"SEQ_NUM", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM},\
+    {"URGENT_PTR", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR},\
+    {"WIN_SIZE", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE},\
+    {"tcp_last_16bytes_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT}
+
+/*!
+ * \name UDP_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UDP_T_CHECKSUM   0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UDP_T_DST_PORT   1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UDP_T_SRC_PORT   2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UDP_T_UDP_LENGTH 3
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UDP_T_FID_COUNT          4
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT \
+    {"CHECKSUM", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UDP_T_CHECKSUM},\
+    {"DST_PORT", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UDP_T_DST_PORT},\
+    {"SRC_PORT", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UDP_T_SRC_PORT},\
+    {"UDP_LENGTH", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UDP_T_UDP_LENGTH},\
+    {"udp_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UDP_T_FID_COUNT}
+
+/*!
+ * \name UNKNOWN_L3_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD 0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD  1
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT          2
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT \
+    {"FIRST_16BYTES_OF_L3_PAYLOAD", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD},\
+    {"NEXT_16BYTES_OF_L3_PAYLOAD", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD},\
+    {"unknown_l3_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT}
+
+/*!
+ * \name UNKNOWN_L4_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD 0
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT          1
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT \
+    {"FIRST_4BYTES_OF_L4_PAYLOAD", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD},\
+    {"unknown_l4_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT}
+
+/*!
+ * \name UNKNOWN_L5_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1 0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3 1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7 2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_8_9 3
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT          4
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT \
+    {"L5_BYTES_0_1", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1},\
+    {"L5_BYTES_2_3", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3},\
+    {"L5_BYTES_4_7", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7},\
+    {"L5_BYTES_8_9", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_8_9},\
+    {"unknown_l5_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT}
+
+/*!
+ * \name VLAN_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_VLAN_T_CFI  0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_VLAN_T_PCP  1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_VLAN_T_TPID 2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_VLAN_T_VID  3
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_VLAN_T_FID_COUNT          4
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT \
+    {"CFI", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_VLAN_T_CFI},\
+    {"PCP", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_VLAN_T_PCP},\
+    {"TPID", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_VLAN_T_TPID},\
+    {"VID", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_VLAN_T_VID},\
+    {"vlan_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_VLAN_T_FID_COUNT}
+
+/*!
+ * \name VXLAN_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_VXLAN_T_FLAGS_RESERVED_1 0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_VXLAN_T_RESERVED2        1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_VXLAN_T_VN_ID            2
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_VXLAN_T_FID_COUNT          3
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT \
+    {"FLAGS_RESERVED_1", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_VXLAN_T_FLAGS_RESERVED_1},\
+    {"RESERVED2", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_VXLAN_T_RESERVED2},\
+    {"VN_ID", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_VXLAN_T_VN_ID},\
+    {"vxlan_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_VXLAN_T_FID_COUNT}
+
+/*!
+ * \name WESP_T field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_FLAGS       0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_HEADER_LEN  1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_NEXT_HEADER 2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_SEQ_NUM     3
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_SPI         4
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_TRAILER_LEN 5
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_WESP_IV     6
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_FID_COUNT          7
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_FIELD_NAME_MAP_INIT \
+    {"FLAGS", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_FLAGS},\
+    {"HEADER_LEN", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_HEADER_LEN},\
+    {"NEXT_HEADER", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_NEXT_HEADER},\
+    {"SEQ_NUM", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_SEQ_NUM},\
+    {"SPI", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_SPI},\
+    {"TRAILER_LEN", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_TRAILER_LEN},\
+    {"WESP_IV", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_WESP_IV},\
+    {"wesp_t fid count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_FID_COUNT}
+
+
+#endif /* BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_FLEXHDR_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_bcmpkt_rxpmd_flex_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_bcmpkt_rxpmd_flex_data.h
new file mode 100644
index 000000000000..fbd785188683
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_bcmpkt_rxpmd_flex_data.h
@@ -0,0 +1,187 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) map.yml.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_DATA_H
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_DATA_H
+
+/*!
+ * \name RX flex metadata field IDs.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_DLB_ECMP_DESTINATION_15_0                      0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_DNAT_CTRL_3_0                                  1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0                                 2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_DVP_15_0                                       3
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_AND_SNAT_CTRL_15_0               4
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_EM_FT_OPAQUE_OBJ_OR_IFP_OPAQUE_OBJ_15_0        5
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_HIGH_3_0                         6
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0                         7
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_EP_NIH_DROP_CODE_OR_IFP_OPAQUE_OBJ_15_0        8
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_RECIRC_CODE_3_0                     9
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_15_0                      10
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_31_16                     11
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_15_0                        12
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_16                       13
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32                       14
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0                              15
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_IFP_IOAM_GBP_ACTION_3_0                        16
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_IFP_TS_CONTROL_ACTION_3_0                      17
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_15_0                             18
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_16                            19
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_INGRESS_DEVICE_PORT_6_0                        20
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0 21
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0                    22
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_INT_PRI_3_0                                    23
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_L2_IIF_11_0                                    24
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_L2_OIF_11_0                                    25
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_L3_DNAT_INDEX_15_0                             26
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_L3_IIF_13_0                                    27
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0                                  28
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_L3_SNAT_INDEX_15_0                             29
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_MPLS_LABEL_DECAP_COUNT_3_0                     30
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0              31
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_15_0                              32
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0                            33
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0                            34
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_SVP_15_0                                       35
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0                   36
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_SVTAG_SC_INDEX_STR_ALLOW_NAT_3_0               37
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0                        38
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0                              39
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_SYSTEM_SOURCE_15_0                             40
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_TIMESTAMP_CTRL_3_0                             41
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0                42
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_VFI_15_0                                       43
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_VLAN_TAG_PRESERVE_CTRL_SVP_MIRROR_ENABLE_3_0   44
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_FID_COUNT                       45
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_COUNT                    48
+
+/*!
+ * \name Packet Flex Reason Types.
+ */
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE                         0
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS                               1
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DEFAULT                                 2
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED 3
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED                    4
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED  5
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED                     6
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP                                  7
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT                                   8
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT_HPAE_MISS                         9
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_IFP                                     10
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER                               11
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED      12
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT                                   13
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP                           14
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS                      15
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE                      16
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP                           17
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS                      18
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR                            19
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF                        20
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR                            21
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL                        22
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD                    23
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0                      24
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1                      25
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2                      26
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3                      27
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4                      28
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5                      29
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6                      30
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7                      31
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD            32
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED              33
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED                  34
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU                    35
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU                          36
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED              37
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT                            38
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP                                39
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD         40
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_SRV6                                    41
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_SVP                                     42
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP                               43
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU                44
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR                     45
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED                       46
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_VFP                                     47
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT \
+    {"CB_STATION_MOVE", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE},\
+    {"CML_FLAGS", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS},\
+    {"DEFAULT", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DEFAULT},\
+    {"DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED},\
+    {"DLB_ECMP_PKT_SAMPLED", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED},\
+    {"DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED},\
+    {"DLB_LAG_PKT_SAMPLED", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED},\
+    {"DST_FP", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP},\
+    {"EM_FT", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT},\
+    {"EM_FT_HPAE_MISS", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT_HPAE_MISS},\
+    {"IFP", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_IFP},\
+    {"IFP_METER", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER},\
+    {"IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED},\
+    {"IVXLT", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT},\
+    {"L2_DST_LOOKUP", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP},\
+    {"L2_DST_LOOKUP_MISS", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS},\
+    {"L2_SRC_STATIC_MOVE", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE},\
+    {"L3_DST_LOOKUP", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP},\
+    {"L3_DST_LOOKUP_MISS", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS},\
+    {"L3_HDR_ERROR", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR},\
+    {"L3_IIF_EQ_L3_OIF", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF},\
+    {"L3_TTL_ERROR", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR},\
+    {"LEARN_CACHE_FULL", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL},\
+    {"MACSA_MULTICAST_RSVD", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD},\
+    {"MATCHED_RULE_BIT_0", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0},\
+    {"MATCHED_RULE_BIT_1", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1},\
+    {"MATCHED_RULE_BIT_2", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2},\
+    {"MATCHED_RULE_BIT_3", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3},\
+    {"MATCHED_RULE_BIT_4", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4},\
+    {"MATCHED_RULE_BIT_5", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5},\
+    {"MATCHED_RULE_BIT_6", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6},\
+    {"MATCHED_RULE_BIT_7", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7},\
+    {"MEMBERSHIP_CHECK_FAILED_RSVD", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD},\
+    {"MIRROR_SAMPLER_EGR_SAMPLED", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED},\
+    {"MIRROR_SAMPLER_SAMPLED", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED},\
+    {"MPLS_CTRL_PKT_TO_CPU", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU},\
+    {"NO_COPY_TO_CPU", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU},\
+    {"PKT_INTEGRITY_CHECK_FAILED", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED},\
+    {"PROTOCOL_PKT", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT},\
+    {"SER_DROP", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP},\
+    {"SPANNING_TREE_CHECK_FAILED_RSVD", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD},\
+    {"SRV6", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_SRV6},\
+    {"SVP", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_SVP},\
+    {"TRACE_DOP", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP},\
+    {"TRACE_DO_NOT_COPY_TO_CPU", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU},\
+    {"TRACE_DO_NOT_MIRROR", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR},\
+    {"URPF_CHECK_FAILED", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED},\
+    {"VFP", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_VFP},\
+    {"flex reason count", BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_COUNT}
+
+#endif /* BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_bcmpkt_rxpmd_match_id_defs.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_bcmpkt_rxpmd_match_id_defs.h
new file mode 100644
index 000000000000..09bd86c3c1d8
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_bcmpkt_rxpmd_match_id_defs.h
@@ -0,0 +1,503 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) bcm56690_a0_dna_6_5_31_7_0_sf_match_id_info.yml
+ * for device bcm56690_a0 and variant dna_6_5_31_7_0.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H
+
+#include <bcmpkt/bcmpkt_rxpmd_match_id.h>
+
+/*!
+ * \brief Get the Match ID DataBase information.
+ *
+ * \retval bcmpkt_rxpmd_match_id_db_info_t Match ID DataBase information.
+*/
+extern bcmpkt_rxpmd_match_id_db_info_t *
+    bcm56690_a0_dna_6_5_31_7_0_rxpmd_match_id_db_info_get(void);
+
+/*!
+ * \brief Get the Match ID Mapping information.
+ *
+ * \retval bcmpkt_rxpmd_match_id_map_info_t Match ID Mapping information.
+*/
+extern bcmpkt_rxpmd_match_id_map_info_t *
+    bcm56690_a0_dna_6_5_31_7_0_rxpmd_match_id_map_info_get(void);
+
+/*!
+  \name RXPMD Match IDs
+*/
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_CNTAG  0
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_GBP_ETHERNET_SHIM  1
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_BASE  2
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0  3
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG  4
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2  5
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE  6
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG  7
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC  8
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP  9
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1  10
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2  11
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD  12
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_1  13
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_2  14
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT  15
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE  16
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1  17
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2  18
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE  19
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE  20
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM  21
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY  22
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT  23
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ  24
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_1  25
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_2  26
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP  27
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_HEADER  28
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA_BASE  29
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP  30
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IOAM_E2E  31
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4  32
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6  33
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0  34
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1  35
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2  36
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3  37
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4  38
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5  39
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6  40
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH  41
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW  42
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE  43
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588  44
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_1  45
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_2  46
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP  47
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_1  48
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_2  49
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES  50
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES  51
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP  52
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3  53
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4  54
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5  55
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN  56
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_1  57
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_2  58
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH  59
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK  60
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE  61
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_CNTAG  62
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_GBP_ETHERNET_SHIM  63
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE  64
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0  65
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG  66
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2  67
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE  68
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG  69
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC  70
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP  71
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1  72
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2  73
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD  74
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_1  75
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_2  76
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT  77
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE  78
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1  79
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2  80
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE  81
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE  82
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM  83
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY  84
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT  85
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ  86
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_1  87
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_2  88
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP  89
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_HEADER  90
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA_BASE  91
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP  92
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IOAM_E2E  93
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4  94
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6  95
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0  96
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1  97
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2  98
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3  99
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4  100
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5  101
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6  102
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH  103
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW  104
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE  105
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588  106
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_1  107
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_2  108
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP  109
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_1  110
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_2  111
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES  112
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES  113
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP  114
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3  115
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4  116
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5  117
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN  118
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_1  119
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_2  120
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_CNTAG  121
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG  122
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2  123
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE  124
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG  125
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC  126
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP  127
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1  128
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2  129
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD  130
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_1  131
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_2  132
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT  133
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE  134
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1  135
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2  136
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_1  137
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_2  138
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP  139
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_HEADER  140
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA_BASE  141
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP  142
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4  143
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6  144
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE  145
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588  146
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_1  147
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_2  148
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP  149
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_1  150
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_2  151
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES  152
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES  153
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP  154
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3  155
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4  156
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5  157
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_1  158
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_2  159
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_CNTAG  160
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_GBP_ETHERNET_SHIM  161
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_BASE  162
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0  163
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG  164
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2  165
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE  166
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG  167
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC  168
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP  169
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1  170
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2  171
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD  172
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_1  173
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_2  174
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT  175
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE  176
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1  177
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2  178
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE  179
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE  180
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM  181
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY  182
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT  183
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ  184
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_1  185
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_2  186
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP  187
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_HEADER  188
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA_BASE  189
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP  190
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IOAM_E2E  191
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4  192
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6  193
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0  194
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1  195
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2  196
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3  197
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4  198
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5  199
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6  200
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH  201
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW  202
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE  203
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588  204
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_1  205
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_2  206
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP  207
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_1  208
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_2  209
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES  210
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES  211
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP  212
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3  213
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4  214
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5  215
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN  216
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_1  217
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_2  218
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH  219
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK  220
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE  221
+#define BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_COUNT  222
+
+#define BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT \
+    {"EGRESS_PKT_FWD_L2_HDR_CNTAG", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_CNTAG}, \
+    {"EGRESS_PKT_FWD_L2_HDR_GBP_ETHERNET_SHIM", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_GBP_ETHERNET_SHIM}, \
+    {"EGRESS_PKT_FWD_L2_HDR_HG3_BASE", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_BASE}, \
+    {"EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0}, \
+    {"EGRESS_PKT_FWD_L2_HDR_ITAG", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG}, \
+    {"EGRESS_PKT_FWD_L2_HDR_L2", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2}, \
+    {"EGRESS_PKT_FWD_L2_HDR_NONE", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE}, \
+    {"EGRESS_PKT_FWD_L2_HDR_OTAG", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG}, \
+    {"EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ARP", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_BFD", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_1", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_2", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_2}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GPE", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_1", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_2", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_2}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ICMP", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IFA_HEADER", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_HEADER}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA_BASE", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA_BASE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IGMP", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IOAM_E2E", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IOAM_E2E}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV4", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV6", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS0", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS1", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS2", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS3", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS4", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS5", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS6", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_NONE", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_P_1588", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_1", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_2", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_2}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_RARP", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_1", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_2", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_2}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UDP", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_VXLAN", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_1", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_2", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_2}, \
+    {"EGRESS_PKT_SYS_HDR_EP_NIH", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH}, \
+    {"EGRESS_PKT_SYS_HDR_LOOPBACK", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK}, \
+    {"EGRESS_PKT_SYS_HDR_NONE", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_CNTAG", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_CNTAG}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_GBP_ETHERNET_SHIM", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_GBP_ETHERNET_SHIM}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_ITAG", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_L2", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_NONE", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_OTAG", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_1", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_2", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_2}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_1", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_2", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_2}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_HEADER", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_HEADER}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA_BASE", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA_BASE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IOAM_E2E", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IOAM_E2E}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_1", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_2", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_2}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_1", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_2", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_2}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_1", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_2", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_2}, \
+    {"INGRESS_PKT_INNER_L2_HDR_CNTAG", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_CNTAG}, \
+    {"INGRESS_PKT_INNER_L2_HDR_ITAG", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG}, \
+    {"INGRESS_PKT_INNER_L2_HDR_L2", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2}, \
+    {"INGRESS_PKT_INNER_L2_HDR_NONE", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE}, \
+    {"INGRESS_PKT_INNER_L2_HDR_OTAG", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG}, \
+    {"INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ARP", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_BFD", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_1", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_1}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_2", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_2}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_1", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_1}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_2", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_2}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ICMP", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_IFA_HEADER", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_HEADER}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA_BASE", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA_BASE}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_IGMP", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV4", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV6", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_NONE", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_P_1588", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_1", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_1}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_2", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_2}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_RARP", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_1", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_1}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_2", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_2}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UDP", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_1", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_1}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_2", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_2}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_CNTAG", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_CNTAG}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_GBP_ETHERNET_SHIM", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_GBP_ETHERNET_SHIM}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_HG3_BASE", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_BASE}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_ITAG", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_L2", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_NONE", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_OTAG", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ARP", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_BFD", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_1", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_2", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_2}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GPE", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_1", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_2", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_2}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ICMP", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IFA_HEADER", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_HEADER}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA_BASE", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA_BASE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IGMP", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IOAM_E2E", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IOAM_E2E}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV4", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV6", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_NONE", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_P_1588", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_1", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_2", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_2}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_RARP", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_1", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_2", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_2}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UDP", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_1", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_2", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_2}, \
+    {"INGRESS_PKT_SYS_HDR_EP_NIH", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH}, \
+    {"INGRESS_PKT_SYS_HDR_LOOPBACK", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK}, \
+    {"INGRESS_PKT_SYS_HDR_NONE", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE}, \
+    {"rxpmd_match_id_count", BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_COUNT}
+
+#endif /*! BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_bcmpkt_flexhdr.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_bcmpkt_flexhdr.h
deleted file mode 100644
index b8df0d5c6ae4..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_bcmpkt_flexhdr.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) header.yml.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_FLEXHDR_H
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_FLEXHDR_H
-
-#include <bcmpkt/bcmpkt_flexhdr_internal.h>
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T                      0
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T         1
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T         2
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T            3
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T        4
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T         5
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ETHERTYPE_T                6
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T         7
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ICMP_T                     8
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPFIX_T                    9
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T                     10
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T                     11
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_L2_T                       12
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_ERSPAN_SN_T         13
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_TRANSPORT_T         14
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T   15
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T   16
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T   17
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T                     18
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T         19
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T         20
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UDP_T                      21
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T               22
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L4_T               23
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T               24
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_VLAN_T                     25
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_VXLAN_T                    26
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_T               27
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_FLEXHDR_COUNT    28
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_FLEXHDR_NAME_MAP_INIT \
-    {"arp_t", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T},\
-    {"cpu_composites_0_t", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T},\
-    {"cpu_composites_1_t", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T},\
-    {"ep_nih_header_t", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T},\
-    {"erspan3_fixed_hdr_t", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T},\
-    {"erspan3_subhdr_5_t", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T},\
-    {"ethertype_t", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ETHERTYPE_T},\
-    {"generic_loopback_t", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T},\
-    {"icmp_t", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ICMP_T},\
-    {"ipfix_t", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPFIX_T},\
-    {"ipv4_t", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T},\
-    {"ipv6_t", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T},\
-    {"l2_t", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_L2_T},\
-    {"mirror_erspan_sn_t", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_ERSPAN_SN_T},\
-    {"mirror_transport_t", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_TRANSPORT_T},\
-    {"psamp_mirror_on_drop_0_t", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T},\
-    {"psamp_mirror_on_drop_1_t", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T},\
-    {"psamp_mirror_on_drop_2_t", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T},\
-    {"rarp_t", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T},\
-    {"tcp_first_4bytes_t", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T},\
-    {"tcp_last_16bytes_t", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T},\
-    {"udp_t", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UDP_T},\
-    {"unknown_l3_t", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T},\
-    {"unknown_l4_t", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L4_T},\
-    {"unknown_l5_t", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T},\
-    {"vlan_t", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_VLAN_T},\
-    {"vxlan_t", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_VXLAN_T},\
-    {"RXPMD_FLEX_T", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_T},\
-    {"flexhdr count", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_FLEXHDR_COUNT}
-
-#endif /* BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_FLEXHDR_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_bcmpkt_flexhdr_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_bcmpkt_flexhdr_data.h
deleted file mode 100644
index 965147346b13..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_bcmpkt_flexhdr_data.h
+++ /dev/null
@@ -1,592 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) header.yml.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_FLEXHDR_DATA_H
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_FLEXHDR_DATA_H
-
-/*!
- * \name ARP_T field IDs.
- */
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_HARDWARE_LEN  0
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_HARDWARE_TYPE 1
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_OPERATION     2
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_PROT_ADDR_LEN 3
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_PROTOCOL_TYPE 4
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_SENDER_HA     5
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_SENDER_IP     6
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_TARGET_HA     7
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_TARGET_IP     8
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_FID_COUNT          9
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT \
-    {"HARDWARE_LEN", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_HARDWARE_LEN},\
-    {"HARDWARE_TYPE", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_HARDWARE_TYPE},\
-    {"OPERATION", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_OPERATION},\
-    {"PROT_ADDR_LEN", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_PROT_ADDR_LEN},\
-    {"PROTOCOL_TYPE", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_PROTOCOL_TYPE},\
-    {"SENDER_HA", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_SENDER_HA},\
-    {"SENDER_IP", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_SENDER_IP},\
-    {"TARGET_HA", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_TARGET_HA},\
-    {"TARGET_IP", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_TARGET_IP},\
-    {"arp_t fid count", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_FID_COUNT}
-
-/*!
- * \name CPU_COMPOSITES_0_T field IDs.
- */
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0 0
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1 1
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2 2
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3 3
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4 4
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5 5
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6 6
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT          7
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT \
-    {"DMA_CONT0", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0},\
-    {"DMA_CONT1", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1},\
-    {"DMA_CONT2", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2},\
-    {"DMA_CONT3", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3},\
-    {"DMA_CONT4", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4},\
-    {"DMA_CONT5", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5},\
-    {"DMA_CONT6", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6},\
-    {"cpu_composites_0_t fid count", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT}
-
-/*!
- * \name CPU_COMPOSITES_1_T field IDs.
- */
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10 0
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11 1
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12 2
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13 3
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14 4
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15 5
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16 6
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17 7
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7  8
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8  9
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9  10
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT          11
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT \
-    {"DMA_CONT10", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10},\
-    {"DMA_CONT11", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11},\
-    {"DMA_CONT12", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12},\
-    {"DMA_CONT13", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13},\
-    {"DMA_CONT14", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14},\
-    {"DMA_CONT15", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15},\
-    {"DMA_CONT16", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16},\
-    {"DMA_CONT17", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17},\
-    {"DMA_CONT7", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7},\
-    {"DMA_CONT8", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8},\
-    {"DMA_CONT9", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9},\
-    {"cpu_composites_1_t fid count", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT}
-
-/*!
- * \name EP_NIH_HEADER_T field IDs.
- */
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_HEADER_SUBTYPE       0
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_HEADER_TYPE          1
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_A        2
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_B        3
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_C        4
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_A      5
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_B      6
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_C      7
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_RECIRC_PROFILE_INDEX 8
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_RESERVED_0           9
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_START                10
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_TIMESTAMP            11
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT          12
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_FIELD_NAME_MAP_INIT \
-    {"HEADER_SUBTYPE", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_HEADER_SUBTYPE},\
-    {"HEADER_TYPE", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_HEADER_TYPE},\
-    {"OPAQUE_CTRL_A", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_A},\
-    {"OPAQUE_CTRL_B", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_B},\
-    {"OPAQUE_CTRL_C", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_C},\
-    {"OPAQUE_OBJECT_A", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_A},\
-    {"OPAQUE_OBJECT_B", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_B},\
-    {"OPAQUE_OBJECT_C", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_C},\
-    {"RECIRC_PROFILE_INDEX", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_RECIRC_PROFILE_INDEX},\
-    {"RESERVED_0", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_RESERVED_0},\
-    {"START", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_START},\
-    {"TIMESTAMP", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_TIMESTAMP},\
-    {"ep_nih_header_t fid count", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT}
-
-/*!
- * \name ERSPAN3_FIXED_HDR_T field IDs.
- */
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO               0
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_COS               1
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID           2
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O 3
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID        4
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_T                 5
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP         6
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VER               7
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN              8
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT          9
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT \
-    {"BSO", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO},\
-    {"COS", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_COS},\
-    {"GBP_SID", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID},\
-    {"P_FT_HWID_D_GRA_O", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O},\
-    {"SESSION_ID", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID},\
-    {"T", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_T},\
-    {"TIMESTAMP", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP},\
-    {"VER", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VER},\
-    {"VLAN", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN},\
-    {"erspan3_fixed_hdr_t fid count", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT}
-
-/*!
- * \name ERSPAN3_SUBHDR_5_T field IDs.
- */
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID 0
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID     1
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID   2
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP   3
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT          4
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT \
-    {"PLATFORM_ID", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID},\
-    {"PORT_ID", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID},\
-    {"SWITCH_ID", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID},\
-    {"TIMESTAMP", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP},\
-    {"erspan3_subhdr_5_t fid count", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT}
-
-/*!
- * \name ETHERTYPE_T field IDs.
- */
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ETHERTYPE_T_TYPE 0
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ETHERTYPE_T_FID_COUNT          1
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT \
-    {"TYPE", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ETHERTYPE_T_TYPE},\
-    {"ethertype_t fid count", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ETHERTYPE_T_FID_COUNT}
-
-/*!
- * \name GENERIC_LOOPBACK_T field IDs.
- */
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ    0
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE   1
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ        2
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_FLAGS              3
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE        4
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY     5
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL     6
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ      7
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0  8
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1  9
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ            10
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1         11
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_2         12
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT 13
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE         14
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT          15
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT \
-    {"DESTINATION_OBJ", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ},\
-    {"DESTINATION_TYPE", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE},\
-    {"ENTROPY_OBJ", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ},\
-    {"FLAGS", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_FLAGS},\
-    {"HEADER_TYPE", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE},\
-    {"INPUT_PRIORITY", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY},\
-    {"INTERFACE_CTRL", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL},\
-    {"INTERFACE_OBJ", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ},\
-    {"PROCESSING_CTRL_0", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0},\
-    {"PROCESSING_CTRL_1", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1},\
-    {"QOS_OBJ", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ},\
-    {"RESERVED_1", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1},\
-    {"RESERVED_2", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_2},\
-    {"SOURCE_SYSTEM_PORT", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT},\
-    {"START_BYTE", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE},\
-    {"generic_loopback_t fid count", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT}
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NO_OP       0
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2_OIF      1
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED    2
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__VP          3
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP        4
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NHOP        5
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2MC_GROUP  6
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L3MC_GROUP  7
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED_1  8
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP_MEMBER 9
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__DEVICE_PORT 10
-
-/*!
- * \name ICMP_T field IDs.
- */
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ICMP_T_CHECKSUM  0
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ICMP_T_CODE      1
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ICMP_T_ICMP_TYPE 2
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ICMP_T_FID_COUNT          3
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT \
-    {"CHECKSUM", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ICMP_T_CHECKSUM},\
-    {"CODE", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ICMP_T_CODE},\
-    {"ICMP_TYPE", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ICMP_T_ICMP_TYPE},\
-    {"icmp_t fid count", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ICMP_T_FID_COUNT}
-
-/*!
- * \name IPFIX_T field IDs.
- */
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPFIX_T_EXPORT_TIME   0
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPFIX_T_LENGTH        1
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPFIX_T_OBS_DOMAIN_ID 2
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPFIX_T_SEQUENCE_NUM  3
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPFIX_T_VERSION       4
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPFIX_T_FID_COUNT          5
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT \
-    {"EXPORT_TIME", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPFIX_T_EXPORT_TIME},\
-    {"LENGTH", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPFIX_T_LENGTH},\
-    {"OBS_DOMAIN_ID", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPFIX_T_OBS_DOMAIN_ID},\
-    {"SEQUENCE_NUM", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPFIX_T_SEQUENCE_NUM},\
-    {"VERSION", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPFIX_T_VERSION},\
-    {"ipfix_t fid count", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPFIX_T_FID_COUNT}
-
-/*!
- * \name IPV4_T field IDs.
- */
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_DA                0
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET 1
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_HDR_CHECKSUM      2
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_ID                3
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_OPTION            4
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_PROTOCOL          5
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_SA                6
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_TOS               7
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_TOTAL_LENGTH      8
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_TTL               9
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_VERSION_HDR_LEN   10
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_FID_COUNT          11
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT \
-    {"DA", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_DA},\
-    {"FLAGS_FRAG_OFFSET", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET},\
-    {"HDR_CHECKSUM", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_HDR_CHECKSUM},\
-    {"ID", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_ID},\
-    {"OPTION", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_OPTION},\
-    {"PROTOCOL", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_PROTOCOL},\
-    {"SA", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_SA},\
-    {"TOS", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_TOS},\
-    {"TOTAL_LENGTH", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_TOTAL_LENGTH},\
-    {"TTL", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_TTL},\
-    {"VERSION_HDR_LEN", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_VERSION_HDR_LEN},\
-    {"ipv4_t fid count", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_FID_COUNT}
-
-/*!
- * \name IPV6_T field IDs.
- */
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_DA             0
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_FLOW_LABEL     1
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_HOP_LIMIT      2
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_NEXT_HEADER    3
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_PAYLOAD_LENGTH 4
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_SA             5
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_TRAFFIC_CLASS  6
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_VERSION        7
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_FID_COUNT          8
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT \
-    {"DA", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_DA},\
-    {"FLOW_LABEL", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_FLOW_LABEL},\
-    {"HOP_LIMIT", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_HOP_LIMIT},\
-    {"NEXT_HEADER", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_NEXT_HEADER},\
-    {"PAYLOAD_LENGTH", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_PAYLOAD_LENGTH},\
-    {"SA", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_SA},\
-    {"TRAFFIC_CLASS", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_TRAFFIC_CLASS},\
-    {"VERSION", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_VERSION},\
-    {"ipv6_t fid count", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_FID_COUNT}
-
-/*!
- * \name L2_T field IDs.
- */
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_L2_T_MACDA 0
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_L2_T_MACSA 1
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_L2_T_FID_COUNT          2
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_L2_T_FIELD_NAME_MAP_INIT \
-    {"MACDA", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_L2_T_MACDA},\
-    {"MACSA", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_L2_T_MACSA},\
-    {"l2_t fid count", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_L2_T_FID_COUNT}
-
-/*!
- * \name MIRROR_ERSPAN_SN_T field IDs.
- */
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM 0
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT          1
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT \
-    {"SEQ_NUM", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM},\
-    {"mirror_erspan_sn_t fid count", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT}
-
-/*!
- * \name MIRROR_TRANSPORT_T field IDs.
- */
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_TRANSPORT_T_DATA 0
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT          1
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT \
-    {"DATA", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_TRANSPORT_T_DATA},\
-    {"mirror_transport_t fid count", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT}
-
-/*!
- * \name PSAMP_MIRROR_ON_DROP_0_T field IDs.
- */
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT 0
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT    1
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH          2
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS     3
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S      4
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID       5
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID     6
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT          7
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT \
-    {"EGRESS_MOD_PORT", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT},\
-    {"INGRESS_PORT", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT},\
-    {"LENGTH", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH},\
-    {"OBS_TIME_NS", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS},\
-    {"OBS_TIME_S", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S},\
-    {"SWITCH_ID", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID},\
-    {"TEMPLATE_ID", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID},\
-    {"psamp_mirror_on_drop_0_t fid count", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT}
-
-/*!
- * \name PSAMP_MIRROR_ON_DROP_1_T field IDs.
- */
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_ING_DROP_REASON    0
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_MIRROR_ON_DROP_OBJ 1
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_MMU_DROP_CTRL      2
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_SAMPLED_LENGTH     3
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_USER_META_DATA     4
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_VAR_LEN_INDICATOR  5
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FID_COUNT          6
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FIELD_NAME_MAP_INIT \
-    {"ING_DROP_REASON", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_ING_DROP_REASON},\
-    {"MIRROR_ON_DROP_OBJ", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_MIRROR_ON_DROP_OBJ},\
-    {"MMU_DROP_CTRL", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_MMU_DROP_CTRL},\
-    {"SAMPLED_LENGTH", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_SAMPLED_LENGTH},\
-    {"USER_META_DATA", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_USER_META_DATA},\
-    {"VAR_LEN_INDICATOR", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_VAR_LEN_INDICATOR},\
-    {"psamp_mirror_on_drop_1_t fid count", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FID_COUNT}
-
-/*!
- * \name PSAMP_MIRROR_ON_DROP_2_T field IDs.
- */
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_EGR_DROP_REASON       0
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_EP_COPY_SESSION_INDEX 1
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_RESERVED_0            2
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_SAMPLED_LENGTH        3
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_USER_META_DATA        4
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_VAR_LEN_INDICATOR     5
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_FID_COUNT          6
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_FIELD_NAME_MAP_INIT \
-    {"EGR_DROP_REASON", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_EGR_DROP_REASON},\
-    {"EP_COPY_SESSION_INDEX", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_EP_COPY_SESSION_INDEX},\
-    {"RESERVED_0", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_RESERVED_0},\
-    {"SAMPLED_LENGTH", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_SAMPLED_LENGTH},\
-    {"USER_META_DATA", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_USER_META_DATA},\
-    {"VAR_LEN_INDICATOR", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_VAR_LEN_INDICATOR},\
-    {"psamp_mirror_on_drop_2_t fid count", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_FID_COUNT}
-
-/*!
- * \name RARP_T field IDs.
- */
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_HARDWARE_LEN  0
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_HARDWARE_TYPE 1
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_OPERATION     2
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_PROT_ADDR_LEN 3
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_PROTOCOL_TYPE 4
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_SENDER_HA     5
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_SENDER_IP     6
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_TARGET_HA     7
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_TARGET_IP     8
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_FID_COUNT          9
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT \
-    {"HARDWARE_LEN", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_HARDWARE_LEN},\
-    {"HARDWARE_TYPE", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_HARDWARE_TYPE},\
-    {"OPERATION", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_OPERATION},\
-    {"PROT_ADDR_LEN", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_PROT_ADDR_LEN},\
-    {"PROTOCOL_TYPE", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_PROTOCOL_TYPE},\
-    {"SENDER_HA", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_SENDER_HA},\
-    {"SENDER_IP", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_SENDER_IP},\
-    {"TARGET_HA", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_TARGET_HA},\
-    {"TARGET_IP", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_TARGET_IP},\
-    {"rarp_t fid count", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_FID_COUNT}
-
-/*!
- * \name TCP_FIRST_4BYTES_T field IDs.
- */
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT 0
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT 1
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT          2
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT \
-    {"DST_PORT", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT},\
-    {"SRC_PORT", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT},\
-    {"tcp_first_4bytes_t fid count", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT}
-
-/*!
- * \name TCP_LAST_16BYTES_T field IDs.
- */
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM           0
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM          1
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS 2
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM           3
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR        4
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE          5
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT          6
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT \
-    {"ACK_NUM", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM},\
-    {"CHECKSUM", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM},\
-    {"HDR_LEN_AND_FLAGS", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS},\
-    {"SEQ_NUM", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM},\
-    {"URGENT_PTR", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR},\
-    {"WIN_SIZE", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE},\
-    {"tcp_last_16bytes_t fid count", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT}
-
-/*!
- * \name UDP_T field IDs.
- */
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UDP_T_CHECKSUM   0
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UDP_T_DST_PORT   1
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UDP_T_SRC_PORT   2
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UDP_T_UDP_LENGTH 3
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UDP_T_FID_COUNT          4
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT \
-    {"CHECKSUM", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UDP_T_CHECKSUM},\
-    {"DST_PORT", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UDP_T_DST_PORT},\
-    {"SRC_PORT", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UDP_T_SRC_PORT},\
-    {"UDP_LENGTH", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UDP_T_UDP_LENGTH},\
-    {"udp_t fid count", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UDP_T_FID_COUNT}
-
-/*!
- * \name UNKNOWN_L3_T field IDs.
- */
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD 0
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD  1
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT          2
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT \
-    {"FIRST_16BYTES_OF_L3_PAYLOAD", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD},\
-    {"NEXT_16BYTES_OF_L3_PAYLOAD", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD},\
-    {"unknown_l3_t fid count", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT}
-
-/*!
- * \name UNKNOWN_L4_T field IDs.
- */
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD 0
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT          1
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT \
-    {"FIRST_4BYTES_OF_L4_PAYLOAD", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD},\
-    {"unknown_l4_t fid count", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT}
-
-/*!
- * \name UNKNOWN_L5_T field IDs.
- */
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1 0
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3 1
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7 2
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT          3
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT \
-    {"L5_BYTES_0_1", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1},\
-    {"L5_BYTES_2_3", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3},\
-    {"L5_BYTES_4_7", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7},\
-    {"unknown_l5_t fid count", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT}
-
-/*!
- * \name VLAN_T field IDs.
- */
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_VLAN_T_CFI  0
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_VLAN_T_PCP  1
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_VLAN_T_TPID 2
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_VLAN_T_VID  3
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_VLAN_T_FID_COUNT          4
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT \
-    {"CFI", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_VLAN_T_CFI},\
-    {"PCP", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_VLAN_T_PCP},\
-    {"TPID", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_VLAN_T_TPID},\
-    {"VID", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_VLAN_T_VID},\
-    {"vlan_t fid count", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_VLAN_T_FID_COUNT}
-
-/*!
- * \name VXLAN_T field IDs.
- */
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_VXLAN_T_FLAGS_RESERVED_1 0
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_VXLAN_T_RESERVED2        1
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_VXLAN_T_VN_ID            2
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_VXLAN_T_FID_COUNT          3
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT \
-    {"FLAGS_RESERVED_1", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_VXLAN_T_FLAGS_RESERVED_1},\
-    {"RESERVED2", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_VXLAN_T_RESERVED2},\
-    {"VN_ID", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_VXLAN_T_VN_ID},\
-    {"vxlan_t fid count", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_VXLAN_T_FID_COUNT}
-
-
-#endif /* BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_FLEXHDR_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_bcmpkt_rxpmd_flex_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_bcmpkt_rxpmd_flex_data.h
deleted file mode 100644
index 4754761fedf3..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_bcmpkt_rxpmd_flex_data.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) map.yml.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_DATA_H
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_DATA_H
-
-/*!
- * \name RX flex metadata field IDs.
- */
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0                                 0
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_DVP_15_0                                       1
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_7_0                              2
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_HIGH_3_0                         3
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0                         4
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_DROP_CODE_15_0                      5
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_RECIRC_CODE_3_0                     6
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_15_0                      7
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_31_16                     8
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_ERSPAN3_GBP_SID_15_0                           9
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_15_0                        10
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_16                       11
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32                       12
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0                              13
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_15_0                             14
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_16                            15
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_INGRESS_PP_PORT_7_0                            16
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0 17
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0                    18
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_INT_PRI_3_0                                    19
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_L2_IIF_10_0                                    20
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_L2_OIF_10_0                                    21
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_L2_TUNNEL_SVP_15_0                             22
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_L3_IIF_13_0                                    23
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0                                  24
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_14_0              25
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_14_0                              26
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0                            27
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0                            28
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0                   29
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0                        30
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0                              31
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_SYSTEM_SOURCE_15_0                             32
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_TAG_ACTION_CTRL_1_0                            33
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0                34
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_VFI_15_0                                       35
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_FID_COUNT                       36
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_COUNT                    21
-
-/*!
- * \name Packet Flex Reason Types.
- */
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS                  0
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IFP                        1
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER                  2
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT                      3
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP              4
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS         5
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_DISCARD             6
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE         7
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP              8
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS         9
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR               10
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR               11
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL           12
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST            13
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED    14
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU             15
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED 16
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT               17
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED 18
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP                  19
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_VFP                        20
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT \
-    {"CML_FLAGS", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS},\
-    {"IFP", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IFP},\
-    {"IFP_METER", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER},\
-    {"IVXLT", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT},\
-    {"L2_DST_LOOKUP", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP},\
-    {"L2_DST_LOOKUP_MISS", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS},\
-    {"L2_SRC_DISCARD", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_DISCARD},\
-    {"L2_SRC_STATIC_MOVE", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE},\
-    {"L3_DST_LOOKUP", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP},\
-    {"L3_DST_LOOKUP_MISS", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS},\
-    {"L3_HDR_ERROR", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR},\
-    {"L3_TTL_ERROR", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR},\
-    {"LEARN_CACHE_FULL", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL},\
-    {"MACSA_MULTICAST", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST},\
-    {"MEMBERSHIP_CHECK_FAILED", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED},\
-    {"NO_COPY_TO_CPU", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU},\
-    {"PKT_INTEGRITY_CHECK_FAILED", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED},\
-    {"PROTOCOL_PKT", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT},\
-    {"SPANNING_TREE_CHECK_FAILED", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED},\
-    {"TRACE_DOP", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP},\
-    {"VFP", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_VFP},\
-    {"flex reason count", BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_COUNT}
-
-#endif /* BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_bcmpkt_rxpmd_match_id_defs.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_bcmpkt_rxpmd_match_id_defs.h
deleted file mode 100644
index 7b58853c3853..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_bcmpkt_rxpmd_match_id_defs.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) bcm56780_a0_cna_6_5_30_2_0_sf_match_id_info.yml
- * for device bcm56780_a0 and variant cna_6_5_30_2_0.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H
-
-#include <bcmpkt/bcmpkt_rxpmd_match_id.h>
-
-/*!
- * \brief Get the Match ID DataBase information.
- *
- * \retval bcmpkt_rxpmd_match_id_db_info_t Match ID DataBase information.
-*/
-extern bcmpkt_rxpmd_match_id_db_info_t *
-    bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db_info_get(void);
-
-/*!
- * \brief Get the Match ID Mapping information.
- *
- * \retval bcmpkt_rxpmd_match_id_map_info_t Match ID Mapping information.
-*/
-extern bcmpkt_rxpmd_match_id_map_info_t *
-    bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_map_info_get(void);
-
-/*!
-  \name RXPMD Match IDs
-*/
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG  0
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2  1
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE  2
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG  3
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP  4
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE  5
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP  6
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4  7
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6  8
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE  9
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP  10
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES  11
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES  12
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP  13
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3  14
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4  15
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5  16
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN  17
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH  18
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK  19
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE  20
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG  21
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2  22
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE  23
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG  24
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP  25
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE  26
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP  27
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4  28
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6  29
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE  30
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP  31
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES  32
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES  33
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP  34
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3  35
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4  36
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5  37
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN  38
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG  39
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2  40
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE  41
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG  42
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP  43
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE  44
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP  45
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4  46
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6  47
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE  48
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP  49
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES  50
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES  51
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP  52
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3  53
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4  54
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5  55
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG  56
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2  57
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE  58
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG  59
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP  60
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE  61
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP  62
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4  63
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6  64
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE  65
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP  66
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES  67
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES  68
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP  69
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3  70
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4  71
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5  72
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN  73
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH  74
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK  75
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE  76
-#define BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_COUNT  77
-
-#define BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT \
-    {"EGRESS_PKT_FWD_L2_HDR_ITAG", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG}, \
-    {"EGRESS_PKT_FWD_L2_HDR_L2", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2}, \
-    {"EGRESS_PKT_FWD_L2_HDR_NONE", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE}, \
-    {"EGRESS_PKT_FWD_L2_HDR_OTAG", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ARP", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ICMP", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV4", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV6", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_NONE", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_RARP", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UDP", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_VXLAN", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN}, \
-    {"EGRESS_PKT_SYS_HDR_EP_NIH", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH}, \
-    {"EGRESS_PKT_SYS_HDR_LOOPBACK", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK}, \
-    {"EGRESS_PKT_SYS_HDR_NONE", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_ITAG", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_L2", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_NONE", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_OTAG", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN}, \
-    {"INGRESS_PKT_INNER_L2_HDR_ITAG", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG}, \
-    {"INGRESS_PKT_INNER_L2_HDR_L2", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2}, \
-    {"INGRESS_PKT_INNER_L2_HDR_NONE", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE}, \
-    {"INGRESS_PKT_INNER_L2_HDR_OTAG", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ARP", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ICMP", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV4", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV6", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_NONE", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_RARP", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UDP", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_ITAG", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_L2", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_NONE", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_OTAG", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ARP", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ICMP", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV4", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV6", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_NONE", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_RARP", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UDP", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN}, \
-    {"INGRESS_PKT_SYS_HDR_EP_NIH", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH}, \
-    {"INGRESS_PKT_SYS_HDR_LOOPBACK", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK}, \
-    {"INGRESS_PKT_SYS_HDR_NONE", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE}, \
-    {"rxpmd_match_id_count", BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_COUNT}
-
-#endif /*! BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_bcmpkt_flexhdr.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_bcmpkt_flexhdr.h
new file mode 100644
index 000000000000..f97f7df10726
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_bcmpkt_flexhdr.h
@@ -0,0 +1,96 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) header.yml.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_FLEXHDR_H
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_FLEXHDR_H
+
+#include <bcmpkt/bcmpkt_flexhdr_internal.h>
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T                      0
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T         1
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T         2
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T            3
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T        4
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T         5
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T                6
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T         7
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ICMP_T                     8
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPFIX_T                    9
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T                     10
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T                     11
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_L2_T                       12
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T         13
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T         14
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T   15
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T   16
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T   17
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T                     18
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T         19
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T         20
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UDP_T                      21
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T               22
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T               23
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T               24
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_VLAN_T                     25
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_VXLAN_T                    26
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_T               27
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_FLEXHDR_COUNT    28
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_FLEXHDR_NAME_MAP_INIT \
+    {"arp_t", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T},\
+    {"cpu_composites_0_t", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T},\
+    {"cpu_composites_1_t", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T},\
+    {"ep_nih_header_t", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T},\
+    {"erspan3_fixed_hdr_t", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T},\
+    {"erspan3_subhdr_5_t", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T},\
+    {"ethertype_t", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T},\
+    {"generic_loopback_t", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T},\
+    {"icmp_t", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ICMP_T},\
+    {"ipfix_t", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPFIX_T},\
+    {"ipv4_t", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T},\
+    {"ipv6_t", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T},\
+    {"l2_t", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_L2_T},\
+    {"mirror_erspan_sn_t", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T},\
+    {"mirror_transport_t", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T},\
+    {"psamp_mirror_on_drop_0_t", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T},\
+    {"psamp_mirror_on_drop_1_t", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T},\
+    {"psamp_mirror_on_drop_2_t", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T},\
+    {"rarp_t", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T},\
+    {"tcp_first_4bytes_t", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T},\
+    {"tcp_last_16bytes_t", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T},\
+    {"udp_t", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UDP_T},\
+    {"unknown_l3_t", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T},\
+    {"unknown_l4_t", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T},\
+    {"unknown_l5_t", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T},\
+    {"vlan_t", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_VLAN_T},\
+    {"vxlan_t", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_VXLAN_T},\
+    {"RXPMD_FLEX_T", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_T},\
+    {"flexhdr count", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_FLEXHDR_COUNT}
+
+#endif /* BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_FLEXHDR_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_bcmpkt_flexhdr_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_bcmpkt_flexhdr_data.h
new file mode 100644
index 000000000000..65c6f0c4a8e6
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_bcmpkt_flexhdr_data.h
@@ -0,0 +1,592 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) header.yml.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_FLEXHDR_DATA_H
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_FLEXHDR_DATA_H
+
+/*!
+ * \name ARP_T field IDs.
+ */
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_HARDWARE_LEN  0
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_HARDWARE_TYPE 1
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_OPERATION     2
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_PROT_ADDR_LEN 3
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_PROTOCOL_TYPE 4
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_SENDER_HA     5
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_SENDER_IP     6
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_TARGET_HA     7
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_TARGET_IP     8
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_FID_COUNT          9
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT \
+    {"HARDWARE_LEN", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_HARDWARE_LEN},\
+    {"HARDWARE_TYPE", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_HARDWARE_TYPE},\
+    {"OPERATION", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_OPERATION},\
+    {"PROT_ADDR_LEN", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_PROT_ADDR_LEN},\
+    {"PROTOCOL_TYPE", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_PROTOCOL_TYPE},\
+    {"SENDER_HA", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_SENDER_HA},\
+    {"SENDER_IP", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_SENDER_IP},\
+    {"TARGET_HA", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_TARGET_HA},\
+    {"TARGET_IP", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_TARGET_IP},\
+    {"arp_t fid count", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_FID_COUNT}
+
+/*!
+ * \name CPU_COMPOSITES_0_T field IDs.
+ */
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0 0
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1 1
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2 2
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3 3
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4 4
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5 5
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6 6
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT          7
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT \
+    {"DMA_CONT0", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0},\
+    {"DMA_CONT1", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1},\
+    {"DMA_CONT2", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2},\
+    {"DMA_CONT3", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3},\
+    {"DMA_CONT4", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4},\
+    {"DMA_CONT5", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5},\
+    {"DMA_CONT6", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6},\
+    {"cpu_composites_0_t fid count", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT}
+
+/*!
+ * \name CPU_COMPOSITES_1_T field IDs.
+ */
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10 0
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11 1
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12 2
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13 3
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14 4
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15 5
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16 6
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17 7
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7  8
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8  9
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9  10
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT          11
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT \
+    {"DMA_CONT10", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10},\
+    {"DMA_CONT11", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11},\
+    {"DMA_CONT12", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12},\
+    {"DMA_CONT13", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13},\
+    {"DMA_CONT14", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14},\
+    {"DMA_CONT15", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15},\
+    {"DMA_CONT16", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16},\
+    {"DMA_CONT17", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17},\
+    {"DMA_CONT7", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7},\
+    {"DMA_CONT8", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8},\
+    {"DMA_CONT9", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9},\
+    {"cpu_composites_1_t fid count", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT}
+
+/*!
+ * \name EP_NIH_HEADER_T field IDs.
+ */
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_HEADER_SUBTYPE       0
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_HEADER_TYPE          1
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_A        2
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_B        3
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_C        4
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_A      5
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_B      6
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_C      7
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_RECIRC_PROFILE_INDEX 8
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_RESERVED_0           9
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_START                10
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_TIMESTAMP            11
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT          12
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_FIELD_NAME_MAP_INIT \
+    {"HEADER_SUBTYPE", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_HEADER_SUBTYPE},\
+    {"HEADER_TYPE", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_HEADER_TYPE},\
+    {"OPAQUE_CTRL_A", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_A},\
+    {"OPAQUE_CTRL_B", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_B},\
+    {"OPAQUE_CTRL_C", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_C},\
+    {"OPAQUE_OBJECT_A", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_A},\
+    {"OPAQUE_OBJECT_B", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_B},\
+    {"OPAQUE_OBJECT_C", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_C},\
+    {"RECIRC_PROFILE_INDEX", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_RECIRC_PROFILE_INDEX},\
+    {"RESERVED_0", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_RESERVED_0},\
+    {"START", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_START},\
+    {"TIMESTAMP", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_TIMESTAMP},\
+    {"ep_nih_header_t fid count", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT}
+
+/*!
+ * \name ERSPAN3_FIXED_HDR_T field IDs.
+ */
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO               0
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_COS               1
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID           2
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O 3
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID        4
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_T                 5
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP         6
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VER               7
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN              8
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT          9
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT \
+    {"BSO", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO},\
+    {"COS", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_COS},\
+    {"GBP_SID", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID},\
+    {"P_FT_HWID_D_GRA_O", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O},\
+    {"SESSION_ID", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID},\
+    {"T", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_T},\
+    {"TIMESTAMP", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP},\
+    {"VER", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VER},\
+    {"VLAN", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN},\
+    {"erspan3_fixed_hdr_t fid count", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT}
+
+/*!
+ * \name ERSPAN3_SUBHDR_5_T field IDs.
+ */
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID 0
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID     1
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID   2
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP   3
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT          4
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT \
+    {"PLATFORM_ID", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID},\
+    {"PORT_ID", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID},\
+    {"SWITCH_ID", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID},\
+    {"TIMESTAMP", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP},\
+    {"erspan3_subhdr_5_t fid count", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT}
+
+/*!
+ * \name ETHERTYPE_T field IDs.
+ */
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T_TYPE 0
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T_FID_COUNT          1
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT \
+    {"TYPE", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T_TYPE},\
+    {"ethertype_t fid count", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T_FID_COUNT}
+
+/*!
+ * \name GENERIC_LOOPBACK_T field IDs.
+ */
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ    0
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE   1
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ        2
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_FLAGS              3
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE        4
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY     5
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL     6
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ      7
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0  8
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1  9
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ            10
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1         11
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_2         12
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT 13
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE         14
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT          15
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT \
+    {"DESTINATION_OBJ", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ},\
+    {"DESTINATION_TYPE", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE},\
+    {"ENTROPY_OBJ", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ},\
+    {"FLAGS", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_FLAGS},\
+    {"HEADER_TYPE", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE},\
+    {"INPUT_PRIORITY", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY},\
+    {"INTERFACE_CTRL", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL},\
+    {"INTERFACE_OBJ", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ},\
+    {"PROCESSING_CTRL_0", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0},\
+    {"PROCESSING_CTRL_1", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1},\
+    {"QOS_OBJ", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ},\
+    {"RESERVED_1", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1},\
+    {"RESERVED_2", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_2},\
+    {"SOURCE_SYSTEM_PORT", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT},\
+    {"START_BYTE", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE},\
+    {"generic_loopback_t fid count", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT}
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NO_OP       0
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2_OIF      1
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED    2
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__VP          3
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP        4
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NHOP        5
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2MC_GROUP  6
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L3MC_GROUP  7
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED_1  8
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP_MEMBER 9
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__DEVICE_PORT 10
+
+/*!
+ * \name ICMP_T field IDs.
+ */
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ICMP_T_CHECKSUM  0
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ICMP_T_CODE      1
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ICMP_T_ICMP_TYPE 2
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ICMP_T_FID_COUNT          3
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT \
+    {"CHECKSUM", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ICMP_T_CHECKSUM},\
+    {"CODE", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ICMP_T_CODE},\
+    {"ICMP_TYPE", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ICMP_T_ICMP_TYPE},\
+    {"icmp_t fid count", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ICMP_T_FID_COUNT}
+
+/*!
+ * \name IPFIX_T field IDs.
+ */
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPFIX_T_EXPORT_TIME   0
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPFIX_T_LENGTH        1
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPFIX_T_OBS_DOMAIN_ID 2
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPFIX_T_SEQUENCE_NUM  3
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPFIX_T_VERSION       4
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPFIX_T_FID_COUNT          5
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT \
+    {"EXPORT_TIME", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPFIX_T_EXPORT_TIME},\
+    {"LENGTH", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPFIX_T_LENGTH},\
+    {"OBS_DOMAIN_ID", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPFIX_T_OBS_DOMAIN_ID},\
+    {"SEQUENCE_NUM", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPFIX_T_SEQUENCE_NUM},\
+    {"VERSION", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPFIX_T_VERSION},\
+    {"ipfix_t fid count", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPFIX_T_FID_COUNT}
+
+/*!
+ * \name IPV4_T field IDs.
+ */
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_DA                0
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET 1
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_HDR_CHECKSUM      2
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_ID                3
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_OPTION            4
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_PROTOCOL          5
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_SA                6
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_TOS               7
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_TOTAL_LENGTH      8
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_TTL               9
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_VERSION_HDR_LEN   10
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_FID_COUNT          11
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT \
+    {"DA", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_DA},\
+    {"FLAGS_FRAG_OFFSET", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET},\
+    {"HDR_CHECKSUM", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_HDR_CHECKSUM},\
+    {"ID", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_ID},\
+    {"OPTION", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_OPTION},\
+    {"PROTOCOL", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_PROTOCOL},\
+    {"SA", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_SA},\
+    {"TOS", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_TOS},\
+    {"TOTAL_LENGTH", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_TOTAL_LENGTH},\
+    {"TTL", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_TTL},\
+    {"VERSION_HDR_LEN", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_VERSION_HDR_LEN},\
+    {"ipv4_t fid count", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_FID_COUNT}
+
+/*!
+ * \name IPV6_T field IDs.
+ */
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_DA             0
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_FLOW_LABEL     1
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_HOP_LIMIT      2
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_NEXT_HEADER    3
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_PAYLOAD_LENGTH 4
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_SA             5
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_TRAFFIC_CLASS  6
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_VERSION        7
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_FID_COUNT          8
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT \
+    {"DA", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_DA},\
+    {"FLOW_LABEL", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_FLOW_LABEL},\
+    {"HOP_LIMIT", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_HOP_LIMIT},\
+    {"NEXT_HEADER", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_NEXT_HEADER},\
+    {"PAYLOAD_LENGTH", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_PAYLOAD_LENGTH},\
+    {"SA", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_SA},\
+    {"TRAFFIC_CLASS", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_TRAFFIC_CLASS},\
+    {"VERSION", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_VERSION},\
+    {"ipv6_t fid count", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_FID_COUNT}
+
+/*!
+ * \name L2_T field IDs.
+ */
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_L2_T_MACDA 0
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_L2_T_MACSA 1
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_L2_T_FID_COUNT          2
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_L2_T_FIELD_NAME_MAP_INIT \
+    {"MACDA", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_L2_T_MACDA},\
+    {"MACSA", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_L2_T_MACSA},\
+    {"l2_t fid count", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_L2_T_FID_COUNT}
+
+/*!
+ * \name MIRROR_ERSPAN_SN_T field IDs.
+ */
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM 0
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT          1
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT \
+    {"SEQ_NUM", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM},\
+    {"mirror_erspan_sn_t fid count", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT}
+
+/*!
+ * \name MIRROR_TRANSPORT_T field IDs.
+ */
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T_DATA 0
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT          1
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT \
+    {"DATA", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T_DATA},\
+    {"mirror_transport_t fid count", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_MIRROR_ON_DROP_0_T field IDs.
+ */
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT 0
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT    1
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH          2
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS     3
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S      4
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID       5
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID     6
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT          7
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT \
+    {"EGRESS_MOD_PORT", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT},\
+    {"INGRESS_PORT", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT},\
+    {"LENGTH", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH},\
+    {"OBS_TIME_NS", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS},\
+    {"OBS_TIME_S", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S},\
+    {"SWITCH_ID", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID},\
+    {"TEMPLATE_ID", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID},\
+    {"psamp_mirror_on_drop_0_t fid count", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_MIRROR_ON_DROP_1_T field IDs.
+ */
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_ING_DROP_REASON    0
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_MIRROR_ON_DROP_OBJ 1
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_MMU_DROP_CTRL      2
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_SAMPLED_LENGTH     3
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_USER_META_DATA     4
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_VAR_LEN_INDICATOR  5
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FID_COUNT          6
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FIELD_NAME_MAP_INIT \
+    {"ING_DROP_REASON", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_ING_DROP_REASON},\
+    {"MIRROR_ON_DROP_OBJ", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_MIRROR_ON_DROP_OBJ},\
+    {"MMU_DROP_CTRL", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_MMU_DROP_CTRL},\
+    {"SAMPLED_LENGTH", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_SAMPLED_LENGTH},\
+    {"USER_META_DATA", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_USER_META_DATA},\
+    {"VAR_LEN_INDICATOR", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_VAR_LEN_INDICATOR},\
+    {"psamp_mirror_on_drop_1_t fid count", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_MIRROR_ON_DROP_2_T field IDs.
+ */
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_EGR_DROP_REASON       0
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_EP_COPY_SESSION_INDEX 1
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_RESERVED_0            2
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_SAMPLED_LENGTH        3
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_USER_META_DATA        4
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_VAR_LEN_INDICATOR     5
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_FID_COUNT          6
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_FIELD_NAME_MAP_INIT \
+    {"EGR_DROP_REASON", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_EGR_DROP_REASON},\
+    {"EP_COPY_SESSION_INDEX", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_EP_COPY_SESSION_INDEX},\
+    {"RESERVED_0", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_RESERVED_0},\
+    {"SAMPLED_LENGTH", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_SAMPLED_LENGTH},\
+    {"USER_META_DATA", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_USER_META_DATA},\
+    {"VAR_LEN_INDICATOR", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_VAR_LEN_INDICATOR},\
+    {"psamp_mirror_on_drop_2_t fid count", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_FID_COUNT}
+
+/*!
+ * \name RARP_T field IDs.
+ */
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_HARDWARE_LEN  0
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_HARDWARE_TYPE 1
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_OPERATION     2
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_PROT_ADDR_LEN 3
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_PROTOCOL_TYPE 4
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_SENDER_HA     5
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_SENDER_IP     6
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_TARGET_HA     7
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_TARGET_IP     8
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_FID_COUNT          9
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT \
+    {"HARDWARE_LEN", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_HARDWARE_LEN},\
+    {"HARDWARE_TYPE", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_HARDWARE_TYPE},\
+    {"OPERATION", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_OPERATION},\
+    {"PROT_ADDR_LEN", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_PROT_ADDR_LEN},\
+    {"PROTOCOL_TYPE", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_PROTOCOL_TYPE},\
+    {"SENDER_HA", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_SENDER_HA},\
+    {"SENDER_IP", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_SENDER_IP},\
+    {"TARGET_HA", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_TARGET_HA},\
+    {"TARGET_IP", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_TARGET_IP},\
+    {"rarp_t fid count", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_FID_COUNT}
+
+/*!
+ * \name TCP_FIRST_4BYTES_T field IDs.
+ */
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT 0
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT 1
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT          2
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT \
+    {"DST_PORT", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT},\
+    {"SRC_PORT", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT},\
+    {"tcp_first_4bytes_t fid count", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT}
+
+/*!
+ * \name TCP_LAST_16BYTES_T field IDs.
+ */
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM           0
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM          1
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS 2
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM           3
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR        4
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE          5
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT          6
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT \
+    {"ACK_NUM", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM},\
+    {"CHECKSUM", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM},\
+    {"HDR_LEN_AND_FLAGS", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS},\
+    {"SEQ_NUM", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM},\
+    {"URGENT_PTR", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR},\
+    {"WIN_SIZE", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE},\
+    {"tcp_last_16bytes_t fid count", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT}
+
+/*!
+ * \name UDP_T field IDs.
+ */
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UDP_T_CHECKSUM   0
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UDP_T_DST_PORT   1
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UDP_T_SRC_PORT   2
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UDP_T_UDP_LENGTH 3
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UDP_T_FID_COUNT          4
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT \
+    {"CHECKSUM", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UDP_T_CHECKSUM},\
+    {"DST_PORT", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UDP_T_DST_PORT},\
+    {"SRC_PORT", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UDP_T_SRC_PORT},\
+    {"UDP_LENGTH", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UDP_T_UDP_LENGTH},\
+    {"udp_t fid count", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UDP_T_FID_COUNT}
+
+/*!
+ * \name UNKNOWN_L3_T field IDs.
+ */
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD 0
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD  1
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT          2
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT \
+    {"FIRST_16BYTES_OF_L3_PAYLOAD", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD},\
+    {"NEXT_16BYTES_OF_L3_PAYLOAD", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD},\
+    {"unknown_l3_t fid count", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT}
+
+/*!
+ * \name UNKNOWN_L4_T field IDs.
+ */
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD 0
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT          1
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT \
+    {"FIRST_4BYTES_OF_L4_PAYLOAD", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD},\
+    {"unknown_l4_t fid count", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT}
+
+/*!
+ * \name UNKNOWN_L5_T field IDs.
+ */
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1 0
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3 1
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7 2
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT          3
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT \
+    {"L5_BYTES_0_1", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1},\
+    {"L5_BYTES_2_3", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3},\
+    {"L5_BYTES_4_7", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7},\
+    {"unknown_l5_t fid count", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT}
+
+/*!
+ * \name VLAN_T field IDs.
+ */
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_VLAN_T_CFI  0
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_VLAN_T_PCP  1
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_VLAN_T_TPID 2
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_VLAN_T_VID  3
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_VLAN_T_FID_COUNT          4
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT \
+    {"CFI", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_VLAN_T_CFI},\
+    {"PCP", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_VLAN_T_PCP},\
+    {"TPID", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_VLAN_T_TPID},\
+    {"VID", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_VLAN_T_VID},\
+    {"vlan_t fid count", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_VLAN_T_FID_COUNT}
+
+/*!
+ * \name VXLAN_T field IDs.
+ */
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_VXLAN_T_FLAGS_RESERVED_1 0
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_VXLAN_T_RESERVED2        1
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_VXLAN_T_VN_ID            2
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_VXLAN_T_FID_COUNT          3
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT \
+    {"FLAGS_RESERVED_1", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_VXLAN_T_FLAGS_RESERVED_1},\
+    {"RESERVED2", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_VXLAN_T_RESERVED2},\
+    {"VN_ID", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_VXLAN_T_VN_ID},\
+    {"vxlan_t fid count", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_VXLAN_T_FID_COUNT}
+
+
+#endif /* BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_FLEXHDR_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_bcmpkt_rxpmd_flex_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_bcmpkt_rxpmd_flex_data.h
new file mode 100644
index 000000000000..c03e41604869
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_bcmpkt_rxpmd_flex_data.h
@@ -0,0 +1,124 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) map.yml.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_DATA_H
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_DATA_H
+
+/*!
+ * \name RX flex metadata field IDs.
+ */
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0                                 0
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_DVP_15_0                                       1
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_7_0                              2
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_HIGH_3_0                         3
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0                         4
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_DROP_CODE_15_0                      5
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_RECIRC_CODE_3_0                     6
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_15_0                      7
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_31_16                     8
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_ERSPAN3_GBP_SID_15_0                           9
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_15_0                        10
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_16                       11
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32                       12
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0                              13
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_15_0                             14
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_16                            15
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_INGRESS_PP_PORT_7_0                            16
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0 17
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0                    18
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_INT_PRI_3_0                                    19
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_L2_IIF_10_0                                    20
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_L2_OIF_10_0                                    21
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_L2_TUNNEL_SVP_15_0                             22
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_L3_IIF_13_0                                    23
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0                                  24
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_14_0              25
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_14_0                              26
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0                            27
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0                            28
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0                   29
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0                        30
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0                              31
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_SYSTEM_SOURCE_15_0                             32
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_TAG_ACTION_CTRL_1_0                            33
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0                34
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_VFI_15_0                                       35
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_FID_COUNT                       36
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_COUNT                    21
+
+/*!
+ * \name Packet Flex Reason Types.
+ */
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS                  0
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP                        1
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER                  2
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT                      3
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP              4
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS         5
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_DISCARD             6
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE         7
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP              8
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS         9
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR               10
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR               11
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL           12
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST            13
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED    14
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU             15
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED 16
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT               17
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED 18
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP                  19
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_VFP                        20
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT \
+    {"CML_FLAGS", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS},\
+    {"IFP", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP},\
+    {"IFP_METER", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER},\
+    {"IVXLT", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT},\
+    {"L2_DST_LOOKUP", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP},\
+    {"L2_DST_LOOKUP_MISS", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS},\
+    {"L2_SRC_DISCARD", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_DISCARD},\
+    {"L2_SRC_STATIC_MOVE", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE},\
+    {"L3_DST_LOOKUP", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP},\
+    {"L3_DST_LOOKUP_MISS", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS},\
+    {"L3_HDR_ERROR", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR},\
+    {"L3_TTL_ERROR", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR},\
+    {"LEARN_CACHE_FULL", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL},\
+    {"MACSA_MULTICAST", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST},\
+    {"MEMBERSHIP_CHECK_FAILED", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED},\
+    {"NO_COPY_TO_CPU", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU},\
+    {"PKT_INTEGRITY_CHECK_FAILED", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED},\
+    {"PROTOCOL_PKT", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT},\
+    {"SPANNING_TREE_CHECK_FAILED", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED},\
+    {"TRACE_DOP", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP},\
+    {"VFP", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_VFP},\
+    {"flex reason count", BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_COUNT}
+
+#endif /* BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_bcmpkt_rxpmd_match_id_defs.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_bcmpkt_rxpmd_match_id_defs.h
new file mode 100644
index 000000000000..6df919ecd6ca
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_bcmpkt_rxpmd_match_id_defs.h
@@ -0,0 +1,213 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) bcm56780_a0_cna_6_5_31_3_0_sf_match_id_info.yml
+ * for device bcm56780_a0 and variant cna_6_5_31_3_0.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H
+
+#include <bcmpkt/bcmpkt_rxpmd_match_id.h>
+
+/*!
+ * \brief Get the Match ID DataBase information.
+ *
+ * \retval bcmpkt_rxpmd_match_id_db_info_t Match ID DataBase information.
+*/
+extern bcmpkt_rxpmd_match_id_db_info_t *
+    bcm56780_a0_cna_6_5_31_3_0_rxpmd_match_id_db_info_get(void);
+
+/*!
+ * \brief Get the Match ID Mapping information.
+ *
+ * \retval bcmpkt_rxpmd_match_id_map_info_t Match ID Mapping information.
+*/
+extern bcmpkt_rxpmd_match_id_map_info_t *
+    bcm56780_a0_cna_6_5_31_3_0_rxpmd_match_id_map_info_get(void);
+
+/*!
+  \name RXPMD Match IDs
+*/
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG  0
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2  1
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE  2
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG  3
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP  4
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE  5
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP  6
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4  7
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6  8
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE  9
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP  10
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES  11
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES  12
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP  13
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3  14
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4  15
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5  16
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN  17
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH  18
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK  19
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE  20
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG  21
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2  22
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE  23
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG  24
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP  25
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE  26
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP  27
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4  28
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6  29
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE  30
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP  31
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES  32
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES  33
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP  34
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3  35
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4  36
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5  37
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN  38
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG  39
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2  40
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE  41
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG  42
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP  43
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE  44
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP  45
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4  46
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6  47
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE  48
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP  49
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES  50
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES  51
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP  52
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3  53
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4  54
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5  55
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG  56
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2  57
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE  58
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG  59
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP  60
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE  61
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP  62
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4  63
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6  64
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE  65
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP  66
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES  67
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES  68
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP  69
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3  70
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4  71
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5  72
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN  73
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH  74
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK  75
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE  76
+#define BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_COUNT  77
+
+#define BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT \
+    {"EGRESS_PKT_FWD_L2_HDR_ITAG", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG}, \
+    {"EGRESS_PKT_FWD_L2_HDR_L2", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2}, \
+    {"EGRESS_PKT_FWD_L2_HDR_NONE", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE}, \
+    {"EGRESS_PKT_FWD_L2_HDR_OTAG", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ARP", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ICMP", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV4", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV6", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_NONE", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_RARP", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UDP", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_VXLAN", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN}, \
+    {"EGRESS_PKT_SYS_HDR_EP_NIH", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH}, \
+    {"EGRESS_PKT_SYS_HDR_LOOPBACK", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK}, \
+    {"EGRESS_PKT_SYS_HDR_NONE", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_ITAG", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_L2", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_NONE", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_OTAG", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN}, \
+    {"INGRESS_PKT_INNER_L2_HDR_ITAG", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG}, \
+    {"INGRESS_PKT_INNER_L2_HDR_L2", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2}, \
+    {"INGRESS_PKT_INNER_L2_HDR_NONE", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE}, \
+    {"INGRESS_PKT_INNER_L2_HDR_OTAG", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ARP", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ICMP", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV4", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV6", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_NONE", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_RARP", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UDP", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_ITAG", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_L2", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_NONE", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_OTAG", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ARP", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ICMP", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV4", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV6", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_NONE", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_RARP", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UDP", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN}, \
+    {"INGRESS_PKT_SYS_HDR_EP_NIH", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH}, \
+    {"INGRESS_PKT_SYS_HDR_LOOPBACK", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK}, \
+    {"INGRESS_PKT_SYS_HDR_NONE", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE}, \
+    {"rxpmd_match_id_count", BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_COUNT}
+
+#endif /*! BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_bcmpkt_flexhdr.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_bcmpkt_flexhdr.h
deleted file mode 100644
index 8dd7a520e072..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_bcmpkt_flexhdr.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) header.yml.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_FLEXHDR_H
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_FLEXHDR_H
-
-#include <bcmpkt/bcmpkt_flexhdr_internal.h>
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ARP_T                      0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_AUTHEN_T                   1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T                      2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CNTAG_T                    3
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T         4
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T         5
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_DEST_OPTION_T              6
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T            7
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T        8
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T         9
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ESP_T                      10
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ETAG_T                     11
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ETHERTYPE_T                12
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_FRAG_T                     13
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T         14
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GPE_T                      15
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_CHKSUM_T               16
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_KEY_T                  17
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_ROUT_T                 18
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_SEQ_T                  19
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_T                      20
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T                 21
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_EXTENSION_0_T          22
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HOP_BY_HOP_T               23
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ICMP_T                     24
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_0_A_T          25
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_0_B_T          26
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_1_T            27
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_2_T            28
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_3_T            29
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_HEADER_T               30
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_MD_BASE_T              31
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_METADATA_T             32
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IGMP_T                     33
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPFIX_T                    34
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV4_T                     35
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV6_T                     36
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_L2_T                       37
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MIRROR_ERSPAN_SN_T         38
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MIRROR_TRANSPORT_T         39
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_ACH_T                 40
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_BV_T                  41
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_CW_T                  42
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_T                     43
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_P_1588_T                   44
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PIM_T                      45
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PROG_EXT_HDR_T             46
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_0_T                  47
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_1_T                  48
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T   49
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T   50
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RARP_T                     51
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ROUTING_T                  52
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RSPAN_T                    53
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_0_T             54
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_1_T             55
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_2_T             56
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SNAP_LLC_T                 57
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SVTAG_T                    58
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T         59
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T         60
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UDP_T                      61
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T               62
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L4_T               63
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T               64
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VLAN_T                     65
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VNTAG_T                    66
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VXLAN_T                    67
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_WESP_T                     68
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_T               69
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_FLEXHDR_COUNT    70
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_FLEXHDR_NAME_MAP_INIT \
-    {"arp_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ARP_T},\
-    {"authen_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_AUTHEN_T},\
-    {"bfd_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T},\
-    {"cntag_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CNTAG_T},\
-    {"cpu_composites_0_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T},\
-    {"cpu_composites_1_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T},\
-    {"dest_option_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_DEST_OPTION_T},\
-    {"ep_nih_header_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T},\
-    {"erspan3_fixed_hdr_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T},\
-    {"erspan3_subhdr_5_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T},\
-    {"esp_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ESP_T},\
-    {"etag_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ETAG_T},\
-    {"ethertype_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ETHERTYPE_T},\
-    {"frag_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_FRAG_T},\
-    {"generic_loopback_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T},\
-    {"gpe_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GPE_T},\
-    {"gre_chksum_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_CHKSUM_T},\
-    {"gre_key_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_KEY_T},\
-    {"gre_rout_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_ROUT_T},\
-    {"gre_seq_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_SEQ_T},\
-    {"gre_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_T},\
-    {"hg3_base_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T},\
-    {"hg3_extension_0_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_EXTENSION_0_T},\
-    {"hop_by_hop_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HOP_BY_HOP_T},\
-    {"icmp_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ICMP_T},\
-    {"ifa_flex_md_0_a_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_0_A_T},\
-    {"ifa_flex_md_0_b_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_0_B_T},\
-    {"ifa_flex_md_1_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_1_T},\
-    {"ifa_flex_md_2_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_2_T},\
-    {"ifa_flex_md_3_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_3_T},\
-    {"ifa_header_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_HEADER_T},\
-    {"ifa_md_base_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_MD_BASE_T},\
-    {"ifa_metadata_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_METADATA_T},\
-    {"igmp_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IGMP_T},\
-    {"ipfix_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPFIX_T},\
-    {"ipv4_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV4_T},\
-    {"ipv6_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV6_T},\
-    {"l2_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_L2_T},\
-    {"mirror_erspan_sn_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MIRROR_ERSPAN_SN_T},\
-    {"mirror_transport_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MIRROR_TRANSPORT_T},\
-    {"mpls_ach_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_ACH_T},\
-    {"mpls_bv_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_BV_T},\
-    {"mpls_cw_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_CW_T},\
-    {"mpls_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_T},\
-    {"p_1588_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_P_1588_T},\
-    {"pim_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PIM_T},\
-    {"prog_ext_hdr_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PROG_EXT_HDR_T},\
-    {"psamp_0_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_0_T},\
-    {"psamp_1_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_1_T},\
-    {"psamp_mirror_on_drop_0_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T},\
-    {"psamp_mirror_on_drop_3_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T},\
-    {"rarp_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RARP_T},\
-    {"routing_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ROUTING_T},\
-    {"rspan_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RSPAN_T},\
-    {"sflow_shim_0_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_0_T},\
-    {"sflow_shim_1_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_1_T},\
-    {"sflow_shim_2_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_2_T},\
-    {"snap_llc_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SNAP_LLC_T},\
-    {"svtag_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SVTAG_T},\
-    {"tcp_first_4bytes_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T},\
-    {"tcp_last_16bytes_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T},\
-    {"udp_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UDP_T},\
-    {"unknown_l3_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T},\
-    {"unknown_l4_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L4_T},\
-    {"unknown_l5_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T},\
-    {"vlan_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VLAN_T},\
-    {"vntag_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VNTAG_T},\
-    {"vxlan_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VXLAN_T},\
-    {"wesp_t", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_WESP_T},\
-    {"RXPMD_FLEX_T", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_T},\
-    {"flexhdr count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_FLEXHDR_COUNT}
-
-#endif /* BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_FLEXHDR_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_bcmpkt_flexhdr_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_bcmpkt_flexhdr_data.h
deleted file mode 100644
index 905781ac6601..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_bcmpkt_flexhdr_data.h
+++ /dev/null
@@ -1,1343 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) header.yml.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_FLEXHDR_DATA_H
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_FLEXHDR_DATA_H
-
-/*!
- * \name ARP_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ARP_T_HARDWARE_LEN  0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ARP_T_HARDWARE_TYPE 1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ARP_T_OPERATION     2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ARP_T_PROT_ADDR_LEN 3
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ARP_T_PROTOCOL_TYPE 4
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ARP_T_SENDER_HA     5
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ARP_T_SENDER_IP     6
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ARP_T_TARGET_HA     7
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ARP_T_TARGET_IP     8
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ARP_T_FID_COUNT          9
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT \
-    {"HARDWARE_LEN", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ARP_T_HARDWARE_LEN},\
-    {"HARDWARE_TYPE", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ARP_T_HARDWARE_TYPE},\
-    {"OPERATION", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ARP_T_OPERATION},\
-    {"PROT_ADDR_LEN", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ARP_T_PROT_ADDR_LEN},\
-    {"PROTOCOL_TYPE", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ARP_T_PROTOCOL_TYPE},\
-    {"SENDER_HA", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ARP_T_SENDER_HA},\
-    {"SENDER_IP", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ARP_T_SENDER_IP},\
-    {"TARGET_HA", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ARP_T_TARGET_HA},\
-    {"TARGET_IP", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ARP_T_TARGET_IP},\
-    {"arp_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ARP_T_FID_COUNT}
-
-/*!
- * \name AUTHEN_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_AUTHEN_T_DATA        0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_AUTHEN_T_NEXT_HEADER 1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_AUTHEN_T_PAYLOAD_LEN 2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_AUTHEN_T_RESERVED    3
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_AUTHEN_T_SEQ_NUM     4
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_AUTHEN_T_SPI         5
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_AUTHEN_T_FID_COUNT          6
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_AUTHEN_T_FIELD_NAME_MAP_INIT \
-    {"DATA", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_AUTHEN_T_DATA},\
-    {"NEXT_HEADER", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_AUTHEN_T_NEXT_HEADER},\
-    {"PAYLOAD_LEN", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_AUTHEN_T_PAYLOAD_LEN},\
-    {"RESERVED", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_AUTHEN_T_RESERVED},\
-    {"SEQ_NUM", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_AUTHEN_T_SEQ_NUM},\
-    {"SPI", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_AUTHEN_T_SPI},\
-    {"authen_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_AUTHEN_T_FID_COUNT}
-
-/*!
- * \name BFD_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_AP            0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_BFD_LENGTH    1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_CPI           2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_DEM           3
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_DESMINTXINTV  4
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_DETECTMULT    5
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_DIAG          6
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_FIN           7
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_MINECHORXINTV 8
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_MPT           9
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_MYDISCRIM     10
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_POLL          11
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_REQMINRXINTV  12
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_STA           13
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_URDISCRIM     14
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_VERSION       15
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_FID_COUNT          16
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_FIELD_NAME_MAP_INIT \
-    {"AP", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_AP},\
-    {"BFD_LENGTH", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_BFD_LENGTH},\
-    {"CPI", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_CPI},\
-    {"DEM", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_DEM},\
-    {"DESMINTXINTV", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_DESMINTXINTV},\
-    {"DETECTMULT", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_DETECTMULT},\
-    {"DIAG", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_DIAG},\
-    {"FIN", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_FIN},\
-    {"MINECHORXINTV", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_MINECHORXINTV},\
-    {"MPT", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_MPT},\
-    {"MYDISCRIM", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_MYDISCRIM},\
-    {"POLL", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_POLL},\
-    {"REQMINRXINTV", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_REQMINRXINTV},\
-    {"STA", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_STA},\
-    {"URDISCRIM", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_URDISCRIM},\
-    {"VERSION", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_VERSION},\
-    {"bfd_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_FID_COUNT}
-
-/*!
- * \name CNTAG_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CNTAG_T_RPID 0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CNTAG_T_TPID 1
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CNTAG_T_FID_COUNT          2
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CNTAG_T_FIELD_NAME_MAP_INIT \
-    {"RPID", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CNTAG_T_RPID},\
-    {"TPID", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CNTAG_T_TPID},\
-    {"cntag_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CNTAG_T_FID_COUNT}
-
-/*!
- * \name CPU_COMPOSITES_0_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0 0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1 1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2 2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3 3
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4 4
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5 5
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6 6
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT          7
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT \
-    {"DMA_CONT0", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0},\
-    {"DMA_CONT1", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1},\
-    {"DMA_CONT2", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2},\
-    {"DMA_CONT3", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3},\
-    {"DMA_CONT4", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4},\
-    {"DMA_CONT5", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5},\
-    {"DMA_CONT6", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6},\
-    {"cpu_composites_0_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT}
-
-/*!
- * \name CPU_COMPOSITES_1_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10 0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11 1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12 2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13 3
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14 4
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15 5
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16 6
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17 7
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7  8
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8  9
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9  10
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT          11
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT \
-    {"DMA_CONT10", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10},\
-    {"DMA_CONT11", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11},\
-    {"DMA_CONT12", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12},\
-    {"DMA_CONT13", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13},\
-    {"DMA_CONT14", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14},\
-    {"DMA_CONT15", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15},\
-    {"DMA_CONT16", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16},\
-    {"DMA_CONT17", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17},\
-    {"DMA_CONT7", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7},\
-    {"DMA_CONT8", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8},\
-    {"DMA_CONT9", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9},\
-    {"cpu_composites_1_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT}
-
-/*!
- * \name DEST_OPTION_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_DEST_OPTION_T_HDR_EXT_LEN 0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_DEST_OPTION_T_NEXT_HEADER 1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_DEST_OPTION_T_OPTION      2
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_DEST_OPTION_T_FID_COUNT          3
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_DEST_OPTION_T_FIELD_NAME_MAP_INIT \
-    {"HDR_EXT_LEN", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_DEST_OPTION_T_HDR_EXT_LEN},\
-    {"NEXT_HEADER", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_DEST_OPTION_T_NEXT_HEADER},\
-    {"OPTION", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_DEST_OPTION_T_OPTION},\
-    {"dest_option_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_DEST_OPTION_T_FID_COUNT}
-
-/*!
- * \name EP_NIH_HEADER_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_HEADER_SUBTYPE       0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_HEADER_TYPE          1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_A        2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_B        3
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_C        4
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_A      5
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_B      6
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_C      7
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_RECIRC_PROFILE_INDEX 8
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_RESERVED_0           9
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_START                10
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_TIMESTAMP            11
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT          12
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_FIELD_NAME_MAP_INIT \
-    {"HEADER_SUBTYPE", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_HEADER_SUBTYPE},\
-    {"HEADER_TYPE", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_HEADER_TYPE},\
-    {"OPAQUE_CTRL_A", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_A},\
-    {"OPAQUE_CTRL_B", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_B},\
-    {"OPAQUE_CTRL_C", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_C},\
-    {"OPAQUE_OBJECT_A", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_A},\
-    {"OPAQUE_OBJECT_B", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_B},\
-    {"OPAQUE_OBJECT_C", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_C},\
-    {"RECIRC_PROFILE_INDEX", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_RECIRC_PROFILE_INDEX},\
-    {"RESERVED_0", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_RESERVED_0},\
-    {"START", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_START},\
-    {"TIMESTAMP", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_TIMESTAMP},\
-    {"ep_nih_header_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT}
-
-/*!
- * \name ERSPAN3_FIXED_HDR_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO               0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_COS               1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID           2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O 3
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID        4
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_T                 5
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP         6
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VER               7
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN              8
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT          9
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT \
-    {"BSO", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO},\
-    {"COS", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_COS},\
-    {"GBP_SID", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID},\
-    {"P_FT_HWID_D_GRA_O", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O},\
-    {"SESSION_ID", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID},\
-    {"T", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_T},\
-    {"TIMESTAMP", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP},\
-    {"VER", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VER},\
-    {"VLAN", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN},\
-    {"erspan3_fixed_hdr_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT}
-
-/*!
- * \name ERSPAN3_SUBHDR_5_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID 0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID     1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID   2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP   3
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT          4
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT \
-    {"PLATFORM_ID", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID},\
-    {"PORT_ID", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID},\
-    {"SWITCH_ID", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID},\
-    {"TIMESTAMP", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP},\
-    {"erspan3_subhdr_5_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT}
-
-/*!
- * \name ESP_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ESP_T_NEXT_HEADER 0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ESP_T_PAD         1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ESP_T_PAD_LEN     2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ESP_T_SEQ_NUM     3
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ESP_T_SPI         4
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ESP_T_FID_COUNT          5
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ESP_T_FIELD_NAME_MAP_INIT \
-    {"NEXT_HEADER", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ESP_T_NEXT_HEADER},\
-    {"PAD", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ESP_T_PAD},\
-    {"PAD_LEN", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ESP_T_PAD_LEN},\
-    {"SEQ_NUM", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ESP_T_SEQ_NUM},\
-    {"SPI", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ESP_T_SPI},\
-    {"esp_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ESP_T_FID_COUNT}
-
-/*!
- * \name ETAG_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ETAG_T_TAG  0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ETAG_T_TPID 1
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ETAG_T_FID_COUNT          2
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ETAG_T_FIELD_NAME_MAP_INIT \
-    {"TAG", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ETAG_T_TAG},\
-    {"TPID", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ETAG_T_TPID},\
-    {"etag_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ETAG_T_FID_COUNT}
-
-/*!
- * \name ETHERTYPE_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ETHERTYPE_T_TYPE 0
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ETHERTYPE_T_FID_COUNT          1
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT \
-    {"TYPE", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ETHERTYPE_T_TYPE},\
-    {"ethertype_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ETHERTYPE_T_FID_COUNT}
-
-/*!
- * \name FRAG_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_FRAG_T_FRAG_INFO   0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_FRAG_T_ID          1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_FRAG_T_NEXT_HEADER 2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_FRAG_T_RESERVED    3
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_FRAG_T_FID_COUNT          4
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_FRAG_T_FIELD_NAME_MAP_INIT \
-    {"FRAG_INFO", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_FRAG_T_FRAG_INFO},\
-    {"ID", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_FRAG_T_ID},\
-    {"NEXT_HEADER", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_FRAG_T_NEXT_HEADER},\
-    {"RESERVED", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_FRAG_T_RESERVED},\
-    {"frag_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_FRAG_T_FID_COUNT}
-
-/*!
- * \name GENERIC_LOOPBACK_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ    0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE   1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ        2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_FLAGS              3
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE        4
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY     5
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL     6
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ      7
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0  8
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1  9
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ            10
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1         11
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_2         12
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT 13
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE         14
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT          15
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT \
-    {"DESTINATION_OBJ", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ},\
-    {"DESTINATION_TYPE", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE},\
-    {"ENTROPY_OBJ", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ},\
-    {"FLAGS", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_FLAGS},\
-    {"HEADER_TYPE", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE},\
-    {"INPUT_PRIORITY", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY},\
-    {"INTERFACE_CTRL", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL},\
-    {"INTERFACE_OBJ", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ},\
-    {"PROCESSING_CTRL_0", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0},\
-    {"PROCESSING_CTRL_1", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1},\
-    {"QOS_OBJ", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ},\
-    {"RESERVED_1", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1},\
-    {"RESERVED_2", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_2},\
-    {"SOURCE_SYSTEM_PORT", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT},\
-    {"START_BYTE", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE},\
-    {"generic_loopback_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT}
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NO_OP       0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2_OIF      1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED    2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__VP          3
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP        4
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NHOP        5
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2MC_GROUP  6
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L3MC_GROUP  7
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED_1  8
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP_MEMBER 9
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__DEVICE_PORT 10
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_TYPE__TUNNEL  0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_TYPE__GENERIC 1
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__NOOP   0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__VFI    1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__L3_IIF 2
-
-/*!
- * \name GPE_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GPE_T_FLAGS         0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GPE_T_NEXT_PROTOCOL 1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GPE_T_RESERVED0     2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GPE_T_RESERVED1     3
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GPE_T_VNI           4
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GPE_T_FID_COUNT          5
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GPE_T_FIELD_NAME_MAP_INIT \
-    {"FLAGS", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GPE_T_FLAGS},\
-    {"NEXT_PROTOCOL", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GPE_T_NEXT_PROTOCOL},\
-    {"RESERVED0", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GPE_T_RESERVED0},\
-    {"RESERVED1", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GPE_T_RESERVED1},\
-    {"VNI", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GPE_T_VNI},\
-    {"gpe_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GPE_T_FID_COUNT}
-
-/*!
- * \name GRE_CHKSUM_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_CHKSUM_T_CHECKSUM 0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_CHKSUM_T_OFFSET   1
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT          2
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_CHKSUM_T_FIELD_NAME_MAP_INIT \
-    {"CHECKSUM", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_CHKSUM_T_CHECKSUM},\
-    {"OFFSET", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_CHKSUM_T_OFFSET},\
-    {"gre_chksum_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT}
-
-/*!
- * \name GRE_KEY_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_KEY_T_KEY 0
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_KEY_T_FID_COUNT          1
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_KEY_T_FIELD_NAME_MAP_INIT \
-    {"KEY", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_KEY_T_KEY},\
-    {"gre_key_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_KEY_T_FID_COUNT}
-
-/*!
- * \name GRE_ROUT_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_ROUT_T_ROUTING 0
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_ROUT_T_FID_COUNT          1
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_ROUT_T_FIELD_NAME_MAP_INIT \
-    {"ROUTING", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_ROUT_T_ROUTING},\
-    {"gre_rout_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_ROUT_T_FID_COUNT}
-
-/*!
- * \name GRE_SEQ_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_SEQ_T_SEQUENCE 0
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_SEQ_T_FID_COUNT          1
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_SEQ_T_FIELD_NAME_MAP_INIT \
-    {"SEQUENCE", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_SEQ_T_SEQUENCE},\
-    {"gre_seq_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_SEQ_T_FID_COUNT}
-
-/*!
- * \name GRE_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_T_C_R_K_S  0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_T_PROTOCOL 1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_T_RESERVED 2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_T_VERSION  3
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_T_FID_COUNT          4
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_T_FIELD_NAME_MAP_INIT \
-    {"C_R_K_S", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_T_C_R_K_S},\
-    {"PROTOCOL", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_T_PROTOCOL},\
-    {"RESERVED", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_T_RESERVED},\
-    {"VERSION", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_T_VERSION},\
-    {"gre_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_T_FID_COUNT}
-
-/*!
- * \name HG3_BASE_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_CN                      0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_CNG                     1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_ENTROPY                 2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_EXT_HDR_PRESENT         3
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_HG3_RESERVED            4
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_L3_ROUTED               5
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_MIRROR_COPY             6
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_RESERVED_ETYPE          7
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION      8
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION_TYPE 9
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_SYSTEM_SOURCE           10
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_TC                      11
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_VERSION                 12
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_FID_COUNT          13
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_FIELD_NAME_MAP_INIT \
-    {"CN", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_CN},\
-    {"CNG", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_CNG},\
-    {"ENTROPY", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_ENTROPY},\
-    {"EXT_HDR_PRESENT", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_EXT_HDR_PRESENT},\
-    {"HG3_RESERVED", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_HG3_RESERVED},\
-    {"L3_ROUTED", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_L3_ROUTED},\
-    {"MIRROR_COPY", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_MIRROR_COPY},\
-    {"RESERVED_ETYPE", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_RESERVED_ETYPE},\
-    {"SYSTEM_DESTINATION", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION},\
-    {"SYSTEM_DESTINATION_TYPE", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION_TYPE},\
-    {"SYSTEM_SOURCE", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_SYSTEM_SOURCE},\
-    {"TC", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_TC},\
-    {"VERSION", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_VERSION},\
-    {"hg3_base_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_FID_COUNT}
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__NO_OP       0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__L2_OIF      1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__RESERVED    2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__VP          3
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__ECMP        4
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__NHOP        5
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__L2MC_GROUP  6
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__L3MC_GROUP  7
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__RESERVED_1  8
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__ECMP_MEMBER 9
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__DEVICE_PORT 10
-
-/*!
- * \name HG3_EXTENSION_0_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_LSB      0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_MSB      1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_EXTENSION_0_T_DVP_OR_L3_IIF     2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_EXTENSION_0_T_FLAGS             3
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_EXTENSION_0_T_FORWARDING_DOMAIN 4
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_EXTENSION_0_T_SVP               5
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT          6
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_EXTENSION_0_T_FIELD_NAME_MAP_INIT \
-    {"CLASS_ID_LSB", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_LSB},\
-    {"CLASS_ID_MSB", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_MSB},\
-    {"DVP_OR_L3_IIF", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_EXTENSION_0_T_DVP_OR_L3_IIF},\
-    {"FLAGS", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_EXTENSION_0_T_FLAGS},\
-    {"FORWARDING_DOMAIN", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_EXTENSION_0_T_FORWARDING_DOMAIN},\
-    {"SVP", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_EXTENSION_0_T_SVP},\
-    {"hg3_extension_0_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT}
-
-/*!
- * \name HOP_BY_HOP_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HOP_BY_HOP_T_HDR_EXT_LEN 0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HOP_BY_HOP_T_NEXT_HEADER 1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HOP_BY_HOP_T_OPTION      2
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT          3
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HOP_BY_HOP_T_FIELD_NAME_MAP_INIT \
-    {"HDR_EXT_LEN", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HOP_BY_HOP_T_HDR_EXT_LEN},\
-    {"NEXT_HEADER", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HOP_BY_HOP_T_NEXT_HEADER},\
-    {"OPTION", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HOP_BY_HOP_T_OPTION},\
-    {"hop_by_hop_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT}
-
-/*!
- * \name ICMP_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ICMP_T_CHECKSUM  0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ICMP_T_CODE      1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ICMP_T_ICMP_TYPE 2
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ICMP_T_FID_COUNT          3
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT \
-    {"CHECKSUM", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ICMP_T_CHECKSUM},\
-    {"CODE", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ICMP_T_CODE},\
-    {"ICMP_TYPE", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ICMP_T_ICMP_TYPE},\
-    {"icmp_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ICMP_T_FID_COUNT}
-
-/*!
- * \name IFA_FLEX_MD_0_A_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_0_A_T_FWD_HDR_TTL   0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_0_A_T_LNS_DEVICE_ID 1
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT          2
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_0_A_T_FIELD_NAME_MAP_INIT \
-    {"FWD_HDR_TTL", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_0_A_T_FWD_HDR_TTL},\
-    {"LNS_DEVICE_ID", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_0_A_T_LNS_DEVICE_ID},\
-    {"ifa_flex_md_0_a_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT}
-
-/*!
- * \name IFA_FLEX_MD_0_B_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_0_B_T_CN               0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_0_B_T_PORT_SPEED       1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_0_B_T_QUEUE_ID         2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_0_B_T_RX_TIMESTAMP_SEC 3
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT          4
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_0_B_T_FIELD_NAME_MAP_INIT \
-    {"CN", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_0_B_T_CN},\
-    {"PORT_SPEED", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_0_B_T_PORT_SPEED},\
-    {"QUEUE_ID", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_0_B_T_QUEUE_ID},\
-    {"RX_TIMESTAMP_SEC", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_0_B_T_RX_TIMESTAMP_SEC},\
-    {"ifa_flex_md_0_b_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT}
-
-/*!
- * \name IFA_FLEX_MD_1_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_1_T_EGRESS_PORT_ID       0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_1_T_INGRESS_PORT_ID      1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_1_T_RX_TIMESTAMP_NANOSEC 2
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT          3
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_1_T_FIELD_NAME_MAP_INIT \
-    {"EGRESS_PORT_ID", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_1_T_EGRESS_PORT_ID},\
-    {"INGRESS_PORT_ID", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_1_T_INGRESS_PORT_ID},\
-    {"RX_TIMESTAMP_NANOSEC", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_1_T_RX_TIMESTAMP_NANOSEC},\
-    {"ifa_flex_md_1_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT}
-
-/*!
- * \name IFA_FLEX_MD_2_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_2_T_RESIDENCE_TIME_NANOSEC 0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_2_T_TX_QUEUE_BYTE_COUNT    1
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT          2
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_2_T_FIELD_NAME_MAP_INIT \
-    {"RESIDENCE_TIME_NANOSEC", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_2_T_RESIDENCE_TIME_NANOSEC},\
-    {"TX_QUEUE_BYTE_COUNT", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_2_T_TX_QUEUE_BYTE_COUNT},\
-    {"ifa_flex_md_2_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT}
-
-/*!
- * \name IFA_FLEX_MD_3_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_3_T_MMU_STAT_0 0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_3_T_MMU_STAT_1 1
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT          2
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_3_T_FIELD_NAME_MAP_INIT \
-    {"MMU_STAT_0", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_3_T_MMU_STAT_0},\
-    {"MMU_STAT_1", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_3_T_MMU_STAT_1},\
-    {"ifa_flex_md_3_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT}
-
-/*!
- * \name IFA_HEADER_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_HEADER_T_FLAGS      0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_HEADER_T_GNS        1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_HEADER_T_MAX_LENGTH 2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_HEADER_T_NEXT_HDR   3
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_HEADER_T_VER        4
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_HEADER_T_FID_COUNT          5
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_HEADER_T_FIELD_NAME_MAP_INIT \
-    {"FLAGS", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_HEADER_T_FLAGS},\
-    {"GNS", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_HEADER_T_GNS},\
-    {"MAX_LENGTH", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_HEADER_T_MAX_LENGTH},\
-    {"NEXT_HDR", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_HEADER_T_NEXT_HDR},\
-    {"VER", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_HEADER_T_VER},\
-    {"ifa_header_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_HEADER_T_FID_COUNT}
-
-/*!
- * \name IFA_MD_BASE_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_MD_BASE_T_ACTION_VECTOR            0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_MD_BASE_T_HOP_LIMIT_CURRENT_LENGTH 1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_MD_BASE_T_REQUEST_VECTOR           2
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_MD_BASE_T_FID_COUNT          3
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_MD_BASE_T_FIELD_NAME_MAP_INIT \
-    {"ACTION_VECTOR", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_MD_BASE_T_ACTION_VECTOR},\
-    {"HOP_LIMIT_CURRENT_LENGTH", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_MD_BASE_T_HOP_LIMIT_CURRENT_LENGTH},\
-    {"REQUEST_VECTOR", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_MD_BASE_T_REQUEST_VECTOR},\
-    {"ifa_md_base_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_MD_BASE_T_FID_COUNT}
-
-/*!
- * \name IFA_METADATA_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_METADATA_T_ACTION_VECTOR            0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_METADATA_T_HOP_LIMIT_CURRENT_LENGTH 1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_METADATA_T_METADATA                 2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_METADATA_T_REQUEST_VECTOR           3
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_METADATA_T_FID_COUNT          4
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_METADATA_T_FIELD_NAME_MAP_INIT \
-    {"ACTION_VECTOR", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_METADATA_T_ACTION_VECTOR},\
-    {"HOP_LIMIT_CURRENT_LENGTH", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_METADATA_T_HOP_LIMIT_CURRENT_LENGTH},\
-    {"METADATA", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_METADATA_T_METADATA},\
-    {"REQUEST_VECTOR", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_METADATA_T_REQUEST_VECTOR},\
-    {"ifa_metadata_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_METADATA_T_FID_COUNT}
-
-/*!
- * \name IGMP_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IGMP_T_CHECKSUM      0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IGMP_T_GROUP_ADDRESS 1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IGMP_T_IGMP_TYPE     2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IGMP_T_MAX_RESP_TIME 3
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IGMP_T_FID_COUNT          4
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IGMP_T_FIELD_NAME_MAP_INIT \
-    {"CHECKSUM", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IGMP_T_CHECKSUM},\
-    {"GROUP_ADDRESS", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IGMP_T_GROUP_ADDRESS},\
-    {"IGMP_TYPE", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IGMP_T_IGMP_TYPE},\
-    {"MAX_RESP_TIME", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IGMP_T_MAX_RESP_TIME},\
-    {"igmp_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IGMP_T_FID_COUNT}
-
-/*!
- * \name IPFIX_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPFIX_T_EXPORT_TIME   0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPFIX_T_LENGTH        1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPFIX_T_OBS_DOMAIN_ID 2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPFIX_T_SEQUENCE_NUM  3
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPFIX_T_VERSION       4
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPFIX_T_FID_COUNT          5
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT \
-    {"EXPORT_TIME", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPFIX_T_EXPORT_TIME},\
-    {"LENGTH", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPFIX_T_LENGTH},\
-    {"OBS_DOMAIN_ID", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPFIX_T_OBS_DOMAIN_ID},\
-    {"SEQUENCE_NUM", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPFIX_T_SEQUENCE_NUM},\
-    {"VERSION", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPFIX_T_VERSION},\
-    {"ipfix_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPFIX_T_FID_COUNT}
-
-/*!
- * \name IPV4_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV4_T_DA                0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET 1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV4_T_HDR_CHECKSUM      2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV4_T_ID                3
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV4_T_OPTION            4
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV4_T_PROTOCOL          5
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV4_T_SA                6
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV4_T_TOS               7
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV4_T_TOTAL_LENGTH      8
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV4_T_TTL               9
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV4_T_VERSION_HDR_LEN   10
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV4_T_FID_COUNT          11
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT \
-    {"DA", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV4_T_DA},\
-    {"FLAGS_FRAG_OFFSET", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET},\
-    {"HDR_CHECKSUM", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV4_T_HDR_CHECKSUM},\
-    {"ID", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV4_T_ID},\
-    {"OPTION", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV4_T_OPTION},\
-    {"PROTOCOL", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV4_T_PROTOCOL},\
-    {"SA", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV4_T_SA},\
-    {"TOS", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV4_T_TOS},\
-    {"TOTAL_LENGTH", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV4_T_TOTAL_LENGTH},\
-    {"TTL", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV4_T_TTL},\
-    {"VERSION_HDR_LEN", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV4_T_VERSION_HDR_LEN},\
-    {"ipv4_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV4_T_FID_COUNT}
-
-/*!
- * \name IPV6_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV6_T_DA             0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV6_T_FLOW_LABEL     1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV6_T_HOP_LIMIT      2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV6_T_NEXT_HEADER    3
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV6_T_PAYLOAD_LENGTH 4
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV6_T_SA             5
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV6_T_TRAFFIC_CLASS  6
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV6_T_VERSION        7
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV6_T_FID_COUNT          8
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT \
-    {"DA", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV6_T_DA},\
-    {"FLOW_LABEL", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV6_T_FLOW_LABEL},\
-    {"HOP_LIMIT", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV6_T_HOP_LIMIT},\
-    {"NEXT_HEADER", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV6_T_NEXT_HEADER},\
-    {"PAYLOAD_LENGTH", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV6_T_PAYLOAD_LENGTH},\
-    {"SA", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV6_T_SA},\
-    {"TRAFFIC_CLASS", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV6_T_TRAFFIC_CLASS},\
-    {"VERSION", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV6_T_VERSION},\
-    {"ipv6_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV6_T_FID_COUNT}
-
-/*!
- * \name L2_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_L2_T_MACDA 0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_L2_T_MACSA 1
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_L2_T_FID_COUNT          2
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_L2_T_FIELD_NAME_MAP_INIT \
-    {"MACDA", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_L2_T_MACDA},\
-    {"MACSA", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_L2_T_MACSA},\
-    {"l2_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_L2_T_FID_COUNT}
-
-/*!
- * \name MIRROR_ERSPAN_SN_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM 0
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT          1
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT \
-    {"SEQ_NUM", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM},\
-    {"mirror_erspan_sn_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT}
-
-/*!
- * \name MIRROR_TRANSPORT_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MIRROR_TRANSPORT_T_DATA 0
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT          1
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT \
-    {"DATA", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MIRROR_TRANSPORT_T_DATA},\
-    {"mirror_transport_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT}
-
-/*!
- * \name MPLS_ACH_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_ACH_T_CHANNEL_TYPE 0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_ACH_T_CW_TYPE      1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_ACH_T_RESERVED     2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_ACH_T_VERSION      3
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_ACH_T_FID_COUNT          4
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_ACH_T_FIELD_NAME_MAP_INIT \
-    {"CHANNEL_TYPE", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_ACH_T_CHANNEL_TYPE},\
-    {"CW_TYPE", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_ACH_T_CW_TYPE},\
-    {"RESERVED", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_ACH_T_RESERVED},\
-    {"VERSION", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_ACH_T_VERSION},\
-    {"mpls_ach_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_ACH_T_FID_COUNT}
-
-/*!
- * \name MPLS_BV_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_BV_T_VALUE 0
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_BV_T_FID_COUNT          1
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_BV_T_FIELD_NAME_MAP_INIT \
-    {"VALUE", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_BV_T_VALUE},\
-    {"mpls_bv_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_BV_T_FID_COUNT}
-
-/*!
- * \name MPLS_CW_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_CW_T_CW_TYPE    0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_CW_T_RESERVED   1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_CW_T_SEQ_NUMBER 2
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_CW_T_FID_COUNT          3
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_CW_T_FIELD_NAME_MAP_INIT \
-    {"CW_TYPE", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_CW_T_CW_TYPE},\
-    {"RESERVED", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_CW_T_RESERVED},\
-    {"SEQ_NUMBER", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_CW_T_SEQ_NUMBER},\
-    {"mpls_cw_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_CW_T_FID_COUNT}
-
-/*!
- * \name MPLS_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_T_BOS   0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_T_EXP   1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_T_LABEL 2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_T_TTL   3
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_T_FID_COUNT          4
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_T_FIELD_NAME_MAP_INIT \
-    {"BOS", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_T_BOS},\
-    {"EXP", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_T_EXP},\
-    {"LABEL", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_T_LABEL},\
-    {"TTL", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_T_TTL},\
-    {"mpls_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_T_FID_COUNT}
-
-/*!
- * \name P_1588_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_P_1588_T_CNTRL          0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_P_1588_T_CORRECTION     1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_P_1588_T_DOMAIN_NB      2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_P_1588_T_FLAGS          3
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_P_1588_T_LOGMSGINTERVAL 4
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_P_1588_T_MSG_LENGTH     5
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_P_1588_T_MSG_TYPE       6
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_P_1588_T_RESERVED1      7
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_P_1588_T_RESERVED2      8
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_P_1588_T_RESERVED3      9
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_P_1588_T_SEQ_ID         10
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_P_1588_T_SRCPORTID      11
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_P_1588_T_TRANSPORTSPEC  12
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_P_1588_T_VERSION        13
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_P_1588_T_FID_COUNT          14
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_P_1588_T_FIELD_NAME_MAP_INIT \
-    {"CNTRL", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_P_1588_T_CNTRL},\
-    {"CORRECTION", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_P_1588_T_CORRECTION},\
-    {"DOMAIN_NB", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_P_1588_T_DOMAIN_NB},\
-    {"FLAGS", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_P_1588_T_FLAGS},\
-    {"LOGMSGINTERVAL", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_P_1588_T_LOGMSGINTERVAL},\
-    {"MSG_LENGTH", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_P_1588_T_MSG_LENGTH},\
-    {"MSG_TYPE", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_P_1588_T_MSG_TYPE},\
-    {"RESERVED1", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_P_1588_T_RESERVED1},\
-    {"RESERVED2", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_P_1588_T_RESERVED2},\
-    {"RESERVED3", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_P_1588_T_RESERVED3},\
-    {"SEQ_ID", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_P_1588_T_SEQ_ID},\
-    {"SRCPORTID", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_P_1588_T_SRCPORTID},\
-    {"TRANSPORTSPEC", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_P_1588_T_TRANSPORTSPEC},\
-    {"VERSION", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_P_1588_T_VERSION},\
-    {"p_1588_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_P_1588_T_FID_COUNT}
-
-/*!
- * \name PIM_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PIM_T_HDR_BYTES_0_1 0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PIM_T_HDR_BYTES_2_3 1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PIM_T_HDR_BYTES_4_5 2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PIM_T_HDR_BYTES_6_7 3
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PIM_T_FID_COUNT          4
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PIM_T_FIELD_NAME_MAP_INIT \
-    {"HDR_BYTES_0_1", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PIM_T_HDR_BYTES_0_1},\
-    {"HDR_BYTES_2_3", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PIM_T_HDR_BYTES_2_3},\
-    {"HDR_BYTES_4_5", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PIM_T_HDR_BYTES_4_5},\
-    {"HDR_BYTES_6_7", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PIM_T_HDR_BYTES_6_7},\
-    {"pim_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PIM_T_FID_COUNT}
-
-/*!
- * \name PROG_EXT_HDR_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PROG_EXT_HDR_T_HDR_EXT_LEN 0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PROG_EXT_HDR_T_NEXT_HEADER 1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PROG_EXT_HDR_T_OPTION      2
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT          3
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PROG_EXT_HDR_T_FIELD_NAME_MAP_INIT \
-    {"HDR_EXT_LEN", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PROG_EXT_HDR_T_HDR_EXT_LEN},\
-    {"NEXT_HEADER", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PROG_EXT_HDR_T_NEXT_HEADER},\
-    {"OPTION", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PROG_EXT_HDR_T_OPTION},\
-    {"prog_ext_hdr_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT}
-
-/*!
- * \name PSAMP_0_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_0_T_FLOWSET        0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_0_T_LENGTH         1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_0_T_NEXT_HOP_INDEX 2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_0_T_OBS_TIME_NS    3
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_0_T_OBS_TIME_S     4
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_0_T_TEMPLATE_ID    5
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_0_T_FID_COUNT          6
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_0_T_FIELD_NAME_MAP_INIT \
-    {"FLOWSET", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_0_T_FLOWSET},\
-    {"LENGTH", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_0_T_LENGTH},\
-    {"NEXT_HOP_INDEX", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_0_T_NEXT_HOP_INDEX},\
-    {"OBS_TIME_NS", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_0_T_OBS_TIME_NS},\
-    {"OBS_TIME_S", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_0_T_OBS_TIME_S},\
-    {"TEMPLATE_ID", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_0_T_TEMPLATE_ID},\
-    {"psamp_0_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_0_T_FID_COUNT}
-
-/*!
- * \name PSAMP_1_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_1_T_DLB_ID         0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_1_T_EGRESS_PORT    1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_1_T_EPOCH          2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_1_T_INGRESS_PORT   3
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_1_T_SAMPLED_LENGTH 4
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_1_T_USER_META_DATA 5
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_1_T_VARIABLE_FLAG  6
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_1_T_FID_COUNT          7
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_1_T_FIELD_NAME_MAP_INIT \
-    {"DLB_ID", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_1_T_DLB_ID},\
-    {"EGRESS_PORT", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_1_T_EGRESS_PORT},\
-    {"EPOCH", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_1_T_EPOCH},\
-    {"INGRESS_PORT", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_1_T_INGRESS_PORT},\
-    {"SAMPLED_LENGTH", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_1_T_SAMPLED_LENGTH},\
-    {"USER_META_DATA", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_1_T_USER_META_DATA},\
-    {"VARIABLE_FLAG", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_1_T_VARIABLE_FLAG},\
-    {"psamp_1_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_1_T_FID_COUNT}
-
-/*!
- * \name PSAMP_MIRROR_ON_DROP_0_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT 0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT    1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH          2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS     3
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S      4
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID       5
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID     6
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT          7
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT \
-    {"EGRESS_MOD_PORT", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT},\
-    {"INGRESS_PORT", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT},\
-    {"LENGTH", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH},\
-    {"OBS_TIME_NS", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS},\
-    {"OBS_TIME_S", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S},\
-    {"SWITCH_ID", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID},\
-    {"TEMPLATE_ID", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID},\
-    {"psamp_mirror_on_drop_0_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT}
-
-/*!
- * \name PSAMP_MIRROR_ON_DROP_3_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_DROP_REASON             0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_RESERVED_0              1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SAMPLED_LENGTH          2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SMOD_STATE              3
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_UC_COS__COLOR__PROB_IDX 4
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_USER_META_DATA          5
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_VAR_LEN_INDICATOR       6
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT          7
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FIELD_NAME_MAP_INIT \
-    {"DROP_REASON", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_DROP_REASON},\
-    {"RESERVED_0", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_RESERVED_0},\
-    {"SAMPLED_LENGTH", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SAMPLED_LENGTH},\
-    {"SMOD_STATE", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SMOD_STATE},\
-    {"UC_COS__COLOR__PROB_IDX", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_UC_COS__COLOR__PROB_IDX},\
-    {"USER_META_DATA", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_USER_META_DATA},\
-    {"VAR_LEN_INDICATOR", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_VAR_LEN_INDICATOR},\
-    {"psamp_mirror_on_drop_3_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT}
-
-/*!
- * \name RARP_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RARP_T_HARDWARE_LEN  0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RARP_T_HARDWARE_TYPE 1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RARP_T_OPERATION     2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RARP_T_PROT_ADDR_LEN 3
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RARP_T_PROTOCOL_TYPE 4
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RARP_T_SENDER_HA     5
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RARP_T_SENDER_IP     6
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RARP_T_TARGET_HA     7
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RARP_T_TARGET_IP     8
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RARP_T_FID_COUNT          9
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT \
-    {"HARDWARE_LEN", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RARP_T_HARDWARE_LEN},\
-    {"HARDWARE_TYPE", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RARP_T_HARDWARE_TYPE},\
-    {"OPERATION", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RARP_T_OPERATION},\
-    {"PROT_ADDR_LEN", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RARP_T_PROT_ADDR_LEN},\
-    {"PROTOCOL_TYPE", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RARP_T_PROTOCOL_TYPE},\
-    {"SENDER_HA", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RARP_T_SENDER_HA},\
-    {"SENDER_IP", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RARP_T_SENDER_IP},\
-    {"TARGET_HA", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RARP_T_TARGET_HA},\
-    {"TARGET_IP", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RARP_T_TARGET_IP},\
-    {"rarp_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RARP_T_FID_COUNT}
-
-/*!
- * \name ROUTING_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ROUTING_T_DATA          0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ROUTING_T_HDR_EXT_LEN   1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ROUTING_T_NEXT_HEADER   2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ROUTING_T_ROUTING_TYPE  3
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ROUTING_T_SEGMENTS_LEFT 4
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ROUTING_T_FID_COUNT          5
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ROUTING_T_FIELD_NAME_MAP_INIT \
-    {"DATA", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ROUTING_T_DATA},\
-    {"HDR_EXT_LEN", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ROUTING_T_HDR_EXT_LEN},\
-    {"NEXT_HEADER", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ROUTING_T_NEXT_HEADER},\
-    {"ROUTING_TYPE", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ROUTING_T_ROUTING_TYPE},\
-    {"SEGMENTS_LEFT", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ROUTING_T_SEGMENTS_LEFT},\
-    {"routing_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ROUTING_T_FID_COUNT}
-
-/*!
- * \name RSPAN_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RSPAN_T_TAG  0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RSPAN_T_TPID 1
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RSPAN_T_FID_COUNT          2
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RSPAN_T_FIELD_NAME_MAP_INIT \
-    {"TAG", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RSPAN_T_TAG},\
-    {"TPID", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RSPAN_T_TPID},\
-    {"rspan_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RSPAN_T_FID_COUNT}
-
-/*!
- * \name SFLOW_SHIM_0_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_0_T_SYS_DESTINATION 0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_0_T_SYS_SOURCE      1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_0_T_VERSION         2
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT          3
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_0_T_FIELD_NAME_MAP_INIT \
-    {"SYS_DESTINATION", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_0_T_SYS_DESTINATION},\
-    {"SYS_SOURCE", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_0_T_SYS_SOURCE},\
-    {"VERSION", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_0_T_VERSION},\
-    {"sflow_shim_0_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT}
-
-/*!
- * \name SFLOW_SHIM_1_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DEST_SAMPLE 0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DISCARDED   1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_FLEX_SAMPLE 2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_MCAST       3
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_SRC_SAMPLE  4
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_TRUNCATED   5
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_1_T_RESERVED         6
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_1_T_SYS_OPCODE       7
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT          8
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_1_T_FIELD_NAME_MAP_INIT \
-    {"FLAG_DEST_SAMPLE", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DEST_SAMPLE},\
-    {"FLAG_DISCARDED", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DISCARDED},\
-    {"FLAG_FLEX_SAMPLE", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_FLEX_SAMPLE},\
-    {"FLAG_MCAST", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_MCAST},\
-    {"FLAG_SRC_SAMPLE", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_SRC_SAMPLE},\
-    {"FLAG_TRUNCATED", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_TRUNCATED},\
-    {"RESERVED", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_1_T_RESERVED},\
-    {"SYS_OPCODE", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_1_T_SYS_OPCODE},\
-    {"sflow_shim_1_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT}
-
-/*!
- * \name SFLOW_SHIM_2_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_2_T_SEQUENCE_NUM   0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_2_T_USER_META_DATA 1
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT          2
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_2_T_FIELD_NAME_MAP_INIT \
-    {"SEQUENCE_NUM", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_2_T_SEQUENCE_NUM},\
-    {"USER_META_DATA", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_2_T_USER_META_DATA},\
-    {"sflow_shim_2_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT}
-
-/*!
- * \name SNAP_LLC_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SNAP_LLC_T_LENGTH   0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SNAP_LLC_T_SNAP_LLC 1
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SNAP_LLC_T_FID_COUNT          2
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SNAP_LLC_T_FIELD_NAME_MAP_INIT \
-    {"LENGTH", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SNAP_LLC_T_LENGTH},\
-    {"SNAP_LLC", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SNAP_LLC_T_SNAP_LLC},\
-    {"snap_llc_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SNAP_LLC_T_FID_COUNT}
-
-/*!
- * \name SVTAG_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SVTAG_T_DATA_LWR 0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SVTAG_T_DATA_UPR 1
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SVTAG_T_FID_COUNT          2
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SVTAG_T_FIELD_NAME_MAP_INIT \
-    {"DATA_LWR", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SVTAG_T_DATA_LWR},\
-    {"DATA_UPR", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SVTAG_T_DATA_UPR},\
-    {"svtag_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SVTAG_T_FID_COUNT}
-
-/*!
- * \name TCP_FIRST_4BYTES_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT 0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT 1
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT          2
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT \
-    {"DST_PORT", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT},\
-    {"SRC_PORT", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT},\
-    {"tcp_first_4bytes_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT}
-
-/*!
- * \name TCP_LAST_16BYTES_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM           0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM          1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS 2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM           3
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR        4
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE          5
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT          6
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT \
-    {"ACK_NUM", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM},\
-    {"CHECKSUM", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM},\
-    {"HDR_LEN_AND_FLAGS", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS},\
-    {"SEQ_NUM", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM},\
-    {"URGENT_PTR", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR},\
-    {"WIN_SIZE", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE},\
-    {"tcp_last_16bytes_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT}
-
-/*!
- * \name UDP_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UDP_T_CHECKSUM   0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UDP_T_DST_PORT   1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UDP_T_SRC_PORT   2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UDP_T_UDP_LENGTH 3
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UDP_T_FID_COUNT          4
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT \
-    {"CHECKSUM", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UDP_T_CHECKSUM},\
-    {"DST_PORT", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UDP_T_DST_PORT},\
-    {"SRC_PORT", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UDP_T_SRC_PORT},\
-    {"UDP_LENGTH", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UDP_T_UDP_LENGTH},\
-    {"udp_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UDP_T_FID_COUNT}
-
-/*!
- * \name UNKNOWN_L3_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD 0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD  1
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT          2
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT \
-    {"FIRST_16BYTES_OF_L3_PAYLOAD", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD},\
-    {"NEXT_16BYTES_OF_L3_PAYLOAD", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD},\
-    {"unknown_l3_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT}
-
-/*!
- * \name UNKNOWN_L4_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD 0
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT          1
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT \
-    {"FIRST_4BYTES_OF_L4_PAYLOAD", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD},\
-    {"unknown_l4_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT}
-
-/*!
- * \name UNKNOWN_L5_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1 0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3 1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7 2
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT          3
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT \
-    {"L5_BYTES_0_1", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1},\
-    {"L5_BYTES_2_3", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3},\
-    {"L5_BYTES_4_7", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7},\
-    {"unknown_l5_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT}
-
-/*!
- * \name VLAN_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VLAN_T_CFI  0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VLAN_T_PCP  1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VLAN_T_TPID 2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VLAN_T_VID  3
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VLAN_T_FID_COUNT          4
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT \
-    {"CFI", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VLAN_T_CFI},\
-    {"PCP", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VLAN_T_PCP},\
-    {"TPID", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VLAN_T_TPID},\
-    {"VID", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VLAN_T_VID},\
-    {"vlan_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VLAN_T_FID_COUNT}
-
-/*!
- * \name VNTAG_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VNTAG_T_TAG  0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VNTAG_T_TPID 1
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VNTAG_T_FID_COUNT          2
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VNTAG_T_FIELD_NAME_MAP_INIT \
-    {"TAG", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VNTAG_T_TAG},\
-    {"TPID", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VNTAG_T_TPID},\
-    {"vntag_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VNTAG_T_FID_COUNT}
-
-/*!
- * \name VXLAN_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VXLAN_T_FLAGS_RESERVED_1 0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VXLAN_T_RESERVED2        1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VXLAN_T_VN_ID            2
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VXLAN_T_FID_COUNT          3
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT \
-    {"FLAGS_RESERVED_1", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VXLAN_T_FLAGS_RESERVED_1},\
-    {"RESERVED2", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VXLAN_T_RESERVED2},\
-    {"VN_ID", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VXLAN_T_VN_ID},\
-    {"vxlan_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VXLAN_T_FID_COUNT}
-
-/*!
- * \name WESP_T field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_WESP_T_FLAGS       0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_WESP_T_HEADER_LEN  1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_WESP_T_NEXT_HEADER 2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_WESP_T_SEQ_NUM     3
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_WESP_T_SPI         4
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_WESP_T_TRAILER_LEN 5
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_WESP_T_WESP_IV     6
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_WESP_T_FID_COUNT          7
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_WESP_T_FIELD_NAME_MAP_INIT \
-    {"FLAGS", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_WESP_T_FLAGS},\
-    {"HEADER_LEN", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_WESP_T_HEADER_LEN},\
-    {"NEXT_HEADER", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_WESP_T_NEXT_HEADER},\
-    {"SEQ_NUM", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_WESP_T_SEQ_NUM},\
-    {"SPI", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_WESP_T_SPI},\
-    {"TRAILER_LEN", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_WESP_T_TRAILER_LEN},\
-    {"WESP_IV", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_WESP_T_WESP_IV},\
-    {"wesp_t fid count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_WESP_T_FID_COUNT}
-
-
-#endif /* BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_FLEXHDR_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_bcmpkt_rxpmd_flex_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_bcmpkt_rxpmd_flex_data.h
deleted file mode 100644
index 62a3cf94f74f..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_bcmpkt_rxpmd_flex_data.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) map.yml.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_DATA_H
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_DATA_H
-
-/*!
- * \name RX flex metadata field IDs.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_DLB_ECMP_DESTINATION_15_0                                 0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0                                            1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_DVP_15_0                                                  2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_7_0                                         3
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EGR_MTOP_INDEX_HI_3_0                                     4
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EGR_MTOP_INDEX_LO_EP_NIH_DROP_CODE_OR_IFP_OPAQUE_OBJ_15_0 5
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EM_FT_OPAQUE_OBJ_OR_IFP_OPAQUE_OBJ_15_0                   6
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_HIGH_3_0                                    7
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0                                    8
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_15_0                                 9
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_31_16                                10
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_15_0                                   11
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_16                                  12
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32                                  13
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0                                         14
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_IFP_IOAM_GBP_ACTION_3_0                                   15
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_IFP_TO_EP_MACSEC_INFO_OR_IFP_OPAQUE_OBJ_15_0              16
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_IFP_TS_CONTROL_ACTION_3_0                                 17
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_15_0                                        18
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_16                                       19
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_INGRESS_PP_PORT_7_0                                       20
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0            21
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0                               22
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_INT_PRI_3_0                                               23
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_L2_IIF_10_0                                               24
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_L2_OIF_10_0                                               25
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_L3_IIF_13_0                                               26
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0                                             27
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_MPLS_LABEL_DECAP_COUNT_3_0                                28
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0                         29
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_15_0                                         30
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0                                       31
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0                                       32
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_SVP_15_0                                                  33
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0                              34
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0                                   35
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0                                         36
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_SYSTEM_SOURCE_15_0                                        37
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_TIMESTAMP_CTRL_3_0                                        38
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0                           39
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_VFI_15_0                                                  40
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_VLAN_TAG_PRESERVE_CTRL_SVP_MIRROR_ENABLE_1_0              41
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_FID_COUNT                       42
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_COUNT                    46
-
-/*!
- * \name Packet Flex Reason Types.
- */
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS                               0
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED 1
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED                    2
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED  3
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED                     4
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP                                  5
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT                                   6
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IFP                                     7
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER                               8
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED      9
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT                                   10
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP                           11
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS                      12
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE                      13
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP                           14
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS                      15
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR                            16
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF                        17
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR                            18
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL                        19
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD                    20
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0                      21
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1                      22
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2                      23
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3                      24
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4                      25
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5                      26
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6                      27
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7                      28
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD            29
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED              30
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED                  31
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU                    32
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MTOP_IPV4_GATEWAY                       33
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU                          34
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED              35
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT                            36
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_RESERVED_TRACE_BIT                      37
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP                                38
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD         39
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_SVP                                     40
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP                               41
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU                42
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR                     43
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED                       44
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_VFP                                     45
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT \
-    {"CML_FLAGS", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS},\
-    {"DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED},\
-    {"DLB_ECMP_PKT_SAMPLED", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED},\
-    {"DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED},\
-    {"DLB_LAG_PKT_SAMPLED", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED},\
-    {"DST_FP", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP},\
-    {"EM_FT", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT},\
-    {"IFP", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IFP},\
-    {"IFP_METER", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER},\
-    {"IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED},\
-    {"IVXLT", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT},\
-    {"L2_DST_LOOKUP", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP},\
-    {"L2_DST_LOOKUP_MISS", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS},\
-    {"L2_SRC_STATIC_MOVE", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE},\
-    {"L3_DST_LOOKUP", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP},\
-    {"L3_DST_LOOKUP_MISS", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS},\
-    {"L3_HDR_ERROR", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR},\
-    {"L3_IIF_EQ_L3_OIF", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF},\
-    {"L3_TTL_ERROR", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR},\
-    {"LEARN_CACHE_FULL", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL},\
-    {"MACSA_MULTICAST_RSVD", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD},\
-    {"MATCHED_RULE_BIT_0", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0},\
-    {"MATCHED_RULE_BIT_1", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1},\
-    {"MATCHED_RULE_BIT_2", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2},\
-    {"MATCHED_RULE_BIT_3", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3},\
-    {"MATCHED_RULE_BIT_4", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4},\
-    {"MATCHED_RULE_BIT_5", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5},\
-    {"MATCHED_RULE_BIT_6", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6},\
-    {"MATCHED_RULE_BIT_7", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7},\
-    {"MEMBERSHIP_CHECK_FAILED_RSVD", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD},\
-    {"MIRROR_SAMPLER_EGR_SAMPLED", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED},\
-    {"MIRROR_SAMPLER_SAMPLED", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED},\
-    {"MPLS_CTRL_PKT_TO_CPU", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU},\
-    {"MTOP_IPV4_GATEWAY", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MTOP_IPV4_GATEWAY},\
-    {"NO_COPY_TO_CPU", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU},\
-    {"PKT_INTEGRITY_CHECK_FAILED", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED},\
-    {"PROTOCOL_PKT", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT},\
-    {"RESERVED_TRACE_BIT", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_RESERVED_TRACE_BIT},\
-    {"SER_DROP", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP},\
-    {"SPANNING_TREE_CHECK_FAILED_RSVD", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD},\
-    {"SVP", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_SVP},\
-    {"TRACE_DOP", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP},\
-    {"TRACE_DO_NOT_COPY_TO_CPU", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU},\
-    {"TRACE_DO_NOT_MIRROR", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR},\
-    {"URPF_CHECK_FAILED", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED},\
-    {"VFP", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_VFP},\
-    {"flex reason count", BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_COUNT}
-
-#endif /* BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_bcmpkt_rxpmd_match_id_defs.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_bcmpkt_rxpmd_match_id_defs.h
deleted file mode 100644
index 9e921fc797e1..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_bcmpkt_rxpmd_match_id_defs.h
+++ /dev/null
@@ -1,417 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) bcm56780_a0_dna_6_5_30_2_0_sf_match_id_info.yml
- * for device bcm56780_a0 and variant dna_6_5_30_2_0.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H
-
-#include <bcmpkt/bcmpkt_rxpmd_match_id.h>
-
-/*!
- * \brief Get the Match ID DataBase information.
- *
- * \retval bcmpkt_rxpmd_match_id_db_info_t Match ID DataBase information.
-*/
-extern bcmpkt_rxpmd_match_id_db_info_t *
-    bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db_info_get(void);
-
-/*!
- * \brief Get the Match ID Mapping information.
- *
- * \retval bcmpkt_rxpmd_match_id_map_info_t Match ID Mapping information.
-*/
-extern bcmpkt_rxpmd_match_id_map_info_t *
-    bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_map_info_get(void);
-
-/*!
-  \name RXPMD Match IDs
-*/
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ETAG  0
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_BASE  1
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0  2
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG  3
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2  4
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE  5
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG  6
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC  7
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SVTAG  8
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_VNTAG  9
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP  10
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1  11
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2  12
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD  13
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT  14
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE  15
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1  16
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2  17
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE  18
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE  19
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM  20
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY  21
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT  22
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ  23
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP  24
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA  25
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP  26
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4  27
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6  28
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0  29
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1  30
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2  31
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3  32
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4  33
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5  34
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6  35
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH  36
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW  37
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE  38
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588  39
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP  40
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES  41
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES  42
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP  43
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3  44
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4  45
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5  46
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN  47
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH  48
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK  49
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE  50
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ETAG  51
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE  52
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0  53
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG  54
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2  55
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE  56
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG  57
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC  58
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SVTAG  59
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_VNTAG  60
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP  61
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1  62
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2  63
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD  64
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT  65
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE  66
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1  67
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2  68
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE  69
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE  70
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM  71
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY  72
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT  73
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ  74
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP  75
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA  76
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP  77
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4  78
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6  79
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0  80
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1  81
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2  82
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3  83
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4  84
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5  85
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6  86
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH  87
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW  88
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE  89
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588  90
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP  91
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES  92
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES  93
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP  94
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3  95
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4  96
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5  97
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN  98
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ETAG  99
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG  100
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2  101
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE  102
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG  103
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC  104
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_VNTAG  105
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP  106
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1  107
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2  108
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD  109
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT  110
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE  111
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1  112
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2  113
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP  114
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA  115
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP  116
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4  117
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6  118
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE  119
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588  120
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP  121
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES  122
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES  123
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP  124
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3  125
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4  126
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5  127
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ETAG  128
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_BASE  129
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0  130
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG  131
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2  132
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE  133
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG  134
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC  135
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SVTAG  136
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_VNTAG  137
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP  138
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1  139
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2  140
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD  141
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT  142
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE  143
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1  144
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2  145
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE  146
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE  147
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM  148
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY  149
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT  150
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ  151
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP  152
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA  153
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP  154
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4  155
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6  156
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0  157
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1  158
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2  159
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3  160
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4  161
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5  162
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6  163
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH  164
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW  165
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE  166
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588  167
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP  168
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES  169
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES  170
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP  171
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3  172
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4  173
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5  174
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN  175
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH  176
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK  177
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE  178
-#define BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_COUNT  179
-
-#define BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT \
-    {"EGRESS_PKT_FWD_L2_HDR_ETAG", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ETAG}, \
-    {"EGRESS_PKT_FWD_L2_HDR_HG3_BASE", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_BASE}, \
-    {"EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0}, \
-    {"EGRESS_PKT_FWD_L2_HDR_ITAG", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG}, \
-    {"EGRESS_PKT_FWD_L2_HDR_L2", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2}, \
-    {"EGRESS_PKT_FWD_L2_HDR_NONE", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE}, \
-    {"EGRESS_PKT_FWD_L2_HDR_OTAG", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG}, \
-    {"EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC}, \
-    {"EGRESS_PKT_FWD_L2_HDR_SVTAG", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SVTAG}, \
-    {"EGRESS_PKT_FWD_L2_HDR_VNTAG", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_VNTAG}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ARP", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_BFD", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GPE", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ICMP", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IGMP", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV4", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV6", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS0", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS1", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS2", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS3", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS4", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS5", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS6", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_NONE", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_P_1588", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_RARP", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UDP", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_VXLAN", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN}, \
-    {"EGRESS_PKT_SYS_HDR_EP_NIH", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH}, \
-    {"EGRESS_PKT_SYS_HDR_LOOPBACK", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK}, \
-    {"EGRESS_PKT_SYS_HDR_NONE", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_ETAG", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ETAG}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_ITAG", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_L2", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_NONE", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_OTAG", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_SVTAG", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SVTAG}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_VNTAG", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_VNTAG}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN}, \
-    {"INGRESS_PKT_INNER_L2_HDR_ETAG", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ETAG}, \
-    {"INGRESS_PKT_INNER_L2_HDR_ITAG", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG}, \
-    {"INGRESS_PKT_INNER_L2_HDR_L2", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2}, \
-    {"INGRESS_PKT_INNER_L2_HDR_NONE", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE}, \
-    {"INGRESS_PKT_INNER_L2_HDR_OTAG", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG}, \
-    {"INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC}, \
-    {"INGRESS_PKT_INNER_L2_HDR_VNTAG", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_VNTAG}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ARP", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_BFD", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ICMP", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_IGMP", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV4", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV6", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_NONE", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_P_1588", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_RARP", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UDP", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_ETAG", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ETAG}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_HG3_BASE", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_BASE}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_ITAG", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_L2", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_NONE", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_OTAG", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_SVTAG", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SVTAG}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_VNTAG", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_VNTAG}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ARP", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_BFD", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GPE", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ICMP", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IGMP", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV4", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV6", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_NONE", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_P_1588", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_RARP", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UDP", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN}, \
-    {"INGRESS_PKT_SYS_HDR_EP_NIH", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH}, \
-    {"INGRESS_PKT_SYS_HDR_LOOPBACK", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK}, \
-    {"INGRESS_PKT_SYS_HDR_NONE", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE}, \
-    {"rxpmd_match_id_count", BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_COUNT}
-
-#endif /*! BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_bcmpkt_flexhdr.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_bcmpkt_flexhdr.h
new file mode 100644
index 000000000000..5752e0528f83
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_bcmpkt_flexhdr.h
@@ -0,0 +1,180 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) header.yml.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_FLEXHDR_H
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_FLEXHDR_H
+
+#include <bcmpkt/bcmpkt_flexhdr_internal.h>
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T                      0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T                   1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T                      2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CNTAG_T                    3
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T         4
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T         5
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_DEST_OPTION_T              6
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T            7
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T        8
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_SUBHDR_5_T         9
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ESP_T                      10
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ETAG_T                     11
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ETHERTYPE_T                12
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_FRAG_T                     13
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T         14
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GPE_T                      15
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_CHKSUM_T               16
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_KEY_T                  17
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_ROUT_T                 18
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_SEQ_T                  19
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_T                      20
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T                 21
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T          22
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HOP_BY_HOP_T               23
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ICMP_T                     24
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_0_A_T          25
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_0_B_T          26
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_1_T            27
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_2_T            28
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_3_T            29
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_HEADER_T               30
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_MD_BASE_T              31
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_T             32
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IGMP_T                     33
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPFIX_T                    34
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T                     35
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T                     36
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_L2_T                       37
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_ERSPAN_SN_T         38
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_TRANSPORT_T         39
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_ACH_T                 40
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_BV_T                  41
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_CW_T                  42
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_T                     43
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T                   44
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PIM_T                      45
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PROG_EXT_HDR_T             46
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T                  47
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T                  48
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T   49
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T   50
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T                     51
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ROUTING_T                  52
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RSPAN_T                    53
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_0_T             54
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T             55
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_2_T             56
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SNAP_LLC_T                 57
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SVTAG_T                    58
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_TCP_FIRST_4BYTES_T         59
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T         60
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UDP_T                      61
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L3_T               62
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L4_T               63
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L5_T               64
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VLAN_T                     65
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VNTAG_T                    66
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VXLAN_T                    67
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T                     68
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_T               69
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_FLEXHDR_COUNT    70
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_FLEXHDR_NAME_MAP_INIT \
+    {"arp_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T},\
+    {"authen_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T},\
+    {"bfd_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T},\
+    {"cntag_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CNTAG_T},\
+    {"cpu_composites_0_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T},\
+    {"cpu_composites_1_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T},\
+    {"dest_option_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_DEST_OPTION_T},\
+    {"ep_nih_header_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T},\
+    {"erspan3_fixed_hdr_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T},\
+    {"erspan3_subhdr_5_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_SUBHDR_5_T},\
+    {"esp_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ESP_T},\
+    {"etag_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ETAG_T},\
+    {"ethertype_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ETHERTYPE_T},\
+    {"frag_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_FRAG_T},\
+    {"generic_loopback_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T},\
+    {"gpe_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GPE_T},\
+    {"gre_chksum_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_CHKSUM_T},\
+    {"gre_key_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_KEY_T},\
+    {"gre_rout_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_ROUT_T},\
+    {"gre_seq_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_SEQ_T},\
+    {"gre_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_T},\
+    {"hg3_base_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T},\
+    {"hg3_extension_0_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T},\
+    {"hop_by_hop_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HOP_BY_HOP_T},\
+    {"icmp_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ICMP_T},\
+    {"ifa_flex_md_0_a_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_0_A_T},\
+    {"ifa_flex_md_0_b_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_0_B_T},\
+    {"ifa_flex_md_1_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_1_T},\
+    {"ifa_flex_md_2_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_2_T},\
+    {"ifa_flex_md_3_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_3_T},\
+    {"ifa_header_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_HEADER_T},\
+    {"ifa_md_base_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_MD_BASE_T},\
+    {"ifa_metadata_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_T},\
+    {"igmp_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IGMP_T},\
+    {"ipfix_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPFIX_T},\
+    {"ipv4_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T},\
+    {"ipv6_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T},\
+    {"l2_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_L2_T},\
+    {"mirror_erspan_sn_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_ERSPAN_SN_T},\
+    {"mirror_transport_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_TRANSPORT_T},\
+    {"mpls_ach_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_ACH_T},\
+    {"mpls_bv_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_BV_T},\
+    {"mpls_cw_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_CW_T},\
+    {"mpls_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_T},\
+    {"p_1588_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T},\
+    {"pim_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PIM_T},\
+    {"prog_ext_hdr_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PROG_EXT_HDR_T},\
+    {"psamp_0_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T},\
+    {"psamp_1_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T},\
+    {"psamp_mirror_on_drop_0_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T},\
+    {"psamp_mirror_on_drop_3_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T},\
+    {"rarp_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T},\
+    {"routing_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ROUTING_T},\
+    {"rspan_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RSPAN_T},\
+    {"sflow_shim_0_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_0_T},\
+    {"sflow_shim_1_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T},\
+    {"sflow_shim_2_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_2_T},\
+    {"snap_llc_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SNAP_LLC_T},\
+    {"svtag_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SVTAG_T},\
+    {"tcp_first_4bytes_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_TCP_FIRST_4BYTES_T},\
+    {"tcp_last_16bytes_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T},\
+    {"udp_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UDP_T},\
+    {"unknown_l3_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L3_T},\
+    {"unknown_l4_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L4_T},\
+    {"unknown_l5_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L5_T},\
+    {"vlan_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VLAN_T},\
+    {"vntag_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VNTAG_T},\
+    {"vxlan_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VXLAN_T},\
+    {"wesp_t", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T},\
+    {"RXPMD_FLEX_T", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_T},\
+    {"flexhdr count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_FLEXHDR_COUNT}
+
+#endif /* BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_FLEXHDR_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_bcmpkt_flexhdr_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_bcmpkt_flexhdr_data.h
new file mode 100644
index 000000000000..cc84e22ed59f
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_bcmpkt_flexhdr_data.h
@@ -0,0 +1,1343 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) header.yml.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_FLEXHDR_DATA_H
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_FLEXHDR_DATA_H
+
+/*!
+ * \name ARP_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_HARDWARE_LEN  0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_HARDWARE_TYPE 1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_OPERATION     2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_PROT_ADDR_LEN 3
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_PROTOCOL_TYPE 4
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_SENDER_HA     5
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_SENDER_IP     6
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_TARGET_HA     7
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_TARGET_IP     8
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_FID_COUNT          9
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT \
+    {"HARDWARE_LEN", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_HARDWARE_LEN},\
+    {"HARDWARE_TYPE", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_HARDWARE_TYPE},\
+    {"OPERATION", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_OPERATION},\
+    {"PROT_ADDR_LEN", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_PROT_ADDR_LEN},\
+    {"PROTOCOL_TYPE", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_PROTOCOL_TYPE},\
+    {"SENDER_HA", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_SENDER_HA},\
+    {"SENDER_IP", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_SENDER_IP},\
+    {"TARGET_HA", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_TARGET_HA},\
+    {"TARGET_IP", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_TARGET_IP},\
+    {"arp_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_FID_COUNT}
+
+/*!
+ * \name AUTHEN_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T_DATA        0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T_NEXT_HEADER 1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T_PAYLOAD_LEN 2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T_RESERVED    3
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T_SEQ_NUM     4
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T_SPI         5
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T_FID_COUNT          6
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T_FIELD_NAME_MAP_INIT \
+    {"DATA", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T_DATA},\
+    {"NEXT_HEADER", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T_NEXT_HEADER},\
+    {"PAYLOAD_LEN", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T_PAYLOAD_LEN},\
+    {"RESERVED", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T_RESERVED},\
+    {"SEQ_NUM", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T_SEQ_NUM},\
+    {"SPI", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T_SPI},\
+    {"authen_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T_FID_COUNT}
+
+/*!
+ * \name BFD_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_AP            0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_BFD_LENGTH    1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_CPI           2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_DEM           3
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_DESMINTXINTV  4
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_DETECTMULT    5
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_DIAG          6
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_FIN           7
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_MINECHORXINTV 8
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_MPT           9
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_MYDISCRIM     10
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_POLL          11
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_REQMINRXINTV  12
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_STA           13
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_URDISCRIM     14
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_VERSION       15
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_FID_COUNT          16
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_FIELD_NAME_MAP_INIT \
+    {"AP", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_AP},\
+    {"BFD_LENGTH", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_BFD_LENGTH},\
+    {"CPI", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_CPI},\
+    {"DEM", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_DEM},\
+    {"DESMINTXINTV", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_DESMINTXINTV},\
+    {"DETECTMULT", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_DETECTMULT},\
+    {"DIAG", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_DIAG},\
+    {"FIN", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_FIN},\
+    {"MINECHORXINTV", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_MINECHORXINTV},\
+    {"MPT", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_MPT},\
+    {"MYDISCRIM", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_MYDISCRIM},\
+    {"POLL", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_POLL},\
+    {"REQMINRXINTV", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_REQMINRXINTV},\
+    {"STA", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_STA},\
+    {"URDISCRIM", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_URDISCRIM},\
+    {"VERSION", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_VERSION},\
+    {"bfd_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_FID_COUNT}
+
+/*!
+ * \name CNTAG_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CNTAG_T_RPID 0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CNTAG_T_TPID 1
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CNTAG_T_FID_COUNT          2
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CNTAG_T_FIELD_NAME_MAP_INIT \
+    {"RPID", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CNTAG_T_RPID},\
+    {"TPID", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CNTAG_T_TPID},\
+    {"cntag_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CNTAG_T_FID_COUNT}
+
+/*!
+ * \name CPU_COMPOSITES_0_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0 0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1 1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2 2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3 3
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4 4
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5 5
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6 6
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT          7
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT \
+    {"DMA_CONT0", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0},\
+    {"DMA_CONT1", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1},\
+    {"DMA_CONT2", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2},\
+    {"DMA_CONT3", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3},\
+    {"DMA_CONT4", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4},\
+    {"DMA_CONT5", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5},\
+    {"DMA_CONT6", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6},\
+    {"cpu_composites_0_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT}
+
+/*!
+ * \name CPU_COMPOSITES_1_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10 0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11 1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12 2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13 3
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14 4
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15 5
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16 6
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17 7
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7  8
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8  9
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9  10
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT          11
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT \
+    {"DMA_CONT10", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10},\
+    {"DMA_CONT11", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11},\
+    {"DMA_CONT12", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12},\
+    {"DMA_CONT13", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13},\
+    {"DMA_CONT14", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14},\
+    {"DMA_CONT15", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15},\
+    {"DMA_CONT16", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16},\
+    {"DMA_CONT17", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17},\
+    {"DMA_CONT7", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7},\
+    {"DMA_CONT8", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8},\
+    {"DMA_CONT9", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9},\
+    {"cpu_composites_1_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT}
+
+/*!
+ * \name DEST_OPTION_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_DEST_OPTION_T_HDR_EXT_LEN 0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_DEST_OPTION_T_NEXT_HEADER 1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_DEST_OPTION_T_OPTION      2
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_DEST_OPTION_T_FID_COUNT          3
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_DEST_OPTION_T_FIELD_NAME_MAP_INIT \
+    {"HDR_EXT_LEN", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_DEST_OPTION_T_HDR_EXT_LEN},\
+    {"NEXT_HEADER", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_DEST_OPTION_T_NEXT_HEADER},\
+    {"OPTION", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_DEST_OPTION_T_OPTION},\
+    {"dest_option_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_DEST_OPTION_T_FID_COUNT}
+
+/*!
+ * \name EP_NIH_HEADER_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_HEADER_SUBTYPE       0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_HEADER_TYPE          1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_A        2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_B        3
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_C        4
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_A      5
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_B      6
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_C      7
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_RECIRC_PROFILE_INDEX 8
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_RESERVED_0           9
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_START                10
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_TIMESTAMP            11
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT          12
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_FIELD_NAME_MAP_INIT \
+    {"HEADER_SUBTYPE", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_HEADER_SUBTYPE},\
+    {"HEADER_TYPE", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_HEADER_TYPE},\
+    {"OPAQUE_CTRL_A", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_A},\
+    {"OPAQUE_CTRL_B", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_B},\
+    {"OPAQUE_CTRL_C", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_C},\
+    {"OPAQUE_OBJECT_A", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_A},\
+    {"OPAQUE_OBJECT_B", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_B},\
+    {"OPAQUE_OBJECT_C", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_C},\
+    {"RECIRC_PROFILE_INDEX", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_RECIRC_PROFILE_INDEX},\
+    {"RESERVED_0", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_RESERVED_0},\
+    {"START", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_START},\
+    {"TIMESTAMP", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_TIMESTAMP},\
+    {"ep_nih_header_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT}
+
+/*!
+ * \name ERSPAN3_FIXED_HDR_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO               0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_COS               1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID           2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O 3
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID        4
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_T                 5
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP         6
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VER               7
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN              8
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT          9
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT \
+    {"BSO", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO},\
+    {"COS", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_COS},\
+    {"GBP_SID", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID},\
+    {"P_FT_HWID_D_GRA_O", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O},\
+    {"SESSION_ID", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID},\
+    {"T", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_T},\
+    {"TIMESTAMP", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP},\
+    {"VER", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VER},\
+    {"VLAN", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN},\
+    {"erspan3_fixed_hdr_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT}
+
+/*!
+ * \name ERSPAN3_SUBHDR_5_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID 0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID     1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID   2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP   3
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT          4
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT \
+    {"PLATFORM_ID", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID},\
+    {"PORT_ID", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID},\
+    {"SWITCH_ID", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID},\
+    {"TIMESTAMP", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP},\
+    {"erspan3_subhdr_5_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT}
+
+/*!
+ * \name ESP_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ESP_T_NEXT_HEADER 0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ESP_T_PAD         1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ESP_T_PAD_LEN     2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ESP_T_SEQ_NUM     3
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ESP_T_SPI         4
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ESP_T_FID_COUNT          5
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ESP_T_FIELD_NAME_MAP_INIT \
+    {"NEXT_HEADER", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ESP_T_NEXT_HEADER},\
+    {"PAD", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ESP_T_PAD},\
+    {"PAD_LEN", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ESP_T_PAD_LEN},\
+    {"SEQ_NUM", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ESP_T_SEQ_NUM},\
+    {"SPI", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ESP_T_SPI},\
+    {"esp_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ESP_T_FID_COUNT}
+
+/*!
+ * \name ETAG_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ETAG_T_TAG  0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ETAG_T_TPID 1
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ETAG_T_FID_COUNT          2
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ETAG_T_FIELD_NAME_MAP_INIT \
+    {"TAG", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ETAG_T_TAG},\
+    {"TPID", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ETAG_T_TPID},\
+    {"etag_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ETAG_T_FID_COUNT}
+
+/*!
+ * \name ETHERTYPE_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ETHERTYPE_T_TYPE 0
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ETHERTYPE_T_FID_COUNT          1
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT \
+    {"TYPE", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ETHERTYPE_T_TYPE},\
+    {"ethertype_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ETHERTYPE_T_FID_COUNT}
+
+/*!
+ * \name FRAG_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_FRAG_T_FRAG_INFO   0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_FRAG_T_ID          1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_FRAG_T_NEXT_HEADER 2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_FRAG_T_RESERVED    3
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_FRAG_T_FID_COUNT          4
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_FRAG_T_FIELD_NAME_MAP_INIT \
+    {"FRAG_INFO", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_FRAG_T_FRAG_INFO},\
+    {"ID", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_FRAG_T_ID},\
+    {"NEXT_HEADER", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_FRAG_T_NEXT_HEADER},\
+    {"RESERVED", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_FRAG_T_RESERVED},\
+    {"frag_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_FRAG_T_FID_COUNT}
+
+/*!
+ * \name GENERIC_LOOPBACK_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ    0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE   1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ        2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_FLAGS              3
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE        4
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY     5
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL     6
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ      7
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0  8
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1  9
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ            10
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1         11
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT 12
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE         13
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_SVP                14
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT          15
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT \
+    {"DESTINATION_OBJ", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ},\
+    {"DESTINATION_TYPE", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE},\
+    {"ENTROPY_OBJ", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ},\
+    {"FLAGS", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_FLAGS},\
+    {"HEADER_TYPE", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE},\
+    {"INPUT_PRIORITY", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY},\
+    {"INTERFACE_CTRL", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL},\
+    {"INTERFACE_OBJ", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ},\
+    {"PROCESSING_CTRL_0", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0},\
+    {"PROCESSING_CTRL_1", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1},\
+    {"QOS_OBJ", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ},\
+    {"RESERVED_1", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1},\
+    {"SOURCE_SYSTEM_PORT", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT},\
+    {"START_BYTE", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE},\
+    {"SVP", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_SVP},\
+    {"generic_loopback_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT}
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NO_OP       0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2_OIF      1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED    2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__VP          3
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP        4
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NHOP        5
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2MC_GROUP  6
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L3MC_GROUP  7
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED_1  8
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP_MEMBER 9
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__DEVICE_PORT 10
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_TYPE__TUNNEL  0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_TYPE__GENERIC 1
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__NOOP   0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__VFI    1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__L3_IIF 2
+
+/*!
+ * \name GPE_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GPE_T_FLAGS         0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GPE_T_NEXT_PROTOCOL 1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GPE_T_RESERVED0     2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GPE_T_RESERVED1     3
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GPE_T_VNI           4
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GPE_T_FID_COUNT          5
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GPE_T_FIELD_NAME_MAP_INIT \
+    {"FLAGS", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GPE_T_FLAGS},\
+    {"NEXT_PROTOCOL", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GPE_T_NEXT_PROTOCOL},\
+    {"RESERVED0", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GPE_T_RESERVED0},\
+    {"RESERVED1", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GPE_T_RESERVED1},\
+    {"VNI", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GPE_T_VNI},\
+    {"gpe_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GPE_T_FID_COUNT}
+
+/*!
+ * \name GRE_CHKSUM_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_CHKSUM_T_CHECKSUM 0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_CHKSUM_T_OFFSET   1
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT          2
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_CHKSUM_T_FIELD_NAME_MAP_INIT \
+    {"CHECKSUM", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_CHKSUM_T_CHECKSUM},\
+    {"OFFSET", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_CHKSUM_T_OFFSET},\
+    {"gre_chksum_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT}
+
+/*!
+ * \name GRE_KEY_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_KEY_T_KEY 0
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_KEY_T_FID_COUNT          1
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_KEY_T_FIELD_NAME_MAP_INIT \
+    {"KEY", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_KEY_T_KEY},\
+    {"gre_key_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_KEY_T_FID_COUNT}
+
+/*!
+ * \name GRE_ROUT_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_ROUT_T_ROUTING 0
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_ROUT_T_FID_COUNT          1
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_ROUT_T_FIELD_NAME_MAP_INIT \
+    {"ROUTING", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_ROUT_T_ROUTING},\
+    {"gre_rout_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_ROUT_T_FID_COUNT}
+
+/*!
+ * \name GRE_SEQ_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_SEQ_T_SEQUENCE 0
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_SEQ_T_FID_COUNT          1
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_SEQ_T_FIELD_NAME_MAP_INIT \
+    {"SEQUENCE", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_SEQ_T_SEQUENCE},\
+    {"gre_seq_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_SEQ_T_FID_COUNT}
+
+/*!
+ * \name GRE_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_T_C_R_K_S  0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_T_PROTOCOL 1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_T_RESERVED 2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_T_VERSION  3
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_T_FID_COUNT          4
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_T_FIELD_NAME_MAP_INIT \
+    {"C_R_K_S", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_T_C_R_K_S},\
+    {"PROTOCOL", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_T_PROTOCOL},\
+    {"RESERVED", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_T_RESERVED},\
+    {"VERSION", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_T_VERSION},\
+    {"gre_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_T_FID_COUNT}
+
+/*!
+ * \name HG3_BASE_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_CN                      0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_CNG                     1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_ENTROPY                 2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_EXT_HDR_PRESENT         3
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_HG3_RESERVED            4
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_L3_ROUTED               5
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_MIRROR_COPY             6
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_RESERVED_ETYPE          7
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION      8
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION_TYPE 9
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_SYSTEM_SOURCE           10
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_TC                      11
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_VERSION                 12
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_FID_COUNT          13
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_FIELD_NAME_MAP_INIT \
+    {"CN", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_CN},\
+    {"CNG", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_CNG},\
+    {"ENTROPY", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_ENTROPY},\
+    {"EXT_HDR_PRESENT", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_EXT_HDR_PRESENT},\
+    {"HG3_RESERVED", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_HG3_RESERVED},\
+    {"L3_ROUTED", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_L3_ROUTED},\
+    {"MIRROR_COPY", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_MIRROR_COPY},\
+    {"RESERVED_ETYPE", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_RESERVED_ETYPE},\
+    {"SYSTEM_DESTINATION", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION},\
+    {"SYSTEM_DESTINATION_TYPE", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION_TYPE},\
+    {"SYSTEM_SOURCE", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_SYSTEM_SOURCE},\
+    {"TC", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_TC},\
+    {"VERSION", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_VERSION},\
+    {"hg3_base_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_FID_COUNT}
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__NO_OP       0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__L2_OIF      1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__RESERVED    2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__VP          3
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__ECMP        4
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__NHOP        5
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__L2MC_GROUP  6
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__L3MC_GROUP  7
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__RESERVED_1  8
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__ECMP_MEMBER 9
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__DEVICE_PORT 10
+
+/*!
+ * \name HG3_EXTENSION_0_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_LSB      0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_MSB      1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T_DVP_OR_L3_IIF     2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T_FLAGS             3
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T_FORWARDING_DOMAIN 4
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T_SVP               5
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT          6
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T_FIELD_NAME_MAP_INIT \
+    {"CLASS_ID_LSB", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_LSB},\
+    {"CLASS_ID_MSB", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_MSB},\
+    {"DVP_OR_L3_IIF", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T_DVP_OR_L3_IIF},\
+    {"FLAGS", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T_FLAGS},\
+    {"FORWARDING_DOMAIN", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T_FORWARDING_DOMAIN},\
+    {"SVP", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T_SVP},\
+    {"hg3_extension_0_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT}
+
+/*!
+ * \name HOP_BY_HOP_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HOP_BY_HOP_T_HDR_EXT_LEN 0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HOP_BY_HOP_T_NEXT_HEADER 1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HOP_BY_HOP_T_OPTION      2
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT          3
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HOP_BY_HOP_T_FIELD_NAME_MAP_INIT \
+    {"HDR_EXT_LEN", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HOP_BY_HOP_T_HDR_EXT_LEN},\
+    {"NEXT_HEADER", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HOP_BY_HOP_T_NEXT_HEADER},\
+    {"OPTION", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HOP_BY_HOP_T_OPTION},\
+    {"hop_by_hop_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT}
+
+/*!
+ * \name ICMP_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ICMP_T_CHECKSUM  0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ICMP_T_CODE      1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ICMP_T_ICMP_TYPE 2
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ICMP_T_FID_COUNT          3
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT \
+    {"CHECKSUM", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ICMP_T_CHECKSUM},\
+    {"CODE", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ICMP_T_CODE},\
+    {"ICMP_TYPE", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ICMP_T_ICMP_TYPE},\
+    {"icmp_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ICMP_T_FID_COUNT}
+
+/*!
+ * \name IFA_FLEX_MD_0_A_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_0_A_T_FWD_HDR_TTL   0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_0_A_T_LNS_DEVICE_ID 1
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT          2
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_0_A_T_FIELD_NAME_MAP_INIT \
+    {"FWD_HDR_TTL", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_0_A_T_FWD_HDR_TTL},\
+    {"LNS_DEVICE_ID", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_0_A_T_LNS_DEVICE_ID},\
+    {"ifa_flex_md_0_a_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT}
+
+/*!
+ * \name IFA_FLEX_MD_0_B_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_0_B_T_CN               0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_0_B_T_PORT_SPEED       1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_0_B_T_QUEUE_ID         2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_0_B_T_RX_TIMESTAMP_SEC 3
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT          4
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_0_B_T_FIELD_NAME_MAP_INIT \
+    {"CN", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_0_B_T_CN},\
+    {"PORT_SPEED", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_0_B_T_PORT_SPEED},\
+    {"QUEUE_ID", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_0_B_T_QUEUE_ID},\
+    {"RX_TIMESTAMP_SEC", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_0_B_T_RX_TIMESTAMP_SEC},\
+    {"ifa_flex_md_0_b_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT}
+
+/*!
+ * \name IFA_FLEX_MD_1_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_1_T_EGRESS_PORT_ID       0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_1_T_INGRESS_PORT_ID      1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_1_T_RX_TIMESTAMP_NANOSEC 2
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT          3
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_1_T_FIELD_NAME_MAP_INIT \
+    {"EGRESS_PORT_ID", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_1_T_EGRESS_PORT_ID},\
+    {"INGRESS_PORT_ID", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_1_T_INGRESS_PORT_ID},\
+    {"RX_TIMESTAMP_NANOSEC", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_1_T_RX_TIMESTAMP_NANOSEC},\
+    {"ifa_flex_md_1_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT}
+
+/*!
+ * \name IFA_FLEX_MD_2_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_2_T_RESIDENCE_TIME_NANOSEC 0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_2_T_TX_QUEUE_BYTE_COUNT    1
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT          2
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_2_T_FIELD_NAME_MAP_INIT \
+    {"RESIDENCE_TIME_NANOSEC", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_2_T_RESIDENCE_TIME_NANOSEC},\
+    {"TX_QUEUE_BYTE_COUNT", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_2_T_TX_QUEUE_BYTE_COUNT},\
+    {"ifa_flex_md_2_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT}
+
+/*!
+ * \name IFA_FLEX_MD_3_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_3_T_MMU_STAT_0 0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_3_T_MMU_STAT_1 1
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT          2
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_3_T_FIELD_NAME_MAP_INIT \
+    {"MMU_STAT_0", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_3_T_MMU_STAT_0},\
+    {"MMU_STAT_1", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_3_T_MMU_STAT_1},\
+    {"ifa_flex_md_3_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT}
+
+/*!
+ * \name IFA_HEADER_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_HEADER_T_FLAGS      0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_HEADER_T_GNS        1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_HEADER_T_MAX_LENGTH 2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_HEADER_T_NEXT_HDR   3
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_HEADER_T_VER        4
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_HEADER_T_FID_COUNT          5
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_HEADER_T_FIELD_NAME_MAP_INIT \
+    {"FLAGS", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_HEADER_T_FLAGS},\
+    {"GNS", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_HEADER_T_GNS},\
+    {"MAX_LENGTH", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_HEADER_T_MAX_LENGTH},\
+    {"NEXT_HDR", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_HEADER_T_NEXT_HDR},\
+    {"VER", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_HEADER_T_VER},\
+    {"ifa_header_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_HEADER_T_FID_COUNT}
+
+/*!
+ * \name IFA_MD_BASE_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_MD_BASE_T_ACTION_VECTOR            0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_MD_BASE_T_HOP_LIMIT_CURRENT_LENGTH 1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_MD_BASE_T_REQUEST_VECTOR           2
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_MD_BASE_T_FID_COUNT          3
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_MD_BASE_T_FIELD_NAME_MAP_INIT \
+    {"ACTION_VECTOR", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_MD_BASE_T_ACTION_VECTOR},\
+    {"HOP_LIMIT_CURRENT_LENGTH", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_MD_BASE_T_HOP_LIMIT_CURRENT_LENGTH},\
+    {"REQUEST_VECTOR", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_MD_BASE_T_REQUEST_VECTOR},\
+    {"ifa_md_base_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_MD_BASE_T_FID_COUNT}
+
+/*!
+ * \name IFA_METADATA_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_T_ACTION_VECTOR            0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_T_HOP_LIMIT_CURRENT_LENGTH 1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_T_METADATA                 2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_T_REQUEST_VECTOR           3
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_T_FID_COUNT          4
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_T_FIELD_NAME_MAP_INIT \
+    {"ACTION_VECTOR", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_T_ACTION_VECTOR},\
+    {"HOP_LIMIT_CURRENT_LENGTH", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_T_HOP_LIMIT_CURRENT_LENGTH},\
+    {"METADATA", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_T_METADATA},\
+    {"REQUEST_VECTOR", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_T_REQUEST_VECTOR},\
+    {"ifa_metadata_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_T_FID_COUNT}
+
+/*!
+ * \name IGMP_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IGMP_T_CHECKSUM      0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IGMP_T_GROUP_ADDRESS 1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IGMP_T_IGMP_TYPE     2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IGMP_T_MAX_RESP_TIME 3
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IGMP_T_FID_COUNT          4
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IGMP_T_FIELD_NAME_MAP_INIT \
+    {"CHECKSUM", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IGMP_T_CHECKSUM},\
+    {"GROUP_ADDRESS", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IGMP_T_GROUP_ADDRESS},\
+    {"IGMP_TYPE", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IGMP_T_IGMP_TYPE},\
+    {"MAX_RESP_TIME", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IGMP_T_MAX_RESP_TIME},\
+    {"igmp_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IGMP_T_FID_COUNT}
+
+/*!
+ * \name IPFIX_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPFIX_T_EXPORT_TIME   0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPFIX_T_LENGTH        1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPFIX_T_OBS_DOMAIN_ID 2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPFIX_T_SEQUENCE_NUM  3
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPFIX_T_VERSION       4
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPFIX_T_FID_COUNT          5
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT \
+    {"EXPORT_TIME", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPFIX_T_EXPORT_TIME},\
+    {"LENGTH", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPFIX_T_LENGTH},\
+    {"OBS_DOMAIN_ID", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPFIX_T_OBS_DOMAIN_ID},\
+    {"SEQUENCE_NUM", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPFIX_T_SEQUENCE_NUM},\
+    {"VERSION", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPFIX_T_VERSION},\
+    {"ipfix_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPFIX_T_FID_COUNT}
+
+/*!
+ * \name IPV4_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_DA                0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET 1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_HDR_CHECKSUM      2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_ID                3
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_OPTION            4
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_PROTOCOL          5
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_SA                6
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_TOS               7
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_TOTAL_LENGTH      8
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_TTL               9
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_VERSION_HDR_LEN   10
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_FID_COUNT          11
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT \
+    {"DA", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_DA},\
+    {"FLAGS_FRAG_OFFSET", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET},\
+    {"HDR_CHECKSUM", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_HDR_CHECKSUM},\
+    {"ID", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_ID},\
+    {"OPTION", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_OPTION},\
+    {"PROTOCOL", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_PROTOCOL},\
+    {"SA", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_SA},\
+    {"TOS", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_TOS},\
+    {"TOTAL_LENGTH", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_TOTAL_LENGTH},\
+    {"TTL", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_TTL},\
+    {"VERSION_HDR_LEN", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_VERSION_HDR_LEN},\
+    {"ipv4_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_FID_COUNT}
+
+/*!
+ * \name IPV6_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_DA             0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_FLOW_LABEL     1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_HOP_LIMIT      2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_NEXT_HEADER    3
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_PAYLOAD_LENGTH 4
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_SA             5
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_TRAFFIC_CLASS  6
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_VERSION        7
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_FID_COUNT          8
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT \
+    {"DA", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_DA},\
+    {"FLOW_LABEL", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_FLOW_LABEL},\
+    {"HOP_LIMIT", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_HOP_LIMIT},\
+    {"NEXT_HEADER", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_NEXT_HEADER},\
+    {"PAYLOAD_LENGTH", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_PAYLOAD_LENGTH},\
+    {"SA", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_SA},\
+    {"TRAFFIC_CLASS", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_TRAFFIC_CLASS},\
+    {"VERSION", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_VERSION},\
+    {"ipv6_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_FID_COUNT}
+
+/*!
+ * \name L2_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_L2_T_MACDA 0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_L2_T_MACSA 1
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_L2_T_FID_COUNT          2
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_L2_T_FIELD_NAME_MAP_INIT \
+    {"MACDA", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_L2_T_MACDA},\
+    {"MACSA", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_L2_T_MACSA},\
+    {"l2_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_L2_T_FID_COUNT}
+
+/*!
+ * \name MIRROR_ERSPAN_SN_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM 0
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT          1
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT \
+    {"SEQ_NUM", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM},\
+    {"mirror_erspan_sn_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT}
+
+/*!
+ * \name MIRROR_TRANSPORT_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_TRANSPORT_T_DATA 0
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT          1
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT \
+    {"DATA", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_TRANSPORT_T_DATA},\
+    {"mirror_transport_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT}
+
+/*!
+ * \name MPLS_ACH_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_ACH_T_CHANNEL_TYPE 0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_ACH_T_CW_TYPE      1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_ACH_T_RESERVED     2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_ACH_T_VERSION      3
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_ACH_T_FID_COUNT          4
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_ACH_T_FIELD_NAME_MAP_INIT \
+    {"CHANNEL_TYPE", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_ACH_T_CHANNEL_TYPE},\
+    {"CW_TYPE", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_ACH_T_CW_TYPE},\
+    {"RESERVED", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_ACH_T_RESERVED},\
+    {"VERSION", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_ACH_T_VERSION},\
+    {"mpls_ach_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_ACH_T_FID_COUNT}
+
+/*!
+ * \name MPLS_BV_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_BV_T_VALUE 0
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_BV_T_FID_COUNT          1
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_BV_T_FIELD_NAME_MAP_INIT \
+    {"VALUE", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_BV_T_VALUE},\
+    {"mpls_bv_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_BV_T_FID_COUNT}
+
+/*!
+ * \name MPLS_CW_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_CW_T_CW_TYPE    0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_CW_T_RESERVED   1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_CW_T_SEQ_NUMBER 2
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_CW_T_FID_COUNT          3
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_CW_T_FIELD_NAME_MAP_INIT \
+    {"CW_TYPE", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_CW_T_CW_TYPE},\
+    {"RESERVED", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_CW_T_RESERVED},\
+    {"SEQ_NUMBER", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_CW_T_SEQ_NUMBER},\
+    {"mpls_cw_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_CW_T_FID_COUNT}
+
+/*!
+ * \name MPLS_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_T_BOS   0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_T_EXP   1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_T_LABEL 2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_T_TTL   3
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_T_FID_COUNT          4
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_T_FIELD_NAME_MAP_INIT \
+    {"BOS", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_T_BOS},\
+    {"EXP", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_T_EXP},\
+    {"LABEL", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_T_LABEL},\
+    {"TTL", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_T_TTL},\
+    {"mpls_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_T_FID_COUNT}
+
+/*!
+ * \name P_1588_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_CNTRL          0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_CORRECTION     1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_DOMAIN_NB      2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_FLAGS          3
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_LOGMSGINTERVAL 4
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_MSG_LENGTH     5
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_MSG_TYPE       6
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_RESERVED1      7
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_RESERVED2      8
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_RESERVED3      9
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_SEQ_ID         10
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_SRCPORTID      11
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_TRANSPORTSPEC  12
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_VERSION        13
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_FID_COUNT          14
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_FIELD_NAME_MAP_INIT \
+    {"CNTRL", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_CNTRL},\
+    {"CORRECTION", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_CORRECTION},\
+    {"DOMAIN_NB", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_DOMAIN_NB},\
+    {"FLAGS", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_FLAGS},\
+    {"LOGMSGINTERVAL", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_LOGMSGINTERVAL},\
+    {"MSG_LENGTH", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_MSG_LENGTH},\
+    {"MSG_TYPE", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_MSG_TYPE},\
+    {"RESERVED1", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_RESERVED1},\
+    {"RESERVED2", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_RESERVED2},\
+    {"RESERVED3", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_RESERVED3},\
+    {"SEQ_ID", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_SEQ_ID},\
+    {"SRCPORTID", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_SRCPORTID},\
+    {"TRANSPORTSPEC", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_TRANSPORTSPEC},\
+    {"VERSION", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_VERSION},\
+    {"p_1588_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_FID_COUNT}
+
+/*!
+ * \name PIM_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PIM_T_HDR_BYTES_0_1 0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PIM_T_HDR_BYTES_2_3 1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PIM_T_HDR_BYTES_4_5 2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PIM_T_HDR_BYTES_6_7 3
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PIM_T_FID_COUNT          4
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PIM_T_FIELD_NAME_MAP_INIT \
+    {"HDR_BYTES_0_1", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PIM_T_HDR_BYTES_0_1},\
+    {"HDR_BYTES_2_3", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PIM_T_HDR_BYTES_2_3},\
+    {"HDR_BYTES_4_5", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PIM_T_HDR_BYTES_4_5},\
+    {"HDR_BYTES_6_7", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PIM_T_HDR_BYTES_6_7},\
+    {"pim_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PIM_T_FID_COUNT}
+
+/*!
+ * \name PROG_EXT_HDR_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PROG_EXT_HDR_T_HDR_EXT_LEN 0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PROG_EXT_HDR_T_NEXT_HEADER 1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PROG_EXT_HDR_T_OPTION      2
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT          3
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PROG_EXT_HDR_T_FIELD_NAME_MAP_INIT \
+    {"HDR_EXT_LEN", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PROG_EXT_HDR_T_HDR_EXT_LEN},\
+    {"NEXT_HEADER", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PROG_EXT_HDR_T_NEXT_HEADER},\
+    {"OPTION", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PROG_EXT_HDR_T_OPTION},\
+    {"prog_ext_hdr_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_0_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T_FLOWSET        0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T_LENGTH         1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T_NEXT_HOP_INDEX 2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T_OBS_TIME_NS    3
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T_OBS_TIME_S     4
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T_TEMPLATE_ID    5
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T_FID_COUNT          6
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T_FIELD_NAME_MAP_INIT \
+    {"FLOWSET", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T_FLOWSET},\
+    {"LENGTH", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T_LENGTH},\
+    {"NEXT_HOP_INDEX", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T_NEXT_HOP_INDEX},\
+    {"OBS_TIME_NS", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T_OBS_TIME_NS},\
+    {"OBS_TIME_S", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T_OBS_TIME_S},\
+    {"TEMPLATE_ID", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T_TEMPLATE_ID},\
+    {"psamp_0_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_1_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_DLB_ID         0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_EGRESS_PORT    1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_EPOCH          2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_INGRESS_PORT   3
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_SAMPLED_LENGTH 4
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_USER_META_DATA 5
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_VARIABLE_FLAG  6
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_FID_COUNT          7
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_FIELD_NAME_MAP_INIT \
+    {"DLB_ID", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_DLB_ID},\
+    {"EGRESS_PORT", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_EGRESS_PORT},\
+    {"EPOCH", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_EPOCH},\
+    {"INGRESS_PORT", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_INGRESS_PORT},\
+    {"SAMPLED_LENGTH", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_SAMPLED_LENGTH},\
+    {"USER_META_DATA", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_USER_META_DATA},\
+    {"VARIABLE_FLAG", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_VARIABLE_FLAG},\
+    {"psamp_1_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_MIRROR_ON_DROP_0_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT 0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT    1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH          2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS     3
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S      4
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID       5
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID     6
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT          7
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT \
+    {"EGRESS_MOD_PORT", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT},\
+    {"INGRESS_PORT", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT},\
+    {"LENGTH", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH},\
+    {"OBS_TIME_NS", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS},\
+    {"OBS_TIME_S", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S},\
+    {"SWITCH_ID", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID},\
+    {"TEMPLATE_ID", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID},\
+    {"psamp_mirror_on_drop_0_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_MIRROR_ON_DROP_3_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_DROP_REASON             0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_RESERVED_0              1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SAMPLED_LENGTH          2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SMOD_STATE              3
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_UC_COS__COLOR__PROB_IDX 4
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_USER_META_DATA          5
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_VAR_LEN_INDICATOR       6
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT          7
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FIELD_NAME_MAP_INIT \
+    {"DROP_REASON", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_DROP_REASON},\
+    {"RESERVED_0", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_RESERVED_0},\
+    {"SAMPLED_LENGTH", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SAMPLED_LENGTH},\
+    {"SMOD_STATE", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SMOD_STATE},\
+    {"UC_COS__COLOR__PROB_IDX", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_UC_COS__COLOR__PROB_IDX},\
+    {"USER_META_DATA", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_USER_META_DATA},\
+    {"VAR_LEN_INDICATOR", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_VAR_LEN_INDICATOR},\
+    {"psamp_mirror_on_drop_3_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT}
+
+/*!
+ * \name RARP_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_HARDWARE_LEN  0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_HARDWARE_TYPE 1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_OPERATION     2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_PROT_ADDR_LEN 3
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_PROTOCOL_TYPE 4
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_SENDER_HA     5
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_SENDER_IP     6
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_TARGET_HA     7
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_TARGET_IP     8
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_FID_COUNT          9
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT \
+    {"HARDWARE_LEN", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_HARDWARE_LEN},\
+    {"HARDWARE_TYPE", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_HARDWARE_TYPE},\
+    {"OPERATION", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_OPERATION},\
+    {"PROT_ADDR_LEN", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_PROT_ADDR_LEN},\
+    {"PROTOCOL_TYPE", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_PROTOCOL_TYPE},\
+    {"SENDER_HA", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_SENDER_HA},\
+    {"SENDER_IP", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_SENDER_IP},\
+    {"TARGET_HA", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_TARGET_HA},\
+    {"TARGET_IP", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_TARGET_IP},\
+    {"rarp_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_FID_COUNT}
+
+/*!
+ * \name ROUTING_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ROUTING_T_DATA          0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ROUTING_T_HDR_EXT_LEN   1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ROUTING_T_NEXT_HEADER   2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ROUTING_T_ROUTING_TYPE  3
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ROUTING_T_SEGMENTS_LEFT 4
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ROUTING_T_FID_COUNT          5
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ROUTING_T_FIELD_NAME_MAP_INIT \
+    {"DATA", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ROUTING_T_DATA},\
+    {"HDR_EXT_LEN", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ROUTING_T_HDR_EXT_LEN},\
+    {"NEXT_HEADER", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ROUTING_T_NEXT_HEADER},\
+    {"ROUTING_TYPE", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ROUTING_T_ROUTING_TYPE},\
+    {"SEGMENTS_LEFT", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ROUTING_T_SEGMENTS_LEFT},\
+    {"routing_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ROUTING_T_FID_COUNT}
+
+/*!
+ * \name RSPAN_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RSPAN_T_TAG  0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RSPAN_T_TPID 1
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RSPAN_T_FID_COUNT          2
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RSPAN_T_FIELD_NAME_MAP_INIT \
+    {"TAG", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RSPAN_T_TAG},\
+    {"TPID", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RSPAN_T_TPID},\
+    {"rspan_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RSPAN_T_FID_COUNT}
+
+/*!
+ * \name SFLOW_SHIM_0_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_0_T_SYS_DESTINATION 0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_0_T_SYS_SOURCE      1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_0_T_VERSION         2
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT          3
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_0_T_FIELD_NAME_MAP_INIT \
+    {"SYS_DESTINATION", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_0_T_SYS_DESTINATION},\
+    {"SYS_SOURCE", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_0_T_SYS_SOURCE},\
+    {"VERSION", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_0_T_VERSION},\
+    {"sflow_shim_0_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT}
+
+/*!
+ * \name SFLOW_SHIM_1_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DEST_SAMPLE 0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DISCARDED   1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_FLEX_SAMPLE 2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_MCAST       3
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_SRC_SAMPLE  4
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_TRUNCATED   5
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_RESERVED         6
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_SYS_OPCODE       7
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT          8
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_FIELD_NAME_MAP_INIT \
+    {"FLAG_DEST_SAMPLE", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DEST_SAMPLE},\
+    {"FLAG_DISCARDED", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DISCARDED},\
+    {"FLAG_FLEX_SAMPLE", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_FLEX_SAMPLE},\
+    {"FLAG_MCAST", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_MCAST},\
+    {"FLAG_SRC_SAMPLE", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_SRC_SAMPLE},\
+    {"FLAG_TRUNCATED", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_TRUNCATED},\
+    {"RESERVED", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_RESERVED},\
+    {"SYS_OPCODE", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_SYS_OPCODE},\
+    {"sflow_shim_1_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT}
+
+/*!
+ * \name SFLOW_SHIM_2_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_2_T_SEQUENCE_NUM   0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_2_T_USER_META_DATA 1
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT          2
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_2_T_FIELD_NAME_MAP_INIT \
+    {"SEQUENCE_NUM", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_2_T_SEQUENCE_NUM},\
+    {"USER_META_DATA", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_2_T_USER_META_DATA},\
+    {"sflow_shim_2_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT}
+
+/*!
+ * \name SNAP_LLC_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SNAP_LLC_T_LENGTH   0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SNAP_LLC_T_SNAP_LLC 1
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SNAP_LLC_T_FID_COUNT          2
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SNAP_LLC_T_FIELD_NAME_MAP_INIT \
+    {"LENGTH", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SNAP_LLC_T_LENGTH},\
+    {"SNAP_LLC", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SNAP_LLC_T_SNAP_LLC},\
+    {"snap_llc_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SNAP_LLC_T_FID_COUNT}
+
+/*!
+ * \name SVTAG_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SVTAG_T_DATA_LWR 0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SVTAG_T_DATA_UPR 1
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SVTAG_T_FID_COUNT          2
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SVTAG_T_FIELD_NAME_MAP_INIT \
+    {"DATA_LWR", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SVTAG_T_DATA_LWR},\
+    {"DATA_UPR", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SVTAG_T_DATA_UPR},\
+    {"svtag_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SVTAG_T_FID_COUNT}
+
+/*!
+ * \name TCP_FIRST_4BYTES_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT 0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT 1
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT          2
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT \
+    {"DST_PORT", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT},\
+    {"SRC_PORT", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT},\
+    {"tcp_first_4bytes_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT}
+
+/*!
+ * \name TCP_LAST_16BYTES_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM           0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM          1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS 2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM           3
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR        4
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE          5
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT          6
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT \
+    {"ACK_NUM", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM},\
+    {"CHECKSUM", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM},\
+    {"HDR_LEN_AND_FLAGS", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS},\
+    {"SEQ_NUM", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM},\
+    {"URGENT_PTR", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR},\
+    {"WIN_SIZE", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE},\
+    {"tcp_last_16bytes_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT}
+
+/*!
+ * \name UDP_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UDP_T_CHECKSUM   0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UDP_T_DST_PORT   1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UDP_T_SRC_PORT   2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UDP_T_UDP_LENGTH 3
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UDP_T_FID_COUNT          4
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT \
+    {"CHECKSUM", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UDP_T_CHECKSUM},\
+    {"DST_PORT", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UDP_T_DST_PORT},\
+    {"SRC_PORT", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UDP_T_SRC_PORT},\
+    {"UDP_LENGTH", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UDP_T_UDP_LENGTH},\
+    {"udp_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UDP_T_FID_COUNT}
+
+/*!
+ * \name UNKNOWN_L3_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD 0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD  1
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT          2
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT \
+    {"FIRST_16BYTES_OF_L3_PAYLOAD", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD},\
+    {"NEXT_16BYTES_OF_L3_PAYLOAD", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD},\
+    {"unknown_l3_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT}
+
+/*!
+ * \name UNKNOWN_L4_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD 0
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT          1
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT \
+    {"FIRST_4BYTES_OF_L4_PAYLOAD", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD},\
+    {"unknown_l4_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT}
+
+/*!
+ * \name UNKNOWN_L5_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1 0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3 1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7 2
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT          3
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT \
+    {"L5_BYTES_0_1", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1},\
+    {"L5_BYTES_2_3", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3},\
+    {"L5_BYTES_4_7", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7},\
+    {"unknown_l5_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT}
+
+/*!
+ * \name VLAN_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VLAN_T_CFI  0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VLAN_T_PCP  1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VLAN_T_TPID 2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VLAN_T_VID  3
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VLAN_T_FID_COUNT          4
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT \
+    {"CFI", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VLAN_T_CFI},\
+    {"PCP", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VLAN_T_PCP},\
+    {"TPID", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VLAN_T_TPID},\
+    {"VID", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VLAN_T_VID},\
+    {"vlan_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VLAN_T_FID_COUNT}
+
+/*!
+ * \name VNTAG_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VNTAG_T_TAG  0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VNTAG_T_TPID 1
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VNTAG_T_FID_COUNT          2
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VNTAG_T_FIELD_NAME_MAP_INIT \
+    {"TAG", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VNTAG_T_TAG},\
+    {"TPID", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VNTAG_T_TPID},\
+    {"vntag_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VNTAG_T_FID_COUNT}
+
+/*!
+ * \name VXLAN_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VXLAN_T_FLAGS_RESERVED_1 0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VXLAN_T_RESERVED2        1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VXLAN_T_VN_ID            2
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VXLAN_T_FID_COUNT          3
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT \
+    {"FLAGS_RESERVED_1", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VXLAN_T_FLAGS_RESERVED_1},\
+    {"RESERVED2", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VXLAN_T_RESERVED2},\
+    {"VN_ID", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VXLAN_T_VN_ID},\
+    {"vxlan_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VXLAN_T_FID_COUNT}
+
+/*!
+ * \name WESP_T field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_FLAGS       0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_HEADER_LEN  1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_NEXT_HEADER 2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_SEQ_NUM     3
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_SPI         4
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_TRAILER_LEN 5
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_WESP_IV     6
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_FID_COUNT          7
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_FIELD_NAME_MAP_INIT \
+    {"FLAGS", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_FLAGS},\
+    {"HEADER_LEN", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_HEADER_LEN},\
+    {"NEXT_HEADER", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_NEXT_HEADER},\
+    {"SEQ_NUM", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_SEQ_NUM},\
+    {"SPI", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_SPI},\
+    {"TRAILER_LEN", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_TRAILER_LEN},\
+    {"WESP_IV", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_WESP_IV},\
+    {"wesp_t fid count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_FID_COUNT}
+
+
+#endif /* BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_FLEXHDR_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_bcmpkt_rxpmd_flex_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_bcmpkt_rxpmd_flex_data.h
new file mode 100644
index 000000000000..f88da896c065
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_bcmpkt_rxpmd_flex_data.h
@@ -0,0 +1,181 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) map.yml.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_DATA_H
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_DATA_H
+
+/*!
+ * \name RX flex metadata field IDs.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_DLB_ECMP_DESTINATION_15_0                                 0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0                                            1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_DVP_15_0                                                  2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_7_0                                         3
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_EGR_MTOP_INDEX_HI_3_0                                     4
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_EGR_MTOP_INDEX_LO_EP_NIH_DROP_CODE_OR_IFP_OPAQUE_OBJ_15_0 5
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_EM_FT_OPAQUE_OBJ_OR_IFP_OPAQUE_OBJ_15_0                   6
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_HIGH_3_0                                    7
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0                                    8
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_15_0                                 9
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_31_16                                10
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_15_0                                   11
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_16                                  12
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32                                  13
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0                                         14
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_IFP_IOAM_GBP_ACTION_3_0                                   15
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_IFP_TO_EP_MACSEC_INFO_OR_IFP_OPAQUE_OBJ_15_0              16
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_IFP_TS_CONTROL_ACTION_3_0                                 17
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_15_0                                        18
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_16                                       19
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_INGRESS_PP_PORT_7_0                                       20
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0            21
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0                               22
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_INT_PRI_3_0                                               23
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_L2_IIF_10_0                                               24
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_L2_OIF_10_0                                               25
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_L3_IIF_13_0                                               26
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0                                             27
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_MPLS_LABEL_DECAP_COUNT_3_0                                28
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0                         29
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_15_0                                         30
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0                                       31
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0                                       32
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_SVP_15_0                                                  33
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0                              34
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0                                   35
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_SYSTEM_ENTROPY_15_0                                       36
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0                                         37
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_SYSTEM_SOURCE_15_0                                        38
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_TIMESTAMP_CTRL_3_0                                        39
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0                           40
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_VFI_15_0                                                  41
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_VLAN_TAG_PRESERVE_CTRL_SVP_MIRROR_ENABLE_1_0              42
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_FID_COUNT                       43
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_COUNT                    46
+
+/*!
+ * \name Packet Flex Reason Types.
+ */
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS                               0
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED 1
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED                    2
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED  3
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED                     4
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP                                  5
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT                                   6
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_IFP                                     7
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER                               8
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED      9
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT                                   10
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP                           11
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS                      12
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE                      13
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP                           14
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS                      15
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR                            16
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF                        17
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR                            18
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL                        19
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD                    20
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0                      21
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1                      22
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2                      23
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3                      24
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4                      25
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5                      26
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6                      27
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7                      28
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD            29
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED              30
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED                  31
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU                    32
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MTOP_IPV4_GATEWAY                       33
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU                          34
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED              35
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT                            36
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_RESERVED_TRACE_BIT                      37
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP                                38
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD         39
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_SVP                                     40
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP                               41
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU                42
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR                     43
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED                       44
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_VFP                                     45
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT \
+    {"CML_FLAGS", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS},\
+    {"DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED},\
+    {"DLB_ECMP_PKT_SAMPLED", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED},\
+    {"DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED},\
+    {"DLB_LAG_PKT_SAMPLED", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED},\
+    {"DST_FP", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP},\
+    {"EM_FT", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT},\
+    {"IFP", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_IFP},\
+    {"IFP_METER", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER},\
+    {"IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED},\
+    {"IVXLT", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT},\
+    {"L2_DST_LOOKUP", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP},\
+    {"L2_DST_LOOKUP_MISS", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS},\
+    {"L2_SRC_STATIC_MOVE", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE},\
+    {"L3_DST_LOOKUP", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP},\
+    {"L3_DST_LOOKUP_MISS", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS},\
+    {"L3_HDR_ERROR", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR},\
+    {"L3_IIF_EQ_L3_OIF", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF},\
+    {"L3_TTL_ERROR", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR},\
+    {"LEARN_CACHE_FULL", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL},\
+    {"MACSA_MULTICAST_RSVD", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD},\
+    {"MATCHED_RULE_BIT_0", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0},\
+    {"MATCHED_RULE_BIT_1", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1},\
+    {"MATCHED_RULE_BIT_2", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2},\
+    {"MATCHED_RULE_BIT_3", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3},\
+    {"MATCHED_RULE_BIT_4", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4},\
+    {"MATCHED_RULE_BIT_5", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5},\
+    {"MATCHED_RULE_BIT_6", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6},\
+    {"MATCHED_RULE_BIT_7", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7},\
+    {"MEMBERSHIP_CHECK_FAILED_RSVD", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD},\
+    {"MIRROR_SAMPLER_EGR_SAMPLED", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED},\
+    {"MIRROR_SAMPLER_SAMPLED", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED},\
+    {"MPLS_CTRL_PKT_TO_CPU", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU},\
+    {"MTOP_IPV4_GATEWAY", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MTOP_IPV4_GATEWAY},\
+    {"NO_COPY_TO_CPU", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU},\
+    {"PKT_INTEGRITY_CHECK_FAILED", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED},\
+    {"PROTOCOL_PKT", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT},\
+    {"RESERVED_TRACE_BIT", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_RESERVED_TRACE_BIT},\
+    {"SER_DROP", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP},\
+    {"SPANNING_TREE_CHECK_FAILED_RSVD", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD},\
+    {"SVP", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_SVP},\
+    {"TRACE_DOP", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP},\
+    {"TRACE_DO_NOT_COPY_TO_CPU", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU},\
+    {"TRACE_DO_NOT_MIRROR", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR},\
+    {"URPF_CHECK_FAILED", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED},\
+    {"VFP", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_VFP},\
+    {"flex reason count", BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_COUNT}
+
+#endif /* BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_bcmpkt_rxpmd_match_id_defs.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_bcmpkt_rxpmd_match_id_defs.h
new file mode 100644
index 000000000000..be31c26a21f3
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_bcmpkt_rxpmd_match_id_defs.h
@@ -0,0 +1,417 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) bcm56780_a0_dna_6_5_31_7_0_sf_match_id_info.yml
+ * for device bcm56780_a0 and variant dna_6_5_31_7_0.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H
+
+#include <bcmpkt/bcmpkt_rxpmd_match_id.h>
+
+/*!
+ * \brief Get the Match ID DataBase information.
+ *
+ * \retval bcmpkt_rxpmd_match_id_db_info_t Match ID DataBase information.
+*/
+extern bcmpkt_rxpmd_match_id_db_info_t *
+    bcm56780_a0_dna_6_5_31_7_0_rxpmd_match_id_db_info_get(void);
+
+/*!
+ * \brief Get the Match ID Mapping information.
+ *
+ * \retval bcmpkt_rxpmd_match_id_map_info_t Match ID Mapping information.
+*/
+extern bcmpkt_rxpmd_match_id_map_info_t *
+    bcm56780_a0_dna_6_5_31_7_0_rxpmd_match_id_map_info_get(void);
+
+/*!
+  \name RXPMD Match IDs
+*/
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ETAG  0
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_BASE  1
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0  2
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG  3
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2  4
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE  5
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG  6
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC  7
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SVTAG  8
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_VNTAG  9
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP  10
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1  11
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2  12
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD  13
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT  14
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE  15
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1  16
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2  17
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE  18
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE  19
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM  20
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY  21
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT  22
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ  23
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP  24
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA  25
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP  26
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4  27
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6  28
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0  29
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1  30
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2  31
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3  32
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4  33
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5  34
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6  35
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH  36
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW  37
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE  38
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588  39
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP  40
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES  41
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES  42
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP  43
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3  44
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4  45
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5  46
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN  47
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH  48
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK  49
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE  50
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ETAG  51
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE  52
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0  53
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG  54
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2  55
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE  56
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG  57
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC  58
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SVTAG  59
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_VNTAG  60
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP  61
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1  62
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2  63
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD  64
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT  65
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE  66
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1  67
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2  68
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE  69
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE  70
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM  71
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY  72
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT  73
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ  74
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP  75
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA  76
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP  77
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4  78
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6  79
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0  80
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1  81
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2  82
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3  83
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4  84
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5  85
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6  86
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH  87
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW  88
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE  89
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588  90
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP  91
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES  92
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES  93
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP  94
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3  95
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4  96
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5  97
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN  98
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ETAG  99
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG  100
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2  101
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE  102
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG  103
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC  104
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_VNTAG  105
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP  106
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1  107
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2  108
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD  109
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT  110
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE  111
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1  112
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2  113
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP  114
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA  115
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP  116
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4  117
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6  118
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE  119
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588  120
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP  121
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES  122
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES  123
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP  124
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3  125
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4  126
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5  127
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ETAG  128
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_BASE  129
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0  130
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG  131
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2  132
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE  133
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG  134
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC  135
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SVTAG  136
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_VNTAG  137
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP  138
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1  139
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2  140
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD  141
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT  142
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE  143
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1  144
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2  145
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE  146
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE  147
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM  148
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY  149
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT  150
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ  151
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP  152
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA  153
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP  154
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4  155
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6  156
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0  157
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1  158
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2  159
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3  160
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4  161
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5  162
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6  163
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH  164
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW  165
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE  166
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588  167
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP  168
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES  169
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES  170
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP  171
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3  172
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4  173
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5  174
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN  175
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH  176
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK  177
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE  178
+#define BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_COUNT  179
+
+#define BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT \
+    {"EGRESS_PKT_FWD_L2_HDR_ETAG", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ETAG}, \
+    {"EGRESS_PKT_FWD_L2_HDR_HG3_BASE", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_BASE}, \
+    {"EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0}, \
+    {"EGRESS_PKT_FWD_L2_HDR_ITAG", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG}, \
+    {"EGRESS_PKT_FWD_L2_HDR_L2", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2}, \
+    {"EGRESS_PKT_FWD_L2_HDR_NONE", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE}, \
+    {"EGRESS_PKT_FWD_L2_HDR_OTAG", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG}, \
+    {"EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC}, \
+    {"EGRESS_PKT_FWD_L2_HDR_SVTAG", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SVTAG}, \
+    {"EGRESS_PKT_FWD_L2_HDR_VNTAG", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_VNTAG}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ARP", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_BFD", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GPE", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ICMP", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IGMP", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV4", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV6", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS0", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS1", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS2", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS3", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS4", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS5", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS6", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_NONE", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_P_1588", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_RARP", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UDP", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_VXLAN", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN}, \
+    {"EGRESS_PKT_SYS_HDR_EP_NIH", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH}, \
+    {"EGRESS_PKT_SYS_HDR_LOOPBACK", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK}, \
+    {"EGRESS_PKT_SYS_HDR_NONE", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_ETAG", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ETAG}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_ITAG", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_L2", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_NONE", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_OTAG", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_SVTAG", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SVTAG}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_VNTAG", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_VNTAG}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN}, \
+    {"INGRESS_PKT_INNER_L2_HDR_ETAG", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ETAG}, \
+    {"INGRESS_PKT_INNER_L2_HDR_ITAG", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG}, \
+    {"INGRESS_PKT_INNER_L2_HDR_L2", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2}, \
+    {"INGRESS_PKT_INNER_L2_HDR_NONE", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE}, \
+    {"INGRESS_PKT_INNER_L2_HDR_OTAG", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG}, \
+    {"INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC}, \
+    {"INGRESS_PKT_INNER_L2_HDR_VNTAG", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_VNTAG}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ARP", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_BFD", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ICMP", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_IGMP", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV4", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV6", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_NONE", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_P_1588", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_RARP", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UDP", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_ETAG", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ETAG}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_HG3_BASE", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_BASE}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_ITAG", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_L2", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_NONE", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_OTAG", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_SVTAG", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SVTAG}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_VNTAG", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_VNTAG}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ARP", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_BFD", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GPE", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ICMP", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IGMP", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV4", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV6", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_NONE", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_P_1588", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_RARP", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UDP", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN}, \
+    {"INGRESS_PKT_SYS_HDR_EP_NIH", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH}, \
+    {"INGRESS_PKT_SYS_HDR_LOOPBACK", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK}, \
+    {"INGRESS_PKT_SYS_HDR_NONE", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE}, \
+    {"rxpmd_match_id_count", BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_COUNT}
+
+#endif /*! BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_bcmpkt_flexhdr.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_bcmpkt_flexhdr.h
deleted file mode 100644
index 093abf95c165..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_bcmpkt_flexhdr.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) header.yml.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_FLEXHDR_H
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_FLEXHDR_H
-
-#include <bcmpkt/bcmpkt_flexhdr_internal.h>
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ARP_T                      0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_AUTHEN_T                   1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T                      2
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CNTAG_T                    3
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_0_T         4
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_1_T         5
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_DEST_OPTION_T              6
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_EP_NIH_HEADER_T            7
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T        8
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T         9
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ESP_T                      10
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ETAG_T                     11
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ETHERTYPE_T                12
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_FRAG_T                     13
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T         14
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GPE_T                      15
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_CHKSUM_T               16
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_KEY_T                  17
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_ROUT_T                 18
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_SEQ_T                  19
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_T                      20
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_HOP_BY_HOP_T               21
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ICMP_T                     22
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_0_A_T          23
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_0_B_T          24
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_1_T            25
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_2_T            26
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_3_T            27
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_HEADER_T               28
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_MD_BASE_T              29
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_METADATA_T             30
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IGMP_T                     31
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPFIX_T                    32
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV4_T                     33
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV6_T                     34
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_L2_T                       35
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MIRROR_ERSPAN_SN_T         36
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MIRROR_TRANSPORT_T         37
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_ACH_T                 38
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_BV_T                  39
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_CW_T                  40
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_T                     41
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_P_1588_T                   42
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PROG_EXT_HDR_T             43
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_0_T                  44
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_1_T                  45
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T   46
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T   47
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RARP_T                     48
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ROUTING_T                  49
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RSPAN_T                    50
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_0_T             51
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_1_T             52
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_2_T             53
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SNAP_LLC_T                 54
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SVTAG_T                    55
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_TCP_FIRST_4BYTES_T         56
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_TCP_LAST_16BYTES_T         57
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UDP_T                      58
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L3_T               59
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L4_T               60
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L5_T               61
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VLAN_T                     62
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VNTAG_T                    63
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VXLAN_T                    64
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_WESP_T                     65
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_T               66
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_FLEXHDR_COUNT    67
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_FLEXHDR_NAME_MAP_INIT \
-    {"arp_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ARP_T},\
-    {"authen_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_AUTHEN_T},\
-    {"bfd_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T},\
-    {"cntag_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CNTAG_T},\
-    {"cpu_composites_0_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_0_T},\
-    {"cpu_composites_1_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_1_T},\
-    {"dest_option_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_DEST_OPTION_T},\
-    {"ep_nih_header_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_EP_NIH_HEADER_T},\
-    {"erspan3_fixed_hdr_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T},\
-    {"erspan3_subhdr_5_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T},\
-    {"esp_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ESP_T},\
-    {"etag_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ETAG_T},\
-    {"ethertype_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ETHERTYPE_T},\
-    {"frag_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_FRAG_T},\
-    {"generic_loopback_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T},\
-    {"gpe_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GPE_T},\
-    {"gre_chksum_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_CHKSUM_T},\
-    {"gre_key_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_KEY_T},\
-    {"gre_rout_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_ROUT_T},\
-    {"gre_seq_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_SEQ_T},\
-    {"gre_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_T},\
-    {"hop_by_hop_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_HOP_BY_HOP_T},\
-    {"icmp_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ICMP_T},\
-    {"ifa_flex_md_0_a_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_0_A_T},\
-    {"ifa_flex_md_0_b_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_0_B_T},\
-    {"ifa_flex_md_1_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_1_T},\
-    {"ifa_flex_md_2_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_2_T},\
-    {"ifa_flex_md_3_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_3_T},\
-    {"ifa_header_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_HEADER_T},\
-    {"ifa_md_base_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_MD_BASE_T},\
-    {"ifa_metadata_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_METADATA_T},\
-    {"igmp_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IGMP_T},\
-    {"ipfix_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPFIX_T},\
-    {"ipv4_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV4_T},\
-    {"ipv6_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV6_T},\
-    {"l2_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_L2_T},\
-    {"mirror_erspan_sn_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MIRROR_ERSPAN_SN_T},\
-    {"mirror_transport_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MIRROR_TRANSPORT_T},\
-    {"mpls_ach_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_ACH_T},\
-    {"mpls_bv_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_BV_T},\
-    {"mpls_cw_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_CW_T},\
-    {"mpls_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_T},\
-    {"p_1588_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_P_1588_T},\
-    {"prog_ext_hdr_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PROG_EXT_HDR_T},\
-    {"psamp_0_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_0_T},\
-    {"psamp_1_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_1_T},\
-    {"psamp_mirror_on_drop_0_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T},\
-    {"psamp_mirror_on_drop_3_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T},\
-    {"rarp_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RARP_T},\
-    {"routing_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ROUTING_T},\
-    {"rspan_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RSPAN_T},\
-    {"sflow_shim_0_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_0_T},\
-    {"sflow_shim_1_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_1_T},\
-    {"sflow_shim_2_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_2_T},\
-    {"snap_llc_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SNAP_LLC_T},\
-    {"svtag_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SVTAG_T},\
-    {"tcp_first_4bytes_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_TCP_FIRST_4BYTES_T},\
-    {"tcp_last_16bytes_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_TCP_LAST_16BYTES_T},\
-    {"udp_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UDP_T},\
-    {"unknown_l3_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L3_T},\
-    {"unknown_l4_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L4_T},\
-    {"unknown_l5_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L5_T},\
-    {"vlan_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VLAN_T},\
-    {"vntag_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VNTAG_T},\
-    {"vxlan_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VXLAN_T},\
-    {"wesp_t", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_WESP_T},\
-    {"RXPMD_FLEX_T", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_T},\
-    {"flexhdr count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_FLEXHDR_COUNT}
-
-#endif /* BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_FLEXHDR_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_bcmpkt_flexhdr_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_bcmpkt_flexhdr_data.h
deleted file mode 100644
index 8afacd3d5352..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_bcmpkt_flexhdr_data.h
+++ /dev/null
@@ -1,1258 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) header.yml.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_FLEXHDR_DATA_H
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_FLEXHDR_DATA_H
-
-/*!
- * \name ARP_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ARP_T_HARDWARE_LEN  0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ARP_T_HARDWARE_TYPE 1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ARP_T_OPERATION     2
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ARP_T_PROT_ADDR_LEN 3
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ARP_T_PROTOCOL_TYPE 4
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ARP_T_SENDER_HA     5
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ARP_T_SENDER_IP     6
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ARP_T_TARGET_HA     7
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ARP_T_TARGET_IP     8
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ARP_T_FID_COUNT          9
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT \
-    {"HARDWARE_LEN", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ARP_T_HARDWARE_LEN},\
-    {"HARDWARE_TYPE", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ARP_T_HARDWARE_TYPE},\
-    {"OPERATION", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ARP_T_OPERATION},\
-    {"PROT_ADDR_LEN", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ARP_T_PROT_ADDR_LEN},\
-    {"PROTOCOL_TYPE", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ARP_T_PROTOCOL_TYPE},\
-    {"SENDER_HA", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ARP_T_SENDER_HA},\
-    {"SENDER_IP", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ARP_T_SENDER_IP},\
-    {"TARGET_HA", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ARP_T_TARGET_HA},\
-    {"TARGET_IP", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ARP_T_TARGET_IP},\
-    {"arp_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ARP_T_FID_COUNT}
-
-/*!
- * \name AUTHEN_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_AUTHEN_T_DATA        0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_AUTHEN_T_NEXT_HEADER 1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_AUTHEN_T_PAYLOAD_LEN 2
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_AUTHEN_T_RESERVED    3
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_AUTHEN_T_SEQ_NUM     4
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_AUTHEN_T_SPI         5
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_AUTHEN_T_FID_COUNT          6
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_AUTHEN_T_FIELD_NAME_MAP_INIT \
-    {"DATA", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_AUTHEN_T_DATA},\
-    {"NEXT_HEADER", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_AUTHEN_T_NEXT_HEADER},\
-    {"PAYLOAD_LEN", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_AUTHEN_T_PAYLOAD_LEN},\
-    {"RESERVED", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_AUTHEN_T_RESERVED},\
-    {"SEQ_NUM", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_AUTHEN_T_SEQ_NUM},\
-    {"SPI", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_AUTHEN_T_SPI},\
-    {"authen_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_AUTHEN_T_FID_COUNT}
-
-/*!
- * \name BFD_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_AP            0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_BFD_LENGTH    1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_CPI           2
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_DEM           3
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_DESMINTXINTV  4
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_DETECTMULT    5
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_DIAG          6
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_FIN           7
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_MINECHORXINTV 8
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_MPT           9
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_MYDISCRIM     10
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_POLL          11
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_REQMINRXINTV  12
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_STA           13
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_URDISCRIM     14
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_VERSION       15
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_FID_COUNT          16
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_FIELD_NAME_MAP_INIT \
-    {"AP", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_AP},\
-    {"BFD_LENGTH", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_BFD_LENGTH},\
-    {"CPI", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_CPI},\
-    {"DEM", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_DEM},\
-    {"DESMINTXINTV", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_DESMINTXINTV},\
-    {"DETECTMULT", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_DETECTMULT},\
-    {"DIAG", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_DIAG},\
-    {"FIN", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_FIN},\
-    {"MINECHORXINTV", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_MINECHORXINTV},\
-    {"MPT", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_MPT},\
-    {"MYDISCRIM", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_MYDISCRIM},\
-    {"POLL", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_POLL},\
-    {"REQMINRXINTV", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_REQMINRXINTV},\
-    {"STA", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_STA},\
-    {"URDISCRIM", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_URDISCRIM},\
-    {"VERSION", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_VERSION},\
-    {"bfd_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_FID_COUNT}
-
-/*!
- * \name CNTAG_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CNTAG_T_RPID 0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CNTAG_T_TPID 1
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CNTAG_T_FID_COUNT          2
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CNTAG_T_FIELD_NAME_MAP_INIT \
-    {"RPID", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CNTAG_T_RPID},\
-    {"TPID", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CNTAG_T_TPID},\
-    {"cntag_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CNTAG_T_FID_COUNT}
-
-/*!
- * \name CPU_COMPOSITES_0_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0 0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1 1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2 2
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3 3
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4 4
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5 5
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6 6
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT          7
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT \
-    {"DMA_CONT0", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0},\
-    {"DMA_CONT1", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1},\
-    {"DMA_CONT2", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2},\
-    {"DMA_CONT3", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3},\
-    {"DMA_CONT4", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4},\
-    {"DMA_CONT5", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5},\
-    {"DMA_CONT6", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6},\
-    {"cpu_composites_0_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT}
-
-/*!
- * \name CPU_COMPOSITES_1_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10 0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11 1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12 2
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13 3
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14 4
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15 5
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16 6
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17 7
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7  8
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8  9
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9  10
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT          11
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT \
-    {"DMA_CONT10", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10},\
-    {"DMA_CONT11", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11},\
-    {"DMA_CONT12", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12},\
-    {"DMA_CONT13", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13},\
-    {"DMA_CONT14", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14},\
-    {"DMA_CONT15", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15},\
-    {"DMA_CONT16", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16},\
-    {"DMA_CONT17", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17},\
-    {"DMA_CONT7", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7},\
-    {"DMA_CONT8", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8},\
-    {"DMA_CONT9", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9},\
-    {"cpu_composites_1_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT}
-
-/*!
- * \name DEST_OPTION_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_DEST_OPTION_T_HDR_EXT_LEN 0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_DEST_OPTION_T_NEXT_HEADER 1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_DEST_OPTION_T_OPTION      2
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_DEST_OPTION_T_FID_COUNT          3
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_DEST_OPTION_T_FIELD_NAME_MAP_INIT \
-    {"HDR_EXT_LEN", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_DEST_OPTION_T_HDR_EXT_LEN},\
-    {"NEXT_HEADER", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_DEST_OPTION_T_NEXT_HEADER},\
-    {"OPTION", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_DEST_OPTION_T_OPTION},\
-    {"dest_option_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_DEST_OPTION_T_FID_COUNT}
-
-/*!
- * \name EP_NIH_HEADER_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_EP_NIH_HEADER_T_HEADER_SUBTYPE       0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_EP_NIH_HEADER_T_HEADER_TYPE          1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_A        2
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_B        3
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_C        4
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_A      5
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_B      6
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_C      7
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_EP_NIH_HEADER_T_RECIRC_PROFILE_INDEX 8
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_EP_NIH_HEADER_T_RESERVED_0           9
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_EP_NIH_HEADER_T_START                10
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_EP_NIH_HEADER_T_TIMESTAMP            11
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT          12
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_EP_NIH_HEADER_T_FIELD_NAME_MAP_INIT \
-    {"HEADER_SUBTYPE", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_EP_NIH_HEADER_T_HEADER_SUBTYPE},\
-    {"HEADER_TYPE", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_EP_NIH_HEADER_T_HEADER_TYPE},\
-    {"OPAQUE_CTRL_A", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_A},\
-    {"OPAQUE_CTRL_B", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_B},\
-    {"OPAQUE_CTRL_C", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_C},\
-    {"OPAQUE_OBJECT_A", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_A},\
-    {"OPAQUE_OBJECT_B", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_B},\
-    {"OPAQUE_OBJECT_C", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_C},\
-    {"RECIRC_PROFILE_INDEX", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_EP_NIH_HEADER_T_RECIRC_PROFILE_INDEX},\
-    {"RESERVED_0", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_EP_NIH_HEADER_T_RESERVED_0},\
-    {"START", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_EP_NIH_HEADER_T_START},\
-    {"TIMESTAMP", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_EP_NIH_HEADER_T_TIMESTAMP},\
-    {"ep_nih_header_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT}
-
-/*!
- * \name ERSPAN3_FIXED_HDR_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO               0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_COS               1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID           2
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O 3
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID        4
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_T                 5
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP         6
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VER               7
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN              8
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT          9
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT \
-    {"BSO", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO},\
-    {"COS", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_COS},\
-    {"GBP_SID", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID},\
-    {"P_FT_HWID_D_GRA_O", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O},\
-    {"SESSION_ID", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID},\
-    {"T", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_T},\
-    {"TIMESTAMP", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP},\
-    {"VER", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VER},\
-    {"VLAN", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN},\
-    {"erspan3_fixed_hdr_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT}
-
-/*!
- * \name ERSPAN3_SUBHDR_5_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID 0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID     1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID   2
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP   3
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT          4
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT \
-    {"PLATFORM_ID", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID},\
-    {"PORT_ID", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID},\
-    {"SWITCH_ID", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID},\
-    {"TIMESTAMP", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP},\
-    {"erspan3_subhdr_5_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT}
-
-/*!
- * \name ESP_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ESP_T_NEXT_HEADER 0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ESP_T_PAD         1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ESP_T_PAD_LEN     2
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ESP_T_SEQ_NUM     3
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ESP_T_SPI         4
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ESP_T_FID_COUNT          5
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ESP_T_FIELD_NAME_MAP_INIT \
-    {"NEXT_HEADER", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ESP_T_NEXT_HEADER},\
-    {"PAD", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ESP_T_PAD},\
-    {"PAD_LEN", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ESP_T_PAD_LEN},\
-    {"SEQ_NUM", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ESP_T_SEQ_NUM},\
-    {"SPI", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ESP_T_SPI},\
-    {"esp_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ESP_T_FID_COUNT}
-
-/*!
- * \name ETAG_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ETAG_T_TAG  0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ETAG_T_TPID 1
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ETAG_T_FID_COUNT          2
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ETAG_T_FIELD_NAME_MAP_INIT \
-    {"TAG", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ETAG_T_TAG},\
-    {"TPID", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ETAG_T_TPID},\
-    {"etag_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ETAG_T_FID_COUNT}
-
-/*!
- * \name ETHERTYPE_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ETHERTYPE_T_TYPE 0
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ETHERTYPE_T_FID_COUNT          1
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT \
-    {"TYPE", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ETHERTYPE_T_TYPE},\
-    {"ethertype_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ETHERTYPE_T_FID_COUNT}
-
-/*!
- * \name FRAG_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_FRAG_T_FRAG_INFO   0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_FRAG_T_ID          1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_FRAG_T_NEXT_HEADER 2
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_FRAG_T_RESERVED    3
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_FRAG_T_FID_COUNT          4
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_FRAG_T_FIELD_NAME_MAP_INIT \
-    {"FRAG_INFO", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_FRAG_T_FRAG_INFO},\
-    {"ID", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_FRAG_T_ID},\
-    {"NEXT_HEADER", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_FRAG_T_NEXT_HEADER},\
-    {"RESERVED", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_FRAG_T_RESERVED},\
-    {"frag_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_FRAG_T_FID_COUNT}
-
-/*!
- * \name GENERIC_LOOPBACK_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ    0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE   1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ        2
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_FLAGS              3
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE        4
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY     5
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL     6
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ      7
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0  8
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1  9
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ            10
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1         11
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT 12
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE         13
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_SVP                14
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT          15
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT \
-    {"DESTINATION_OBJ", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ},\
-    {"DESTINATION_TYPE", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE},\
-    {"ENTROPY_OBJ", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ},\
-    {"FLAGS", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_FLAGS},\
-    {"HEADER_TYPE", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE},\
-    {"INPUT_PRIORITY", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY},\
-    {"INTERFACE_CTRL", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL},\
-    {"INTERFACE_OBJ", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ},\
-    {"PROCESSING_CTRL_0", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0},\
-    {"PROCESSING_CTRL_1", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1},\
-    {"QOS_OBJ", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ},\
-    {"RESERVED_1", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1},\
-    {"SOURCE_SYSTEM_PORT", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT},\
-    {"START_BYTE", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE},\
-    {"SVP", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_SVP},\
-    {"generic_loopback_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT}
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NO_OP       0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2_OIF      1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED    2
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__VP          3
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP        4
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NHOP        5
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2MC_GROUP  6
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L3MC_GROUP  7
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED_1  8
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP_MEMBER 9
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__DEVICE_PORT 10
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_TYPE__TUNNEL  0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_TYPE__GENERIC 1
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__NOOP   0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__VFI    1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__L3_IIF 2
-
-/*!
- * \name GPE_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GPE_T_FLAGS         0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GPE_T_NEXT_PROTOCOL 1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GPE_T_RESERVED0     2
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GPE_T_RESERVED1     3
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GPE_T_VNI           4
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GPE_T_FID_COUNT          5
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GPE_T_FIELD_NAME_MAP_INIT \
-    {"FLAGS", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GPE_T_FLAGS},\
-    {"NEXT_PROTOCOL", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GPE_T_NEXT_PROTOCOL},\
-    {"RESERVED0", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GPE_T_RESERVED0},\
-    {"RESERVED1", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GPE_T_RESERVED1},\
-    {"VNI", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GPE_T_VNI},\
-    {"gpe_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GPE_T_FID_COUNT}
-
-/*!
- * \name GRE_CHKSUM_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_CHKSUM_T_CHECKSUM 0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_CHKSUM_T_OFFSET   1
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT          2
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_CHKSUM_T_FIELD_NAME_MAP_INIT \
-    {"CHECKSUM", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_CHKSUM_T_CHECKSUM},\
-    {"OFFSET", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_CHKSUM_T_OFFSET},\
-    {"gre_chksum_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT}
-
-/*!
- * \name GRE_KEY_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_KEY_T_KEY 0
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_KEY_T_FID_COUNT          1
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_KEY_T_FIELD_NAME_MAP_INIT \
-    {"KEY", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_KEY_T_KEY},\
-    {"gre_key_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_KEY_T_FID_COUNT}
-
-/*!
- * \name GRE_ROUT_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_ROUT_T_ROUTING 0
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_ROUT_T_FID_COUNT          1
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_ROUT_T_FIELD_NAME_MAP_INIT \
-    {"ROUTING", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_ROUT_T_ROUTING},\
-    {"gre_rout_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_ROUT_T_FID_COUNT}
-
-/*!
- * \name GRE_SEQ_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_SEQ_T_SEQUENCE 0
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_SEQ_T_FID_COUNT          1
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_SEQ_T_FIELD_NAME_MAP_INIT \
-    {"SEQUENCE", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_SEQ_T_SEQUENCE},\
-    {"gre_seq_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_SEQ_T_FID_COUNT}
-
-/*!
- * \name GRE_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_T_C_R_K_S  0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_T_PROTOCOL 1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_T_RESERVED 2
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_T_VERSION  3
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_T_FID_COUNT          4
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_T_FIELD_NAME_MAP_INIT \
-    {"C_R_K_S", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_T_C_R_K_S},\
-    {"PROTOCOL", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_T_PROTOCOL},\
-    {"RESERVED", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_T_RESERVED},\
-    {"VERSION", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_T_VERSION},\
-    {"gre_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_T_FID_COUNT}
-
-/*!
- * \name HOP_BY_HOP_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_HOP_BY_HOP_T_HDR_EXT_LEN 0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_HOP_BY_HOP_T_NEXT_HEADER 1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_HOP_BY_HOP_T_OPTION      2
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT          3
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_HOP_BY_HOP_T_FIELD_NAME_MAP_INIT \
-    {"HDR_EXT_LEN", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_HOP_BY_HOP_T_HDR_EXT_LEN},\
-    {"NEXT_HEADER", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_HOP_BY_HOP_T_NEXT_HEADER},\
-    {"OPTION", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_HOP_BY_HOP_T_OPTION},\
-    {"hop_by_hop_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT}
-
-/*!
- * \name ICMP_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ICMP_T_CHECKSUM  0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ICMP_T_CODE      1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ICMP_T_ICMP_TYPE 2
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ICMP_T_FID_COUNT          3
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT \
-    {"CHECKSUM", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ICMP_T_CHECKSUM},\
-    {"CODE", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ICMP_T_CODE},\
-    {"ICMP_TYPE", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ICMP_T_ICMP_TYPE},\
-    {"icmp_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ICMP_T_FID_COUNT}
-
-/*!
- * \name IFA_FLEX_MD_0_A_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_0_A_T_FWD_HDR_TTL   0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_0_A_T_LNS_DEVICE_ID 1
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT          2
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_0_A_T_FIELD_NAME_MAP_INIT \
-    {"FWD_HDR_TTL", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_0_A_T_FWD_HDR_TTL},\
-    {"LNS_DEVICE_ID", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_0_A_T_LNS_DEVICE_ID},\
-    {"ifa_flex_md_0_a_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT}
-
-/*!
- * \name IFA_FLEX_MD_0_B_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_0_B_T_CN               0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_0_B_T_PORT_SPEED       1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_0_B_T_QUEUE_ID         2
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_0_B_T_RX_TIMESTAMP_SEC 3
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT          4
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_0_B_T_FIELD_NAME_MAP_INIT \
-    {"CN", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_0_B_T_CN},\
-    {"PORT_SPEED", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_0_B_T_PORT_SPEED},\
-    {"QUEUE_ID", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_0_B_T_QUEUE_ID},\
-    {"RX_TIMESTAMP_SEC", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_0_B_T_RX_TIMESTAMP_SEC},\
-    {"ifa_flex_md_0_b_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT}
-
-/*!
- * \name IFA_FLEX_MD_1_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_1_T_EGRESS_PORT_ID       0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_1_T_INGRESS_PORT_ID      1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_1_T_RX_TIMESTAMP_NANOSEC 2
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT          3
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_1_T_FIELD_NAME_MAP_INIT \
-    {"EGRESS_PORT_ID", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_1_T_EGRESS_PORT_ID},\
-    {"INGRESS_PORT_ID", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_1_T_INGRESS_PORT_ID},\
-    {"RX_TIMESTAMP_NANOSEC", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_1_T_RX_TIMESTAMP_NANOSEC},\
-    {"ifa_flex_md_1_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT}
-
-/*!
- * \name IFA_FLEX_MD_2_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_2_T_RESIDENCE_TIME_NANOSEC 0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_2_T_TX_QUEUE_BYTE_COUNT    1
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT          2
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_2_T_FIELD_NAME_MAP_INIT \
-    {"RESIDENCE_TIME_NANOSEC", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_2_T_RESIDENCE_TIME_NANOSEC},\
-    {"TX_QUEUE_BYTE_COUNT", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_2_T_TX_QUEUE_BYTE_COUNT},\
-    {"ifa_flex_md_2_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT}
-
-/*!
- * \name IFA_FLEX_MD_3_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_3_T_MMU_STAT_0 0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_3_T_MMU_STAT_1 1
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT          2
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_3_T_FIELD_NAME_MAP_INIT \
-    {"MMU_STAT_0", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_3_T_MMU_STAT_0},\
-    {"MMU_STAT_1", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_3_T_MMU_STAT_1},\
-    {"ifa_flex_md_3_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT}
-
-/*!
- * \name IFA_HEADER_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_HEADER_T_FLAGS      0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_HEADER_T_GNS        1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_HEADER_T_MAX_LENGTH 2
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_HEADER_T_NEXT_HDR   3
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_HEADER_T_VER        4
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_HEADER_T_FID_COUNT          5
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_HEADER_T_FIELD_NAME_MAP_INIT \
-    {"FLAGS", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_HEADER_T_FLAGS},\
-    {"GNS", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_HEADER_T_GNS},\
-    {"MAX_LENGTH", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_HEADER_T_MAX_LENGTH},\
-    {"NEXT_HDR", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_HEADER_T_NEXT_HDR},\
-    {"VER", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_HEADER_T_VER},\
-    {"ifa_header_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_HEADER_T_FID_COUNT}
-
-/*!
- * \name IFA_MD_BASE_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_MD_BASE_T_ACTION_VECTOR            0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_MD_BASE_T_HOP_LIMIT_CURRENT_LENGTH 1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_MD_BASE_T_REQUEST_VECTOR           2
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_MD_BASE_T_FID_COUNT          3
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_MD_BASE_T_FIELD_NAME_MAP_INIT \
-    {"ACTION_VECTOR", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_MD_BASE_T_ACTION_VECTOR},\
-    {"HOP_LIMIT_CURRENT_LENGTH", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_MD_BASE_T_HOP_LIMIT_CURRENT_LENGTH},\
-    {"REQUEST_VECTOR", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_MD_BASE_T_REQUEST_VECTOR},\
-    {"ifa_md_base_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_MD_BASE_T_FID_COUNT}
-
-/*!
- * \name IFA_METADATA_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_METADATA_T_ACTION_VECTOR            0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_METADATA_T_HOP_LIMIT_CURRENT_LENGTH 1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_METADATA_T_METADATA                 2
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_METADATA_T_REQUEST_VECTOR           3
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_METADATA_T_FID_COUNT          4
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_METADATA_T_FIELD_NAME_MAP_INIT \
-    {"ACTION_VECTOR", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_METADATA_T_ACTION_VECTOR},\
-    {"HOP_LIMIT_CURRENT_LENGTH", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_METADATA_T_HOP_LIMIT_CURRENT_LENGTH},\
-    {"METADATA", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_METADATA_T_METADATA},\
-    {"REQUEST_VECTOR", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_METADATA_T_REQUEST_VECTOR},\
-    {"ifa_metadata_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_METADATA_T_FID_COUNT}
-
-/*!
- * \name IGMP_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IGMP_T_CHECKSUM      0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IGMP_T_GROUP_ADDRESS 1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IGMP_T_IGMP_TYPE     2
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IGMP_T_MAX_RESP_TIME 3
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IGMP_T_FID_COUNT          4
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IGMP_T_FIELD_NAME_MAP_INIT \
-    {"CHECKSUM", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IGMP_T_CHECKSUM},\
-    {"GROUP_ADDRESS", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IGMP_T_GROUP_ADDRESS},\
-    {"IGMP_TYPE", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IGMP_T_IGMP_TYPE},\
-    {"MAX_RESP_TIME", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IGMP_T_MAX_RESP_TIME},\
-    {"igmp_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IGMP_T_FID_COUNT}
-
-/*!
- * \name IPFIX_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPFIX_T_EXPORT_TIME   0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPFIX_T_LENGTH        1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPFIX_T_OBS_DOMAIN_ID 2
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPFIX_T_SEQUENCE_NUM  3
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPFIX_T_VERSION       4
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPFIX_T_FID_COUNT          5
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT \
-    {"EXPORT_TIME", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPFIX_T_EXPORT_TIME},\
-    {"LENGTH", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPFIX_T_LENGTH},\
-    {"OBS_DOMAIN_ID", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPFIX_T_OBS_DOMAIN_ID},\
-    {"SEQUENCE_NUM", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPFIX_T_SEQUENCE_NUM},\
-    {"VERSION", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPFIX_T_VERSION},\
-    {"ipfix_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPFIX_T_FID_COUNT}
-
-/*!
- * \name IPV4_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV4_T_DA                0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET 1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV4_T_HDR_CHECKSUM      2
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV4_T_ID                3
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV4_T_OPTION            4
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV4_T_PROTOCOL          5
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV4_T_SA                6
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV4_T_TOS               7
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV4_T_TOTAL_LENGTH      8
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV4_T_TTL               9
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV4_T_VERSION_HDR_LEN   10
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV4_T_FID_COUNT          11
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT \
-    {"DA", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV4_T_DA},\
-    {"FLAGS_FRAG_OFFSET", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET},\
-    {"HDR_CHECKSUM", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV4_T_HDR_CHECKSUM},\
-    {"ID", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV4_T_ID},\
-    {"OPTION", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV4_T_OPTION},\
-    {"PROTOCOL", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV4_T_PROTOCOL},\
-    {"SA", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV4_T_SA},\
-    {"TOS", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV4_T_TOS},\
-    {"TOTAL_LENGTH", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV4_T_TOTAL_LENGTH},\
-    {"TTL", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV4_T_TTL},\
-    {"VERSION_HDR_LEN", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV4_T_VERSION_HDR_LEN},\
-    {"ipv4_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV4_T_FID_COUNT}
-
-/*!
- * \name IPV6_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV6_T_DA             0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV6_T_FLOW_LABEL     1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV6_T_HOP_LIMIT      2
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV6_T_NEXT_HEADER    3
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV6_T_PAYLOAD_LENGTH 4
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV6_T_SA             5
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV6_T_TRAFFIC_CLASS  6
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV6_T_VERSION        7
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV6_T_FID_COUNT          8
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT \
-    {"DA", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV6_T_DA},\
-    {"FLOW_LABEL", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV6_T_FLOW_LABEL},\
-    {"HOP_LIMIT", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV6_T_HOP_LIMIT},\
-    {"NEXT_HEADER", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV6_T_NEXT_HEADER},\
-    {"PAYLOAD_LENGTH", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV6_T_PAYLOAD_LENGTH},\
-    {"SA", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV6_T_SA},\
-    {"TRAFFIC_CLASS", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV6_T_TRAFFIC_CLASS},\
-    {"VERSION", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV6_T_VERSION},\
-    {"ipv6_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV6_T_FID_COUNT}
-
-/*!
- * \name L2_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_L2_T_MACDA 0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_L2_T_MACSA 1
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_L2_T_FID_COUNT          2
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_L2_T_FIELD_NAME_MAP_INIT \
-    {"MACDA", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_L2_T_MACDA},\
-    {"MACSA", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_L2_T_MACSA},\
-    {"l2_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_L2_T_FID_COUNT}
-
-/*!
- * \name MIRROR_ERSPAN_SN_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM 0
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT          1
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT \
-    {"SEQ_NUM", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM},\
-    {"mirror_erspan_sn_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT}
-
-/*!
- * \name MIRROR_TRANSPORT_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MIRROR_TRANSPORT_T_DATA 0
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT          1
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT \
-    {"DATA", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MIRROR_TRANSPORT_T_DATA},\
-    {"mirror_transport_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT}
-
-/*!
- * \name MPLS_ACH_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_ACH_T_CHANNEL_TYPE 0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_ACH_T_CW_TYPE      1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_ACH_T_RESERVED     2
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_ACH_T_VERSION      3
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_ACH_T_FID_COUNT          4
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_ACH_T_FIELD_NAME_MAP_INIT \
-    {"CHANNEL_TYPE", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_ACH_T_CHANNEL_TYPE},\
-    {"CW_TYPE", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_ACH_T_CW_TYPE},\
-    {"RESERVED", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_ACH_T_RESERVED},\
-    {"VERSION", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_ACH_T_VERSION},\
-    {"mpls_ach_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_ACH_T_FID_COUNT}
-
-/*!
- * \name MPLS_BV_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_BV_T_VALUE 0
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_BV_T_FID_COUNT          1
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_BV_T_FIELD_NAME_MAP_INIT \
-    {"VALUE", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_BV_T_VALUE},\
-    {"mpls_bv_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_BV_T_FID_COUNT}
-
-/*!
- * \name MPLS_CW_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_CW_T_CW_TYPE    0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_CW_T_RESERVED   1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_CW_T_SEQ_NUMBER 2
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_CW_T_FID_COUNT          3
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_CW_T_FIELD_NAME_MAP_INIT \
-    {"CW_TYPE", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_CW_T_CW_TYPE},\
-    {"RESERVED", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_CW_T_RESERVED},\
-    {"SEQ_NUMBER", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_CW_T_SEQ_NUMBER},\
-    {"mpls_cw_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_CW_T_FID_COUNT}
-
-/*!
- * \name MPLS_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_T_BOS   0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_T_EXP   1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_T_LABEL 2
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_T_TTL   3
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_T_FID_COUNT          4
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_T_FIELD_NAME_MAP_INIT \
-    {"BOS", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_T_BOS},\
-    {"EXP", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_T_EXP},\
-    {"LABEL", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_T_LABEL},\
-    {"TTL", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_T_TTL},\
-    {"mpls_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_T_FID_COUNT}
-
-/*!
- * \name P_1588_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_P_1588_T_CNTRL          0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_P_1588_T_CORRECTION     1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_P_1588_T_DOMAIN_NB      2
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_P_1588_T_FLAGS          3
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_P_1588_T_LOGMSGINTERVAL 4
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_P_1588_T_MSG_LENGTH     5
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_P_1588_T_MSG_TYPE       6
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_P_1588_T_RESERVED1      7
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_P_1588_T_RESERVED2      8
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_P_1588_T_RESERVED3      9
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_P_1588_T_SEQ_ID         10
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_P_1588_T_SRCPORTID      11
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_P_1588_T_TRANSPORTSPEC  12
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_P_1588_T_VERSION        13
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_P_1588_T_FID_COUNT          14
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_P_1588_T_FIELD_NAME_MAP_INIT \
-    {"CNTRL", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_P_1588_T_CNTRL},\
-    {"CORRECTION", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_P_1588_T_CORRECTION},\
-    {"DOMAIN_NB", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_P_1588_T_DOMAIN_NB},\
-    {"FLAGS", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_P_1588_T_FLAGS},\
-    {"LOGMSGINTERVAL", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_P_1588_T_LOGMSGINTERVAL},\
-    {"MSG_LENGTH", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_P_1588_T_MSG_LENGTH},\
-    {"MSG_TYPE", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_P_1588_T_MSG_TYPE},\
-    {"RESERVED1", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_P_1588_T_RESERVED1},\
-    {"RESERVED2", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_P_1588_T_RESERVED2},\
-    {"RESERVED3", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_P_1588_T_RESERVED3},\
-    {"SEQ_ID", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_P_1588_T_SEQ_ID},\
-    {"SRCPORTID", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_P_1588_T_SRCPORTID},\
-    {"TRANSPORTSPEC", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_P_1588_T_TRANSPORTSPEC},\
-    {"VERSION", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_P_1588_T_VERSION},\
-    {"p_1588_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_P_1588_T_FID_COUNT}
-
-/*!
- * \name PROG_EXT_HDR_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PROG_EXT_HDR_T_HDR_EXT_LEN 0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PROG_EXT_HDR_T_NEXT_HEADER 1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PROG_EXT_HDR_T_OPTION      2
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT          3
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PROG_EXT_HDR_T_FIELD_NAME_MAP_INIT \
-    {"HDR_EXT_LEN", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PROG_EXT_HDR_T_HDR_EXT_LEN},\
-    {"NEXT_HEADER", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PROG_EXT_HDR_T_NEXT_HEADER},\
-    {"OPTION", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PROG_EXT_HDR_T_OPTION},\
-    {"prog_ext_hdr_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT}
-
-/*!
- * \name PSAMP_0_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_0_T_FLOWSET        0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_0_T_LENGTH         1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_0_T_NEXT_HOP_INDEX 2
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_0_T_OBS_TIME_NS    3
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_0_T_OBS_TIME_S     4
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_0_T_TEMPLATE_ID    5
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_0_T_FID_COUNT          6
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_0_T_FIELD_NAME_MAP_INIT \
-    {"FLOWSET", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_0_T_FLOWSET},\
-    {"LENGTH", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_0_T_LENGTH},\
-    {"NEXT_HOP_INDEX", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_0_T_NEXT_HOP_INDEX},\
-    {"OBS_TIME_NS", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_0_T_OBS_TIME_NS},\
-    {"OBS_TIME_S", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_0_T_OBS_TIME_S},\
-    {"TEMPLATE_ID", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_0_T_TEMPLATE_ID},\
-    {"psamp_0_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_0_T_FID_COUNT}
-
-/*!
- * \name PSAMP_1_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_1_T_DLB_ID         0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_1_T_EGRESS_PORT    1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_1_T_EPOCH          2
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_1_T_INGRESS_PORT   3
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_1_T_SAMPLED_LENGTH 4
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_1_T_USER_META_DATA 5
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_1_T_VARIABLE_FLAG  6
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_1_T_FID_COUNT          7
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_1_T_FIELD_NAME_MAP_INIT \
-    {"DLB_ID", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_1_T_DLB_ID},\
-    {"EGRESS_PORT", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_1_T_EGRESS_PORT},\
-    {"EPOCH", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_1_T_EPOCH},\
-    {"INGRESS_PORT", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_1_T_INGRESS_PORT},\
-    {"SAMPLED_LENGTH", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_1_T_SAMPLED_LENGTH},\
-    {"USER_META_DATA", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_1_T_USER_META_DATA},\
-    {"VARIABLE_FLAG", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_1_T_VARIABLE_FLAG},\
-    {"psamp_1_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_1_T_FID_COUNT}
-
-/*!
- * \name PSAMP_MIRROR_ON_DROP_0_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT 0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT    1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH          2
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS     3
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S      4
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID       5
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID     6
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT          7
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT \
-    {"EGRESS_MOD_PORT", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT},\
-    {"INGRESS_PORT", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT},\
-    {"LENGTH", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH},\
-    {"OBS_TIME_NS", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS},\
-    {"OBS_TIME_S", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S},\
-    {"SWITCH_ID", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID},\
-    {"TEMPLATE_ID", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID},\
-    {"psamp_mirror_on_drop_0_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT}
-
-/*!
- * \name PSAMP_MIRROR_ON_DROP_3_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_DROP_REASON             0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_RESERVED_0              1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SAMPLED_LENGTH          2
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SMOD_STATE              3
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_UC_COS__COLOR__PROB_IDX 4
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_USER_META_DATA          5
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_VAR_LEN_INDICATOR       6
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT          7
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FIELD_NAME_MAP_INIT \
-    {"DROP_REASON", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_DROP_REASON},\
-    {"RESERVED_0", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_RESERVED_0},\
-    {"SAMPLED_LENGTH", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SAMPLED_LENGTH},\
-    {"SMOD_STATE", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SMOD_STATE},\
-    {"UC_COS__COLOR__PROB_IDX", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_UC_COS__COLOR__PROB_IDX},\
-    {"USER_META_DATA", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_USER_META_DATA},\
-    {"VAR_LEN_INDICATOR", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_VAR_LEN_INDICATOR},\
-    {"psamp_mirror_on_drop_3_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT}
-
-/*!
- * \name RARP_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RARP_T_HARDWARE_LEN  0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RARP_T_HARDWARE_TYPE 1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RARP_T_OPERATION     2
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RARP_T_PROT_ADDR_LEN 3
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RARP_T_PROTOCOL_TYPE 4
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RARP_T_SENDER_HA     5
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RARP_T_SENDER_IP     6
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RARP_T_TARGET_HA     7
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RARP_T_TARGET_IP     8
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RARP_T_FID_COUNT          9
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT \
-    {"HARDWARE_LEN", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RARP_T_HARDWARE_LEN},\
-    {"HARDWARE_TYPE", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RARP_T_HARDWARE_TYPE},\
-    {"OPERATION", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RARP_T_OPERATION},\
-    {"PROT_ADDR_LEN", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RARP_T_PROT_ADDR_LEN},\
-    {"PROTOCOL_TYPE", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RARP_T_PROTOCOL_TYPE},\
-    {"SENDER_HA", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RARP_T_SENDER_HA},\
-    {"SENDER_IP", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RARP_T_SENDER_IP},\
-    {"TARGET_HA", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RARP_T_TARGET_HA},\
-    {"TARGET_IP", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RARP_T_TARGET_IP},\
-    {"rarp_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RARP_T_FID_COUNT}
-
-/*!
- * \name ROUTING_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ROUTING_T_DATA          0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ROUTING_T_HDR_EXT_LEN   1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ROUTING_T_NEXT_HEADER   2
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ROUTING_T_ROUTING_TYPE  3
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ROUTING_T_SEGMENTS_LEFT 4
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ROUTING_T_FID_COUNT          5
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ROUTING_T_FIELD_NAME_MAP_INIT \
-    {"DATA", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ROUTING_T_DATA},\
-    {"HDR_EXT_LEN", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ROUTING_T_HDR_EXT_LEN},\
-    {"NEXT_HEADER", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ROUTING_T_NEXT_HEADER},\
-    {"ROUTING_TYPE", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ROUTING_T_ROUTING_TYPE},\
-    {"SEGMENTS_LEFT", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ROUTING_T_SEGMENTS_LEFT},\
-    {"routing_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ROUTING_T_FID_COUNT}
-
-/*!
- * \name RSPAN_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RSPAN_T_TAG  0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RSPAN_T_TPID 1
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RSPAN_T_FID_COUNT          2
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RSPAN_T_FIELD_NAME_MAP_INIT \
-    {"TAG", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RSPAN_T_TAG},\
-    {"TPID", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RSPAN_T_TPID},\
-    {"rspan_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RSPAN_T_FID_COUNT}
-
-/*!
- * \name SFLOW_SHIM_0_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_0_T_SYS_DESTINATION 0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_0_T_SYS_SOURCE      1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_0_T_VERSION         2
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT          3
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_0_T_FIELD_NAME_MAP_INIT \
-    {"SYS_DESTINATION", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_0_T_SYS_DESTINATION},\
-    {"SYS_SOURCE", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_0_T_SYS_SOURCE},\
-    {"VERSION", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_0_T_VERSION},\
-    {"sflow_shim_0_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT}
-
-/*!
- * \name SFLOW_SHIM_1_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DEST_SAMPLE 0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DISCARDED   1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_FLEX_SAMPLE 2
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_MCAST       3
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_SRC_SAMPLE  4
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_TRUNCATED   5
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_1_T_RESERVED         6
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_1_T_SYS_OPCODE       7
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT          8
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_1_T_FIELD_NAME_MAP_INIT \
-    {"FLAG_DEST_SAMPLE", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DEST_SAMPLE},\
-    {"FLAG_DISCARDED", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DISCARDED},\
-    {"FLAG_FLEX_SAMPLE", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_FLEX_SAMPLE},\
-    {"FLAG_MCAST", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_MCAST},\
-    {"FLAG_SRC_SAMPLE", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_SRC_SAMPLE},\
-    {"FLAG_TRUNCATED", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_TRUNCATED},\
-    {"RESERVED", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_1_T_RESERVED},\
-    {"SYS_OPCODE", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_1_T_SYS_OPCODE},\
-    {"sflow_shim_1_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT}
-
-/*!
- * \name SFLOW_SHIM_2_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_2_T_SEQUENCE_NUM   0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_2_T_USER_META_DATA 1
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT          2
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_2_T_FIELD_NAME_MAP_INIT \
-    {"SEQUENCE_NUM", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_2_T_SEQUENCE_NUM},\
-    {"USER_META_DATA", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_2_T_USER_META_DATA},\
-    {"sflow_shim_2_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT}
-
-/*!
- * \name SNAP_LLC_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SNAP_LLC_T_LENGTH   0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SNAP_LLC_T_SNAP_LLC 1
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SNAP_LLC_T_FID_COUNT          2
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SNAP_LLC_T_FIELD_NAME_MAP_INIT \
-    {"LENGTH", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SNAP_LLC_T_LENGTH},\
-    {"SNAP_LLC", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SNAP_LLC_T_SNAP_LLC},\
-    {"snap_llc_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SNAP_LLC_T_FID_COUNT}
-
-/*!
- * \name SVTAG_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SVTAG_T_DATA_LWR 0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SVTAG_T_DATA_UPR 1
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SVTAG_T_FID_COUNT          2
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SVTAG_T_FIELD_NAME_MAP_INIT \
-    {"DATA_LWR", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SVTAG_T_DATA_LWR},\
-    {"DATA_UPR", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SVTAG_T_DATA_UPR},\
-    {"svtag_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SVTAG_T_FID_COUNT}
-
-/*!
- * \name TCP_FIRST_4BYTES_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT 0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT 1
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT          2
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT \
-    {"DST_PORT", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT},\
-    {"SRC_PORT", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT},\
-    {"tcp_first_4bytes_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT}
-
-/*!
- * \name TCP_LAST_16BYTES_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM           0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM          1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS 2
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM           3
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR        4
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE          5
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT          6
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT \
-    {"ACK_NUM", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM},\
-    {"CHECKSUM", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM},\
-    {"HDR_LEN_AND_FLAGS", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS},\
-    {"SEQ_NUM", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM},\
-    {"URGENT_PTR", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR},\
-    {"WIN_SIZE", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE},\
-    {"tcp_last_16bytes_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT}
-
-/*!
- * \name UDP_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UDP_T_CHECKSUM   0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UDP_T_DST_PORT   1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UDP_T_SRC_PORT   2
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UDP_T_UDP_LENGTH 3
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UDP_T_FID_COUNT          4
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT \
-    {"CHECKSUM", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UDP_T_CHECKSUM},\
-    {"DST_PORT", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UDP_T_DST_PORT},\
-    {"SRC_PORT", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UDP_T_SRC_PORT},\
-    {"UDP_LENGTH", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UDP_T_UDP_LENGTH},\
-    {"udp_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UDP_T_FID_COUNT}
-
-/*!
- * \name UNKNOWN_L3_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD 0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD  1
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT          2
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT \
-    {"FIRST_16BYTES_OF_L3_PAYLOAD", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD},\
-    {"NEXT_16BYTES_OF_L3_PAYLOAD", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD},\
-    {"unknown_l3_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT}
-
-/*!
- * \name UNKNOWN_L4_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD 0
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT          1
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT \
-    {"FIRST_4BYTES_OF_L4_PAYLOAD", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD},\
-    {"unknown_l4_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT}
-
-/*!
- * \name UNKNOWN_L5_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1 0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3 1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7 2
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT          3
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT \
-    {"L5_BYTES_0_1", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1},\
-    {"L5_BYTES_2_3", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3},\
-    {"L5_BYTES_4_7", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7},\
-    {"unknown_l5_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT}
-
-/*!
- * \name VLAN_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VLAN_T_CFI  0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VLAN_T_PCP  1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VLAN_T_TPID 2
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VLAN_T_VID  3
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VLAN_T_FID_COUNT          4
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT \
-    {"CFI", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VLAN_T_CFI},\
-    {"PCP", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VLAN_T_PCP},\
-    {"TPID", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VLAN_T_TPID},\
-    {"VID", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VLAN_T_VID},\
-    {"vlan_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VLAN_T_FID_COUNT}
-
-/*!
- * \name VNTAG_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VNTAG_T_TAG  0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VNTAG_T_TPID 1
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VNTAG_T_FID_COUNT          2
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VNTAG_T_FIELD_NAME_MAP_INIT \
-    {"TAG", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VNTAG_T_TAG},\
-    {"TPID", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VNTAG_T_TPID},\
-    {"vntag_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VNTAG_T_FID_COUNT}
-
-/*!
- * \name VXLAN_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VXLAN_T_FLAGS_RESERVED_1 0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VXLAN_T_RESERVED2        1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VXLAN_T_VN_ID            2
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VXLAN_T_FID_COUNT          3
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT \
-    {"FLAGS_RESERVED_1", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VXLAN_T_FLAGS_RESERVED_1},\
-    {"RESERVED2", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VXLAN_T_RESERVED2},\
-    {"VN_ID", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VXLAN_T_VN_ID},\
-    {"vxlan_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VXLAN_T_FID_COUNT}
-
-/*!
- * \name WESP_T field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_WESP_T_FLAGS       0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_WESP_T_HEADER_LEN  1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_WESP_T_NEXT_HEADER 2
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_WESP_T_SEQ_NUM     3
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_WESP_T_SPI         4
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_WESP_T_TRAILER_LEN 5
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_WESP_T_WESP_IV     6
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_WESP_T_FID_COUNT          7
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_WESP_T_FIELD_NAME_MAP_INIT \
-    {"FLAGS", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_WESP_T_FLAGS},\
-    {"HEADER_LEN", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_WESP_T_HEADER_LEN},\
-    {"NEXT_HEADER", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_WESP_T_NEXT_HEADER},\
-    {"SEQ_NUM", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_WESP_T_SEQ_NUM},\
-    {"SPI", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_WESP_T_SPI},\
-    {"TRAILER_LEN", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_WESP_T_TRAILER_LEN},\
-    {"WESP_IV", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_WESP_T_WESP_IV},\
-    {"wesp_t fid count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_WESP_T_FID_COUNT}
-
-
-#endif /* BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_FLEXHDR_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_bcmpkt_rxpmd_flex_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_bcmpkt_rxpmd_flex_data.h
deleted file mode 100644
index dd9b0bafb4b6..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_bcmpkt_rxpmd_flex_data.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) map.yml.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_DATA_H
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_DATA_H
-
-/*!
- * \name RX flex metadata field IDs.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_DLB_ECMP_DESTINATION_15_0                                 0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0                                            1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_DVP_15_0                                                  2
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_7_0                                         3
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_EGR_MTOP_INDEX_HI_3_0                                     4
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_EGR_MTOP_INDEX_LO_EP_NIH_DROP_CODE_OR_IFP_OPAQUE_OBJ_15_0 5
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_EM_FT_OPAQUE_OBJ_OR_IFP_OPAQUE_OBJ_15_0                   6
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_HIGH_3_0                                    7
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0                                    8
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_15_0                                 9
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_31_16                                10
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_15_0                                   11
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_16                                  12
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32                                  13
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0                                         14
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_IFP_IOAM_GBP_ACTION_3_0                                   15
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_IFP_TO_EP_MACSEC_INFO_OR_IFP_OPAQUE_OBJ_15_0              16
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_IFP_TS_CONTROL_ACTION_3_0                                 17
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_15_0                                        18
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_16                                       19
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_INGRESS_PP_PORT_7_0                                       20
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0            21
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0                               22
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_INT_PRI_3_0                                               23
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_L2_IIF_10_0                                               24
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_L2_OIF_10_0                                               25
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_L3_IIF_13_0                                               26
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0                                             27
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0                         28
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_15_0                                         29
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0                                       30
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0                                       31
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_SVP_15_0                                                  32
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0                              33
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0                                   34
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0                                         35
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_SYSTEM_SOURCE_15_0                                        36
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_TIMESTAMP_CTRL_3_0                                        37
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0                           38
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_VFI_15_0                                                  39
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_VLAN_TAG_PRESERVE_CTRL_SVP_MIRROR_ENABLE_3_0              40
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_FID_COUNT                       41
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_COUNT                    47
-
-/*!
- * \name Packet Flex Reason Types.
- */
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE                         0
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS                               1
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED 2
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED                    3
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED  4
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED                     5
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP                                  6
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT                                   7
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_IFP                                     8
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER                               9
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED      10
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT                                   11
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP                           12
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS                      13
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE                      14
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP                           15
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS                      16
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR                            17
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF                        18
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR                            19
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL                        20
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD                    21
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0                      22
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1                      23
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2                      24
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3                      25
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4                      26
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5                      27
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6                      28
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7                      29
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD            30
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED              31
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED                  32
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU                    33
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MTOP_IPV4_GATEWAY                       34
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU                          35
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED              36
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT                            37
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_RESERVED_TRACE_BIT                      38
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP                                39
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD         40
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_SVP                                     41
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP                               42
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU                43
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR                     44
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED                       45
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_VFP                                     46
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT \
-    {"CB_STATION_MOVE", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE},\
-    {"CML_FLAGS", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS},\
-    {"DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED},\
-    {"DLB_ECMP_PKT_SAMPLED", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED},\
-    {"DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED},\
-    {"DLB_LAG_PKT_SAMPLED", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED},\
-    {"DST_FP", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP},\
-    {"EM_FT", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT},\
-    {"IFP", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_IFP},\
-    {"IFP_METER", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER},\
-    {"IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED},\
-    {"IVXLT", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT},\
-    {"L2_DST_LOOKUP", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP},\
-    {"L2_DST_LOOKUP_MISS", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS},\
-    {"L2_SRC_STATIC_MOVE", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE},\
-    {"L3_DST_LOOKUP", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP},\
-    {"L3_DST_LOOKUP_MISS", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS},\
-    {"L3_HDR_ERROR", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR},\
-    {"L3_IIF_EQ_L3_OIF", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF},\
-    {"L3_TTL_ERROR", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR},\
-    {"LEARN_CACHE_FULL", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL},\
-    {"MACSA_MULTICAST_RSVD", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD},\
-    {"MATCHED_RULE_BIT_0", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0},\
-    {"MATCHED_RULE_BIT_1", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1},\
-    {"MATCHED_RULE_BIT_2", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2},\
-    {"MATCHED_RULE_BIT_3", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3},\
-    {"MATCHED_RULE_BIT_4", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4},\
-    {"MATCHED_RULE_BIT_5", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5},\
-    {"MATCHED_RULE_BIT_6", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6},\
-    {"MATCHED_RULE_BIT_7", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7},\
-    {"MEMBERSHIP_CHECK_FAILED_RSVD", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD},\
-    {"MIRROR_SAMPLER_EGR_SAMPLED", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED},\
-    {"MIRROR_SAMPLER_SAMPLED", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED},\
-    {"MPLS_CTRL_PKT_TO_CPU", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU},\
-    {"MTOP_IPV4_GATEWAY", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MTOP_IPV4_GATEWAY},\
-    {"NO_COPY_TO_CPU", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU},\
-    {"PKT_INTEGRITY_CHECK_FAILED", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED},\
-    {"PROTOCOL_PKT", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT},\
-    {"RESERVED_TRACE_BIT", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_RESERVED_TRACE_BIT},\
-    {"SER_DROP", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP},\
-    {"SPANNING_TREE_CHECK_FAILED_RSVD", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD},\
-    {"SVP", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_SVP},\
-    {"TRACE_DOP", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP},\
-    {"TRACE_DO_NOT_COPY_TO_CPU", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU},\
-    {"TRACE_DO_NOT_MIRROR", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR},\
-    {"URPF_CHECK_FAILED", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED},\
-    {"VFP", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_VFP},\
-    {"flex reason count", BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_COUNT}
-
-#endif /* BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_bcmpkt_rxpmd_match_id_defs.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_bcmpkt_rxpmd_match_id_defs.h
deleted file mode 100644
index ccb7e42c51e1..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_bcmpkt_rxpmd_match_id_defs.h
+++ /dev/null
@@ -1,405 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) bcm56780_a0_hna_6_5_30_6_0_sf_match_id_info.yml
- * for device bcm56780_a0 and variant hna_6_5_30_6_0.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H
-
-#include <bcmpkt/bcmpkt_rxpmd_match_id.h>
-
-/*!
- * \brief Get the Match ID DataBase information.
- *
- * \retval bcmpkt_rxpmd_match_id_db_info_t Match ID DataBase information.
-*/
-extern bcmpkt_rxpmd_match_id_db_info_t *
-    bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db_info_get(void);
-
-/*!
- * \brief Get the Match ID Mapping information.
- *
- * \retval bcmpkt_rxpmd_match_id_map_info_t Match ID Mapping information.
-*/
-extern bcmpkt_rxpmd_match_id_map_info_t *
-    bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_map_info_get(void);
-
-/*!
-  \name RXPMD Match IDs
-*/
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ETAG  0
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG  1
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2  2
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE  3
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG  4
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC  5
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SVTAG  6
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_VNTAG  7
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP  8
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1  9
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2  10
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD  11
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT  12
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE  13
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1  14
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2  15
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE  16
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE  17
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM  18
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY  19
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT  20
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ  21
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP  22
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA  23
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP  24
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4  25
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6  26
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0  27
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1  28
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2  29
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3  30
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4  31
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5  32
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6  33
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH  34
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW  35
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE  36
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588  37
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP  38
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES  39
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES  40
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP  41
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3  42
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4  43
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5  44
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN  45
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH  46
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK  47
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE  48
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ETAG  49
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG  50
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2  51
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE  52
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG  53
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC  54
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SVTAG  55
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_VNTAG  56
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP  57
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1  58
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2  59
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD  60
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT  61
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE  62
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1  63
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2  64
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE  65
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE  66
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM  67
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY  68
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT  69
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ  70
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP  71
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA  72
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP  73
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4  74
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6  75
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0  76
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1  77
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2  78
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3  79
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4  80
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5  81
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6  82
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH  83
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW  84
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE  85
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588  86
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP  87
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES  88
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES  89
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP  90
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3  91
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4  92
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5  93
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN  94
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ETAG  95
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG  96
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2  97
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE  98
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG  99
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC  100
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_VNTAG  101
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP  102
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1  103
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2  104
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD  105
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT  106
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE  107
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1  108
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2  109
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP  110
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA  111
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP  112
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4  113
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6  114
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE  115
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588  116
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP  117
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES  118
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES  119
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP  120
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3  121
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4  122
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5  123
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ETAG  124
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG  125
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2  126
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE  127
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG  128
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC  129
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SVTAG  130
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_VNTAG  131
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP  132
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1  133
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2  134
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD  135
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT  136
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE  137
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1  138
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2  139
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE  140
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE  141
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM  142
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY  143
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT  144
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ  145
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP  146
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA  147
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP  148
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4  149
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6  150
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0  151
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1  152
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2  153
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3  154
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4  155
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5  156
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6  157
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH  158
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW  159
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE  160
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588  161
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP  162
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES  163
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES  164
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP  165
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3  166
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4  167
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5  168
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN  169
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH  170
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK  171
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE  172
-#define BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_COUNT  173
-
-#define BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT \
-    {"EGRESS_PKT_FWD_L2_HDR_ETAG", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ETAG}, \
-    {"EGRESS_PKT_FWD_L2_HDR_ITAG", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG}, \
-    {"EGRESS_PKT_FWD_L2_HDR_L2", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2}, \
-    {"EGRESS_PKT_FWD_L2_HDR_NONE", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE}, \
-    {"EGRESS_PKT_FWD_L2_HDR_OTAG", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG}, \
-    {"EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC}, \
-    {"EGRESS_PKT_FWD_L2_HDR_SVTAG", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SVTAG}, \
-    {"EGRESS_PKT_FWD_L2_HDR_VNTAG", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_VNTAG}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ARP", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_BFD", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GPE", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ICMP", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IGMP", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV4", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV6", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS0", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS1", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS2", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS3", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS4", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS5", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS6", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_NONE", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_P_1588", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_RARP", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UDP", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_VXLAN", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN}, \
-    {"EGRESS_PKT_SYS_HDR_EP_NIH", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH}, \
-    {"EGRESS_PKT_SYS_HDR_LOOPBACK", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK}, \
-    {"EGRESS_PKT_SYS_HDR_NONE", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_ETAG", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ETAG}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_ITAG", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_L2", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_NONE", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_OTAG", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_SVTAG", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SVTAG}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_VNTAG", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_VNTAG}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN}, \
-    {"INGRESS_PKT_INNER_L2_HDR_ETAG", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ETAG}, \
-    {"INGRESS_PKT_INNER_L2_HDR_ITAG", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG}, \
-    {"INGRESS_PKT_INNER_L2_HDR_L2", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2}, \
-    {"INGRESS_PKT_INNER_L2_HDR_NONE", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE}, \
-    {"INGRESS_PKT_INNER_L2_HDR_OTAG", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG}, \
-    {"INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC}, \
-    {"INGRESS_PKT_INNER_L2_HDR_VNTAG", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_VNTAG}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ARP", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_BFD", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ICMP", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_IGMP", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV4", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV6", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_NONE", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_P_1588", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_RARP", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UDP", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_ETAG", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ETAG}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_ITAG", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_L2", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_NONE", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_OTAG", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_SVTAG", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SVTAG}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_VNTAG", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_VNTAG}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ARP", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_BFD", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GPE", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ICMP", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IGMP", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV4", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV6", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_NONE", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_P_1588", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_RARP", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UDP", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN}, \
-    {"INGRESS_PKT_SYS_HDR_EP_NIH", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH}, \
-    {"INGRESS_PKT_SYS_HDR_LOOPBACK", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK}, \
-    {"INGRESS_PKT_SYS_HDR_NONE", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE}, \
-    {"rxpmd_match_id_count", BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_COUNT}
-
-#endif /*! BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_bcmpkt_flexhdr.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_bcmpkt_flexhdr.h
new file mode 100644
index 000000000000..9a3103736d7a
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_bcmpkt_flexhdr.h
@@ -0,0 +1,174 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) header.yml.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_FLEXHDR_H
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_FLEXHDR_H
+
+#include <bcmpkt/bcmpkt_flexhdr_internal.h>
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T                      0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T                   1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T                      2
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CNTAG_T                    3
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T         4
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T         5
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_DEST_OPTION_T              6
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T            7
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T        8
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T         9
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ESP_T                      10
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ETAG_T                     11
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T                12
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_FRAG_T                     13
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T         14
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GPE_T                      15
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_CHKSUM_T               16
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_KEY_T                  17
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_ROUT_T                 18
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_SEQ_T                  19
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_T                      20
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_HOP_BY_HOP_T               21
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ICMP_T                     22
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_A_T          23
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_B_T          24
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_1_T            25
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_2_T            26
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_3_T            27
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_HEADER_T               28
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_MD_BASE_T              29
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_METADATA_T             30
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IGMP_T                     31
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPFIX_T                    32
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T                     33
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T                     34
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_L2_T                       35
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T         36
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T         37
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_ACH_T                 38
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_BV_T                  39
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_CW_T                  40
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_T                     41
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T                   42
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PROG_EXT_HDR_T             43
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T                  44
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T                  45
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T   46
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T   47
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T                     48
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ROUTING_T                  49
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RSPAN_T                    50
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_0_T             51
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T             52
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_2_T             53
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SNAP_LLC_T                 54
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SVTAG_T                    55
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T         56
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T         57
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UDP_T                      58
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T               59
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T               60
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T               61
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VLAN_T                     62
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VNTAG_T                    63
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VXLAN_T                    64
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T                     65
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_T               66
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_FLEXHDR_COUNT    67
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_FLEXHDR_NAME_MAP_INIT \
+    {"arp_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T},\
+    {"authen_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T},\
+    {"bfd_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T},\
+    {"cntag_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CNTAG_T},\
+    {"cpu_composites_0_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T},\
+    {"cpu_composites_1_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T},\
+    {"dest_option_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_DEST_OPTION_T},\
+    {"ep_nih_header_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T},\
+    {"erspan3_fixed_hdr_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T},\
+    {"erspan3_subhdr_5_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T},\
+    {"esp_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ESP_T},\
+    {"etag_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ETAG_T},\
+    {"ethertype_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T},\
+    {"frag_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_FRAG_T},\
+    {"generic_loopback_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T},\
+    {"gpe_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GPE_T},\
+    {"gre_chksum_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_CHKSUM_T},\
+    {"gre_key_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_KEY_T},\
+    {"gre_rout_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_ROUT_T},\
+    {"gre_seq_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_SEQ_T},\
+    {"gre_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_T},\
+    {"hop_by_hop_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_HOP_BY_HOP_T},\
+    {"icmp_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ICMP_T},\
+    {"ifa_flex_md_0_a_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_A_T},\
+    {"ifa_flex_md_0_b_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_B_T},\
+    {"ifa_flex_md_1_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_1_T},\
+    {"ifa_flex_md_2_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_2_T},\
+    {"ifa_flex_md_3_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_3_T},\
+    {"ifa_header_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_HEADER_T},\
+    {"ifa_md_base_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_MD_BASE_T},\
+    {"ifa_metadata_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_METADATA_T},\
+    {"igmp_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IGMP_T},\
+    {"ipfix_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPFIX_T},\
+    {"ipv4_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T},\
+    {"ipv6_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T},\
+    {"l2_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_L2_T},\
+    {"mirror_erspan_sn_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T},\
+    {"mirror_transport_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T},\
+    {"mpls_ach_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_ACH_T},\
+    {"mpls_bv_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_BV_T},\
+    {"mpls_cw_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_CW_T},\
+    {"mpls_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_T},\
+    {"p_1588_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T},\
+    {"prog_ext_hdr_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PROG_EXT_HDR_T},\
+    {"psamp_0_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T},\
+    {"psamp_1_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T},\
+    {"psamp_mirror_on_drop_0_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T},\
+    {"psamp_mirror_on_drop_3_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T},\
+    {"rarp_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T},\
+    {"routing_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ROUTING_T},\
+    {"rspan_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RSPAN_T},\
+    {"sflow_shim_0_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_0_T},\
+    {"sflow_shim_1_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T},\
+    {"sflow_shim_2_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_2_T},\
+    {"snap_llc_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SNAP_LLC_T},\
+    {"svtag_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SVTAG_T},\
+    {"tcp_first_4bytes_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T},\
+    {"tcp_last_16bytes_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T},\
+    {"udp_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UDP_T},\
+    {"unknown_l3_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T},\
+    {"unknown_l4_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T},\
+    {"unknown_l5_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T},\
+    {"vlan_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VLAN_T},\
+    {"vntag_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VNTAG_T},\
+    {"vxlan_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VXLAN_T},\
+    {"wesp_t", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T},\
+    {"RXPMD_FLEX_T", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_T},\
+    {"flexhdr count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_FLEXHDR_COUNT}
+
+#endif /* BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_FLEXHDR_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_bcmpkt_flexhdr_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_bcmpkt_flexhdr_data.h
new file mode 100644
index 000000000000..b63c0b7c345c
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_bcmpkt_flexhdr_data.h
@@ -0,0 +1,1258 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) header.yml.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_FLEXHDR_DATA_H
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_FLEXHDR_DATA_H
+
+/*!
+ * \name ARP_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_HARDWARE_LEN  0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_HARDWARE_TYPE 1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_OPERATION     2
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_PROT_ADDR_LEN 3
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_PROTOCOL_TYPE 4
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_SENDER_HA     5
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_SENDER_IP     6
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_TARGET_HA     7
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_TARGET_IP     8
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_FID_COUNT          9
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT \
+    {"HARDWARE_LEN", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_HARDWARE_LEN},\
+    {"HARDWARE_TYPE", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_HARDWARE_TYPE},\
+    {"OPERATION", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_OPERATION},\
+    {"PROT_ADDR_LEN", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_PROT_ADDR_LEN},\
+    {"PROTOCOL_TYPE", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_PROTOCOL_TYPE},\
+    {"SENDER_HA", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_SENDER_HA},\
+    {"SENDER_IP", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_SENDER_IP},\
+    {"TARGET_HA", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_TARGET_HA},\
+    {"TARGET_IP", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_TARGET_IP},\
+    {"arp_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_FID_COUNT}
+
+/*!
+ * \name AUTHEN_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T_DATA        0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T_NEXT_HEADER 1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T_PAYLOAD_LEN 2
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T_RESERVED    3
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T_SEQ_NUM     4
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T_SPI         5
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T_FID_COUNT          6
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T_FIELD_NAME_MAP_INIT \
+    {"DATA", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T_DATA},\
+    {"NEXT_HEADER", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T_NEXT_HEADER},\
+    {"PAYLOAD_LEN", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T_PAYLOAD_LEN},\
+    {"RESERVED", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T_RESERVED},\
+    {"SEQ_NUM", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T_SEQ_NUM},\
+    {"SPI", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T_SPI},\
+    {"authen_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T_FID_COUNT}
+
+/*!
+ * \name BFD_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_AP            0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_BFD_LENGTH    1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_CPI           2
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_DEM           3
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_DESMINTXINTV  4
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_DETECTMULT    5
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_DIAG          6
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_FIN           7
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_MINECHORXINTV 8
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_MPT           9
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_MYDISCRIM     10
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_POLL          11
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_REQMINRXINTV  12
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_STA           13
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_URDISCRIM     14
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_VERSION       15
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_FID_COUNT          16
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_FIELD_NAME_MAP_INIT \
+    {"AP", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_AP},\
+    {"BFD_LENGTH", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_BFD_LENGTH},\
+    {"CPI", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_CPI},\
+    {"DEM", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_DEM},\
+    {"DESMINTXINTV", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_DESMINTXINTV},\
+    {"DETECTMULT", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_DETECTMULT},\
+    {"DIAG", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_DIAG},\
+    {"FIN", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_FIN},\
+    {"MINECHORXINTV", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_MINECHORXINTV},\
+    {"MPT", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_MPT},\
+    {"MYDISCRIM", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_MYDISCRIM},\
+    {"POLL", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_POLL},\
+    {"REQMINRXINTV", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_REQMINRXINTV},\
+    {"STA", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_STA},\
+    {"URDISCRIM", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_URDISCRIM},\
+    {"VERSION", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_VERSION},\
+    {"bfd_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_FID_COUNT}
+
+/*!
+ * \name CNTAG_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CNTAG_T_RPID 0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CNTAG_T_TPID 1
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CNTAG_T_FID_COUNT          2
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CNTAG_T_FIELD_NAME_MAP_INIT \
+    {"RPID", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CNTAG_T_RPID},\
+    {"TPID", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CNTAG_T_TPID},\
+    {"cntag_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CNTAG_T_FID_COUNT}
+
+/*!
+ * \name CPU_COMPOSITES_0_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0 0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1 1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2 2
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3 3
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4 4
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5 5
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6 6
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT          7
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT \
+    {"DMA_CONT0", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0},\
+    {"DMA_CONT1", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1},\
+    {"DMA_CONT2", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2},\
+    {"DMA_CONT3", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3},\
+    {"DMA_CONT4", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4},\
+    {"DMA_CONT5", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5},\
+    {"DMA_CONT6", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6},\
+    {"cpu_composites_0_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT}
+
+/*!
+ * \name CPU_COMPOSITES_1_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10 0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11 1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12 2
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13 3
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14 4
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15 5
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16 6
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17 7
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7  8
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8  9
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9  10
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT          11
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT \
+    {"DMA_CONT10", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10},\
+    {"DMA_CONT11", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11},\
+    {"DMA_CONT12", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12},\
+    {"DMA_CONT13", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13},\
+    {"DMA_CONT14", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14},\
+    {"DMA_CONT15", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15},\
+    {"DMA_CONT16", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16},\
+    {"DMA_CONT17", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17},\
+    {"DMA_CONT7", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7},\
+    {"DMA_CONT8", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8},\
+    {"DMA_CONT9", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9},\
+    {"cpu_composites_1_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT}
+
+/*!
+ * \name DEST_OPTION_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_DEST_OPTION_T_HDR_EXT_LEN 0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_DEST_OPTION_T_NEXT_HEADER 1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_DEST_OPTION_T_OPTION      2
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_DEST_OPTION_T_FID_COUNT          3
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_DEST_OPTION_T_FIELD_NAME_MAP_INIT \
+    {"HDR_EXT_LEN", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_DEST_OPTION_T_HDR_EXT_LEN},\
+    {"NEXT_HEADER", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_DEST_OPTION_T_NEXT_HEADER},\
+    {"OPTION", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_DEST_OPTION_T_OPTION},\
+    {"dest_option_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_DEST_OPTION_T_FID_COUNT}
+
+/*!
+ * \name EP_NIH_HEADER_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_HEADER_SUBTYPE       0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_HEADER_TYPE          1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_A        2
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_B        3
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_C        4
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_A      5
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_B      6
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_C      7
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_RECIRC_PROFILE_INDEX 8
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_RESERVED_0           9
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_START                10
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_TIMESTAMP            11
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT          12
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_FIELD_NAME_MAP_INIT \
+    {"HEADER_SUBTYPE", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_HEADER_SUBTYPE},\
+    {"HEADER_TYPE", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_HEADER_TYPE},\
+    {"OPAQUE_CTRL_A", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_A},\
+    {"OPAQUE_CTRL_B", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_B},\
+    {"OPAQUE_CTRL_C", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_C},\
+    {"OPAQUE_OBJECT_A", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_A},\
+    {"OPAQUE_OBJECT_B", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_B},\
+    {"OPAQUE_OBJECT_C", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_C},\
+    {"RECIRC_PROFILE_INDEX", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_RECIRC_PROFILE_INDEX},\
+    {"RESERVED_0", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_RESERVED_0},\
+    {"START", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_START},\
+    {"TIMESTAMP", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_TIMESTAMP},\
+    {"ep_nih_header_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT}
+
+/*!
+ * \name ERSPAN3_FIXED_HDR_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO               0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_COS               1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID           2
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O 3
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID        4
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_T                 5
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP         6
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VER               7
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN              8
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT          9
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT \
+    {"BSO", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO},\
+    {"COS", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_COS},\
+    {"GBP_SID", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID},\
+    {"P_FT_HWID_D_GRA_O", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O},\
+    {"SESSION_ID", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID},\
+    {"T", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_T},\
+    {"TIMESTAMP", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP},\
+    {"VER", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VER},\
+    {"VLAN", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN},\
+    {"erspan3_fixed_hdr_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT}
+
+/*!
+ * \name ERSPAN3_SUBHDR_5_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID 0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID     1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID   2
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP   3
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT          4
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT \
+    {"PLATFORM_ID", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID},\
+    {"PORT_ID", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID},\
+    {"SWITCH_ID", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID},\
+    {"TIMESTAMP", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP},\
+    {"erspan3_subhdr_5_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT}
+
+/*!
+ * \name ESP_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ESP_T_NEXT_HEADER 0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ESP_T_PAD         1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ESP_T_PAD_LEN     2
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ESP_T_SEQ_NUM     3
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ESP_T_SPI         4
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ESP_T_FID_COUNT          5
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ESP_T_FIELD_NAME_MAP_INIT \
+    {"NEXT_HEADER", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ESP_T_NEXT_HEADER},\
+    {"PAD", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ESP_T_PAD},\
+    {"PAD_LEN", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ESP_T_PAD_LEN},\
+    {"SEQ_NUM", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ESP_T_SEQ_NUM},\
+    {"SPI", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ESP_T_SPI},\
+    {"esp_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ESP_T_FID_COUNT}
+
+/*!
+ * \name ETAG_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ETAG_T_TAG  0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ETAG_T_TPID 1
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ETAG_T_FID_COUNT          2
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ETAG_T_FIELD_NAME_MAP_INIT \
+    {"TAG", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ETAG_T_TAG},\
+    {"TPID", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ETAG_T_TPID},\
+    {"etag_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ETAG_T_FID_COUNT}
+
+/*!
+ * \name ETHERTYPE_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T_TYPE 0
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T_FID_COUNT          1
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT \
+    {"TYPE", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T_TYPE},\
+    {"ethertype_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T_FID_COUNT}
+
+/*!
+ * \name FRAG_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_FRAG_T_FRAG_INFO   0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_FRAG_T_ID          1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_FRAG_T_NEXT_HEADER 2
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_FRAG_T_RESERVED    3
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_FRAG_T_FID_COUNT          4
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_FRAG_T_FIELD_NAME_MAP_INIT \
+    {"FRAG_INFO", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_FRAG_T_FRAG_INFO},\
+    {"ID", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_FRAG_T_ID},\
+    {"NEXT_HEADER", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_FRAG_T_NEXT_HEADER},\
+    {"RESERVED", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_FRAG_T_RESERVED},\
+    {"frag_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_FRAG_T_FID_COUNT}
+
+/*!
+ * \name GENERIC_LOOPBACK_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ    0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE   1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ        2
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_FLAGS              3
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE        4
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY     5
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL     6
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ      7
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0  8
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1  9
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ            10
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1         11
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT 12
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE         13
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_SVP                14
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT          15
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT \
+    {"DESTINATION_OBJ", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ},\
+    {"DESTINATION_TYPE", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE},\
+    {"ENTROPY_OBJ", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ},\
+    {"FLAGS", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_FLAGS},\
+    {"HEADER_TYPE", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE},\
+    {"INPUT_PRIORITY", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY},\
+    {"INTERFACE_CTRL", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL},\
+    {"INTERFACE_OBJ", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ},\
+    {"PROCESSING_CTRL_0", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0},\
+    {"PROCESSING_CTRL_1", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1},\
+    {"QOS_OBJ", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ},\
+    {"RESERVED_1", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1},\
+    {"SOURCE_SYSTEM_PORT", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT},\
+    {"START_BYTE", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE},\
+    {"SVP", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_SVP},\
+    {"generic_loopback_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT}
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NO_OP       0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2_OIF      1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED    2
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__VP          3
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP        4
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NHOP        5
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2MC_GROUP  6
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L3MC_GROUP  7
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED_1  8
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP_MEMBER 9
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__DEVICE_PORT 10
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_TYPE__TUNNEL  0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_TYPE__GENERIC 1
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__NOOP   0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__VFI    1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__L3_IIF 2
+
+/*!
+ * \name GPE_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GPE_T_FLAGS         0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GPE_T_NEXT_PROTOCOL 1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GPE_T_RESERVED0     2
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GPE_T_RESERVED1     3
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GPE_T_VNI           4
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GPE_T_FID_COUNT          5
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GPE_T_FIELD_NAME_MAP_INIT \
+    {"FLAGS", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GPE_T_FLAGS},\
+    {"NEXT_PROTOCOL", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GPE_T_NEXT_PROTOCOL},\
+    {"RESERVED0", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GPE_T_RESERVED0},\
+    {"RESERVED1", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GPE_T_RESERVED1},\
+    {"VNI", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GPE_T_VNI},\
+    {"gpe_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GPE_T_FID_COUNT}
+
+/*!
+ * \name GRE_CHKSUM_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_CHKSUM_T_CHECKSUM 0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_CHKSUM_T_OFFSET   1
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT          2
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_CHKSUM_T_FIELD_NAME_MAP_INIT \
+    {"CHECKSUM", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_CHKSUM_T_CHECKSUM},\
+    {"OFFSET", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_CHKSUM_T_OFFSET},\
+    {"gre_chksum_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT}
+
+/*!
+ * \name GRE_KEY_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_KEY_T_KEY 0
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_KEY_T_FID_COUNT          1
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_KEY_T_FIELD_NAME_MAP_INIT \
+    {"KEY", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_KEY_T_KEY},\
+    {"gre_key_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_KEY_T_FID_COUNT}
+
+/*!
+ * \name GRE_ROUT_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_ROUT_T_ROUTING 0
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_ROUT_T_FID_COUNT          1
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_ROUT_T_FIELD_NAME_MAP_INIT \
+    {"ROUTING", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_ROUT_T_ROUTING},\
+    {"gre_rout_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_ROUT_T_FID_COUNT}
+
+/*!
+ * \name GRE_SEQ_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_SEQ_T_SEQUENCE 0
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_SEQ_T_FID_COUNT          1
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_SEQ_T_FIELD_NAME_MAP_INIT \
+    {"SEQUENCE", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_SEQ_T_SEQUENCE},\
+    {"gre_seq_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_SEQ_T_FID_COUNT}
+
+/*!
+ * \name GRE_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_T_C_R_K_S  0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_T_PROTOCOL 1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_T_RESERVED 2
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_T_VERSION  3
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_T_FID_COUNT          4
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_T_FIELD_NAME_MAP_INIT \
+    {"C_R_K_S", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_T_C_R_K_S},\
+    {"PROTOCOL", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_T_PROTOCOL},\
+    {"RESERVED", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_T_RESERVED},\
+    {"VERSION", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_T_VERSION},\
+    {"gre_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_T_FID_COUNT}
+
+/*!
+ * \name HOP_BY_HOP_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_HOP_BY_HOP_T_HDR_EXT_LEN 0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_HOP_BY_HOP_T_NEXT_HEADER 1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_HOP_BY_HOP_T_OPTION      2
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT          3
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_HOP_BY_HOP_T_FIELD_NAME_MAP_INIT \
+    {"HDR_EXT_LEN", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_HOP_BY_HOP_T_HDR_EXT_LEN},\
+    {"NEXT_HEADER", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_HOP_BY_HOP_T_NEXT_HEADER},\
+    {"OPTION", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_HOP_BY_HOP_T_OPTION},\
+    {"hop_by_hop_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT}
+
+/*!
+ * \name ICMP_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ICMP_T_CHECKSUM  0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ICMP_T_CODE      1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ICMP_T_ICMP_TYPE 2
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ICMP_T_FID_COUNT          3
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT \
+    {"CHECKSUM", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ICMP_T_CHECKSUM},\
+    {"CODE", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ICMP_T_CODE},\
+    {"ICMP_TYPE", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ICMP_T_ICMP_TYPE},\
+    {"icmp_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ICMP_T_FID_COUNT}
+
+/*!
+ * \name IFA_FLEX_MD_0_A_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_A_T_FWD_HDR_TTL   0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_A_T_LNS_DEVICE_ID 1
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT          2
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_A_T_FIELD_NAME_MAP_INIT \
+    {"FWD_HDR_TTL", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_A_T_FWD_HDR_TTL},\
+    {"LNS_DEVICE_ID", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_A_T_LNS_DEVICE_ID},\
+    {"ifa_flex_md_0_a_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT}
+
+/*!
+ * \name IFA_FLEX_MD_0_B_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_CN               0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_PORT_SPEED       1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_QUEUE_ID         2
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_RX_TIMESTAMP_SEC 3
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT          4
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_FIELD_NAME_MAP_INIT \
+    {"CN", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_CN},\
+    {"PORT_SPEED", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_PORT_SPEED},\
+    {"QUEUE_ID", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_QUEUE_ID},\
+    {"RX_TIMESTAMP_SEC", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_RX_TIMESTAMP_SEC},\
+    {"ifa_flex_md_0_b_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT}
+
+/*!
+ * \name IFA_FLEX_MD_1_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_1_T_EGRESS_PORT_ID       0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_1_T_INGRESS_PORT_ID      1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_1_T_RX_TIMESTAMP_NANOSEC 2
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT          3
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_1_T_FIELD_NAME_MAP_INIT \
+    {"EGRESS_PORT_ID", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_1_T_EGRESS_PORT_ID},\
+    {"INGRESS_PORT_ID", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_1_T_INGRESS_PORT_ID},\
+    {"RX_TIMESTAMP_NANOSEC", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_1_T_RX_TIMESTAMP_NANOSEC},\
+    {"ifa_flex_md_1_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT}
+
+/*!
+ * \name IFA_FLEX_MD_2_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_2_T_RESIDENCE_TIME_NANOSEC 0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_2_T_TX_QUEUE_BYTE_COUNT    1
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT          2
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_2_T_FIELD_NAME_MAP_INIT \
+    {"RESIDENCE_TIME_NANOSEC", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_2_T_RESIDENCE_TIME_NANOSEC},\
+    {"TX_QUEUE_BYTE_COUNT", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_2_T_TX_QUEUE_BYTE_COUNT},\
+    {"ifa_flex_md_2_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT}
+
+/*!
+ * \name IFA_FLEX_MD_3_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_3_T_MMU_STAT_0 0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_3_T_MMU_STAT_1 1
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT          2
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_3_T_FIELD_NAME_MAP_INIT \
+    {"MMU_STAT_0", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_3_T_MMU_STAT_0},\
+    {"MMU_STAT_1", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_3_T_MMU_STAT_1},\
+    {"ifa_flex_md_3_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT}
+
+/*!
+ * \name IFA_HEADER_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_HEADER_T_FLAGS      0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_HEADER_T_GNS        1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_HEADER_T_MAX_LENGTH 2
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_HEADER_T_NEXT_HDR   3
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_HEADER_T_VER        4
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_HEADER_T_FID_COUNT          5
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_HEADER_T_FIELD_NAME_MAP_INIT \
+    {"FLAGS", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_HEADER_T_FLAGS},\
+    {"GNS", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_HEADER_T_GNS},\
+    {"MAX_LENGTH", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_HEADER_T_MAX_LENGTH},\
+    {"NEXT_HDR", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_HEADER_T_NEXT_HDR},\
+    {"VER", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_HEADER_T_VER},\
+    {"ifa_header_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_HEADER_T_FID_COUNT}
+
+/*!
+ * \name IFA_MD_BASE_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_MD_BASE_T_ACTION_VECTOR            0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_MD_BASE_T_HOP_LIMIT_CURRENT_LENGTH 1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_MD_BASE_T_REQUEST_VECTOR           2
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_MD_BASE_T_FID_COUNT          3
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_MD_BASE_T_FIELD_NAME_MAP_INIT \
+    {"ACTION_VECTOR", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_MD_BASE_T_ACTION_VECTOR},\
+    {"HOP_LIMIT_CURRENT_LENGTH", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_MD_BASE_T_HOP_LIMIT_CURRENT_LENGTH},\
+    {"REQUEST_VECTOR", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_MD_BASE_T_REQUEST_VECTOR},\
+    {"ifa_md_base_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_MD_BASE_T_FID_COUNT}
+
+/*!
+ * \name IFA_METADATA_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_METADATA_T_ACTION_VECTOR            0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_METADATA_T_HOP_LIMIT_CURRENT_LENGTH 1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_METADATA_T_METADATA                 2
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_METADATA_T_REQUEST_VECTOR           3
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_METADATA_T_FID_COUNT          4
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_METADATA_T_FIELD_NAME_MAP_INIT \
+    {"ACTION_VECTOR", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_METADATA_T_ACTION_VECTOR},\
+    {"HOP_LIMIT_CURRENT_LENGTH", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_METADATA_T_HOP_LIMIT_CURRENT_LENGTH},\
+    {"METADATA", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_METADATA_T_METADATA},\
+    {"REQUEST_VECTOR", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_METADATA_T_REQUEST_VECTOR},\
+    {"ifa_metadata_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_METADATA_T_FID_COUNT}
+
+/*!
+ * \name IGMP_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IGMP_T_CHECKSUM      0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IGMP_T_GROUP_ADDRESS 1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IGMP_T_IGMP_TYPE     2
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IGMP_T_MAX_RESP_TIME 3
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IGMP_T_FID_COUNT          4
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IGMP_T_FIELD_NAME_MAP_INIT \
+    {"CHECKSUM", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IGMP_T_CHECKSUM},\
+    {"GROUP_ADDRESS", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IGMP_T_GROUP_ADDRESS},\
+    {"IGMP_TYPE", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IGMP_T_IGMP_TYPE},\
+    {"MAX_RESP_TIME", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IGMP_T_MAX_RESP_TIME},\
+    {"igmp_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IGMP_T_FID_COUNT}
+
+/*!
+ * \name IPFIX_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPFIX_T_EXPORT_TIME   0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPFIX_T_LENGTH        1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPFIX_T_OBS_DOMAIN_ID 2
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPFIX_T_SEQUENCE_NUM  3
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPFIX_T_VERSION       4
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPFIX_T_FID_COUNT          5
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT \
+    {"EXPORT_TIME", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPFIX_T_EXPORT_TIME},\
+    {"LENGTH", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPFIX_T_LENGTH},\
+    {"OBS_DOMAIN_ID", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPFIX_T_OBS_DOMAIN_ID},\
+    {"SEQUENCE_NUM", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPFIX_T_SEQUENCE_NUM},\
+    {"VERSION", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPFIX_T_VERSION},\
+    {"ipfix_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPFIX_T_FID_COUNT}
+
+/*!
+ * \name IPV4_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_DA                0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET 1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_HDR_CHECKSUM      2
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_ID                3
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_OPTION            4
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_PROTOCOL          5
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_SA                6
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_TOS               7
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_TOTAL_LENGTH      8
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_TTL               9
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_VERSION_HDR_LEN   10
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_FID_COUNT          11
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT \
+    {"DA", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_DA},\
+    {"FLAGS_FRAG_OFFSET", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET},\
+    {"HDR_CHECKSUM", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_HDR_CHECKSUM},\
+    {"ID", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_ID},\
+    {"OPTION", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_OPTION},\
+    {"PROTOCOL", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_PROTOCOL},\
+    {"SA", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_SA},\
+    {"TOS", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_TOS},\
+    {"TOTAL_LENGTH", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_TOTAL_LENGTH},\
+    {"TTL", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_TTL},\
+    {"VERSION_HDR_LEN", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_VERSION_HDR_LEN},\
+    {"ipv4_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_FID_COUNT}
+
+/*!
+ * \name IPV6_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_DA             0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_FLOW_LABEL     1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_HOP_LIMIT      2
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_NEXT_HEADER    3
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_PAYLOAD_LENGTH 4
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_SA             5
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_TRAFFIC_CLASS  6
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_VERSION        7
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_FID_COUNT          8
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT \
+    {"DA", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_DA},\
+    {"FLOW_LABEL", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_FLOW_LABEL},\
+    {"HOP_LIMIT", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_HOP_LIMIT},\
+    {"NEXT_HEADER", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_NEXT_HEADER},\
+    {"PAYLOAD_LENGTH", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_PAYLOAD_LENGTH},\
+    {"SA", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_SA},\
+    {"TRAFFIC_CLASS", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_TRAFFIC_CLASS},\
+    {"VERSION", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_VERSION},\
+    {"ipv6_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_FID_COUNT}
+
+/*!
+ * \name L2_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_L2_T_MACDA 0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_L2_T_MACSA 1
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_L2_T_FID_COUNT          2
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_L2_T_FIELD_NAME_MAP_INIT \
+    {"MACDA", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_L2_T_MACDA},\
+    {"MACSA", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_L2_T_MACSA},\
+    {"l2_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_L2_T_FID_COUNT}
+
+/*!
+ * \name MIRROR_ERSPAN_SN_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM 0
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT          1
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT \
+    {"SEQ_NUM", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM},\
+    {"mirror_erspan_sn_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT}
+
+/*!
+ * \name MIRROR_TRANSPORT_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T_DATA 0
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT          1
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT \
+    {"DATA", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T_DATA},\
+    {"mirror_transport_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT}
+
+/*!
+ * \name MPLS_ACH_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_ACH_T_CHANNEL_TYPE 0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_ACH_T_CW_TYPE      1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_ACH_T_RESERVED     2
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_ACH_T_VERSION      3
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_ACH_T_FID_COUNT          4
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_ACH_T_FIELD_NAME_MAP_INIT \
+    {"CHANNEL_TYPE", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_ACH_T_CHANNEL_TYPE},\
+    {"CW_TYPE", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_ACH_T_CW_TYPE},\
+    {"RESERVED", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_ACH_T_RESERVED},\
+    {"VERSION", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_ACH_T_VERSION},\
+    {"mpls_ach_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_ACH_T_FID_COUNT}
+
+/*!
+ * \name MPLS_BV_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_BV_T_VALUE 0
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_BV_T_FID_COUNT          1
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_BV_T_FIELD_NAME_MAP_INIT \
+    {"VALUE", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_BV_T_VALUE},\
+    {"mpls_bv_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_BV_T_FID_COUNT}
+
+/*!
+ * \name MPLS_CW_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_CW_T_CW_TYPE    0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_CW_T_RESERVED   1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_CW_T_SEQ_NUMBER 2
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_CW_T_FID_COUNT          3
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_CW_T_FIELD_NAME_MAP_INIT \
+    {"CW_TYPE", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_CW_T_CW_TYPE},\
+    {"RESERVED", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_CW_T_RESERVED},\
+    {"SEQ_NUMBER", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_CW_T_SEQ_NUMBER},\
+    {"mpls_cw_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_CW_T_FID_COUNT}
+
+/*!
+ * \name MPLS_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_T_BOS   0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_T_EXP   1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_T_LABEL 2
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_T_TTL   3
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_T_FID_COUNT          4
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_T_FIELD_NAME_MAP_INIT \
+    {"BOS", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_T_BOS},\
+    {"EXP", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_T_EXP},\
+    {"LABEL", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_T_LABEL},\
+    {"TTL", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_T_TTL},\
+    {"mpls_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_T_FID_COUNT}
+
+/*!
+ * \name P_1588_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_CNTRL          0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_CORRECTION     1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_DOMAIN_NB      2
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_FLAGS          3
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_LOGMSGINTERVAL 4
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_MSG_LENGTH     5
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_MSG_TYPE       6
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_RESERVED1      7
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_RESERVED2      8
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_RESERVED3      9
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_SEQ_ID         10
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_SRCPORTID      11
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_TRANSPORTSPEC  12
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_VERSION        13
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_FID_COUNT          14
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_FIELD_NAME_MAP_INIT \
+    {"CNTRL", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_CNTRL},\
+    {"CORRECTION", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_CORRECTION},\
+    {"DOMAIN_NB", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_DOMAIN_NB},\
+    {"FLAGS", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_FLAGS},\
+    {"LOGMSGINTERVAL", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_LOGMSGINTERVAL},\
+    {"MSG_LENGTH", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_MSG_LENGTH},\
+    {"MSG_TYPE", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_MSG_TYPE},\
+    {"RESERVED1", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_RESERVED1},\
+    {"RESERVED2", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_RESERVED2},\
+    {"RESERVED3", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_RESERVED3},\
+    {"SEQ_ID", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_SEQ_ID},\
+    {"SRCPORTID", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_SRCPORTID},\
+    {"TRANSPORTSPEC", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_TRANSPORTSPEC},\
+    {"VERSION", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_VERSION},\
+    {"p_1588_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_FID_COUNT}
+
+/*!
+ * \name PROG_EXT_HDR_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PROG_EXT_HDR_T_HDR_EXT_LEN 0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PROG_EXT_HDR_T_NEXT_HEADER 1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PROG_EXT_HDR_T_OPTION      2
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT          3
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PROG_EXT_HDR_T_FIELD_NAME_MAP_INIT \
+    {"HDR_EXT_LEN", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PROG_EXT_HDR_T_HDR_EXT_LEN},\
+    {"NEXT_HEADER", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PROG_EXT_HDR_T_NEXT_HEADER},\
+    {"OPTION", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PROG_EXT_HDR_T_OPTION},\
+    {"prog_ext_hdr_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_0_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T_FLOWSET        0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T_LENGTH         1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T_NEXT_HOP_INDEX 2
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T_OBS_TIME_NS    3
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T_OBS_TIME_S     4
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T_TEMPLATE_ID    5
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T_FID_COUNT          6
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T_FIELD_NAME_MAP_INIT \
+    {"FLOWSET", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T_FLOWSET},\
+    {"LENGTH", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T_LENGTH},\
+    {"NEXT_HOP_INDEX", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T_NEXT_HOP_INDEX},\
+    {"OBS_TIME_NS", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T_OBS_TIME_NS},\
+    {"OBS_TIME_S", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T_OBS_TIME_S},\
+    {"TEMPLATE_ID", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T_TEMPLATE_ID},\
+    {"psamp_0_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_1_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_DLB_ID         0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_EGRESS_PORT    1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_EPOCH          2
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_INGRESS_PORT   3
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_SAMPLED_LENGTH 4
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_USER_META_DATA 5
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_VARIABLE_FLAG  6
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_FID_COUNT          7
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_FIELD_NAME_MAP_INIT \
+    {"DLB_ID", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_DLB_ID},\
+    {"EGRESS_PORT", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_EGRESS_PORT},\
+    {"EPOCH", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_EPOCH},\
+    {"INGRESS_PORT", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_INGRESS_PORT},\
+    {"SAMPLED_LENGTH", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_SAMPLED_LENGTH},\
+    {"USER_META_DATA", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_USER_META_DATA},\
+    {"VARIABLE_FLAG", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_VARIABLE_FLAG},\
+    {"psamp_1_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_MIRROR_ON_DROP_0_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT 0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT    1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH          2
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS     3
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S      4
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID       5
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID     6
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT          7
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT \
+    {"EGRESS_MOD_PORT", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT},\
+    {"INGRESS_PORT", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT},\
+    {"LENGTH", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH},\
+    {"OBS_TIME_NS", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS},\
+    {"OBS_TIME_S", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S},\
+    {"SWITCH_ID", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID},\
+    {"TEMPLATE_ID", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID},\
+    {"psamp_mirror_on_drop_0_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_MIRROR_ON_DROP_3_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_DROP_REASON             0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_RESERVED_0              1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SAMPLED_LENGTH          2
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SMOD_STATE              3
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_UC_COS__COLOR__PROB_IDX 4
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_USER_META_DATA          5
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_VAR_LEN_INDICATOR       6
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT          7
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FIELD_NAME_MAP_INIT \
+    {"DROP_REASON", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_DROP_REASON},\
+    {"RESERVED_0", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_RESERVED_0},\
+    {"SAMPLED_LENGTH", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SAMPLED_LENGTH},\
+    {"SMOD_STATE", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SMOD_STATE},\
+    {"UC_COS__COLOR__PROB_IDX", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_UC_COS__COLOR__PROB_IDX},\
+    {"USER_META_DATA", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_USER_META_DATA},\
+    {"VAR_LEN_INDICATOR", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_VAR_LEN_INDICATOR},\
+    {"psamp_mirror_on_drop_3_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT}
+
+/*!
+ * \name RARP_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_HARDWARE_LEN  0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_HARDWARE_TYPE 1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_OPERATION     2
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_PROT_ADDR_LEN 3
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_PROTOCOL_TYPE 4
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_SENDER_HA     5
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_SENDER_IP     6
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_TARGET_HA     7
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_TARGET_IP     8
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_FID_COUNT          9
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT \
+    {"HARDWARE_LEN", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_HARDWARE_LEN},\
+    {"HARDWARE_TYPE", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_HARDWARE_TYPE},\
+    {"OPERATION", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_OPERATION},\
+    {"PROT_ADDR_LEN", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_PROT_ADDR_LEN},\
+    {"PROTOCOL_TYPE", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_PROTOCOL_TYPE},\
+    {"SENDER_HA", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_SENDER_HA},\
+    {"SENDER_IP", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_SENDER_IP},\
+    {"TARGET_HA", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_TARGET_HA},\
+    {"TARGET_IP", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_TARGET_IP},\
+    {"rarp_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_FID_COUNT}
+
+/*!
+ * \name ROUTING_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ROUTING_T_DATA          0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ROUTING_T_HDR_EXT_LEN   1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ROUTING_T_NEXT_HEADER   2
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ROUTING_T_ROUTING_TYPE  3
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ROUTING_T_SEGMENTS_LEFT 4
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ROUTING_T_FID_COUNT          5
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ROUTING_T_FIELD_NAME_MAP_INIT \
+    {"DATA", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ROUTING_T_DATA},\
+    {"HDR_EXT_LEN", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ROUTING_T_HDR_EXT_LEN},\
+    {"NEXT_HEADER", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ROUTING_T_NEXT_HEADER},\
+    {"ROUTING_TYPE", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ROUTING_T_ROUTING_TYPE},\
+    {"SEGMENTS_LEFT", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ROUTING_T_SEGMENTS_LEFT},\
+    {"routing_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ROUTING_T_FID_COUNT}
+
+/*!
+ * \name RSPAN_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RSPAN_T_TAG  0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RSPAN_T_TPID 1
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RSPAN_T_FID_COUNT          2
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RSPAN_T_FIELD_NAME_MAP_INIT \
+    {"TAG", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RSPAN_T_TAG},\
+    {"TPID", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RSPAN_T_TPID},\
+    {"rspan_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RSPAN_T_FID_COUNT}
+
+/*!
+ * \name SFLOW_SHIM_0_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_0_T_SYS_DESTINATION 0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_0_T_SYS_SOURCE      1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_0_T_VERSION         2
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT          3
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_0_T_FIELD_NAME_MAP_INIT \
+    {"SYS_DESTINATION", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_0_T_SYS_DESTINATION},\
+    {"SYS_SOURCE", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_0_T_SYS_SOURCE},\
+    {"VERSION", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_0_T_VERSION},\
+    {"sflow_shim_0_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT}
+
+/*!
+ * \name SFLOW_SHIM_1_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DEST_SAMPLE 0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DISCARDED   1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_FLEX_SAMPLE 2
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_MCAST       3
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_SRC_SAMPLE  4
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_TRUNCATED   5
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_RESERVED         6
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_SYS_OPCODE       7
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT          8
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_FIELD_NAME_MAP_INIT \
+    {"FLAG_DEST_SAMPLE", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DEST_SAMPLE},\
+    {"FLAG_DISCARDED", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DISCARDED},\
+    {"FLAG_FLEX_SAMPLE", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_FLEX_SAMPLE},\
+    {"FLAG_MCAST", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_MCAST},\
+    {"FLAG_SRC_SAMPLE", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_SRC_SAMPLE},\
+    {"FLAG_TRUNCATED", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_TRUNCATED},\
+    {"RESERVED", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_RESERVED},\
+    {"SYS_OPCODE", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_SYS_OPCODE},\
+    {"sflow_shim_1_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT}
+
+/*!
+ * \name SFLOW_SHIM_2_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_2_T_SEQUENCE_NUM   0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_2_T_USER_META_DATA 1
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT          2
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_2_T_FIELD_NAME_MAP_INIT \
+    {"SEQUENCE_NUM", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_2_T_SEQUENCE_NUM},\
+    {"USER_META_DATA", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_2_T_USER_META_DATA},\
+    {"sflow_shim_2_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT}
+
+/*!
+ * \name SNAP_LLC_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SNAP_LLC_T_LENGTH   0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SNAP_LLC_T_SNAP_LLC 1
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SNAP_LLC_T_FID_COUNT          2
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SNAP_LLC_T_FIELD_NAME_MAP_INIT \
+    {"LENGTH", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SNAP_LLC_T_LENGTH},\
+    {"SNAP_LLC", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SNAP_LLC_T_SNAP_LLC},\
+    {"snap_llc_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SNAP_LLC_T_FID_COUNT}
+
+/*!
+ * \name SVTAG_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SVTAG_T_DATA_LWR 0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SVTAG_T_DATA_UPR 1
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SVTAG_T_FID_COUNT          2
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SVTAG_T_FIELD_NAME_MAP_INIT \
+    {"DATA_LWR", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SVTAG_T_DATA_LWR},\
+    {"DATA_UPR", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SVTAG_T_DATA_UPR},\
+    {"svtag_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SVTAG_T_FID_COUNT}
+
+/*!
+ * \name TCP_FIRST_4BYTES_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT 0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT 1
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT          2
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT \
+    {"DST_PORT", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT},\
+    {"SRC_PORT", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT},\
+    {"tcp_first_4bytes_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT}
+
+/*!
+ * \name TCP_LAST_16BYTES_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM           0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM          1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS 2
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM           3
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR        4
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE          5
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT          6
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT \
+    {"ACK_NUM", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM},\
+    {"CHECKSUM", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM},\
+    {"HDR_LEN_AND_FLAGS", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS},\
+    {"SEQ_NUM", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM},\
+    {"URGENT_PTR", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR},\
+    {"WIN_SIZE", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE},\
+    {"tcp_last_16bytes_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT}
+
+/*!
+ * \name UDP_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UDP_T_CHECKSUM   0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UDP_T_DST_PORT   1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UDP_T_SRC_PORT   2
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UDP_T_UDP_LENGTH 3
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UDP_T_FID_COUNT          4
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT \
+    {"CHECKSUM", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UDP_T_CHECKSUM},\
+    {"DST_PORT", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UDP_T_DST_PORT},\
+    {"SRC_PORT", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UDP_T_SRC_PORT},\
+    {"UDP_LENGTH", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UDP_T_UDP_LENGTH},\
+    {"udp_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UDP_T_FID_COUNT}
+
+/*!
+ * \name UNKNOWN_L3_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD 0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD  1
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT          2
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT \
+    {"FIRST_16BYTES_OF_L3_PAYLOAD", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD},\
+    {"NEXT_16BYTES_OF_L3_PAYLOAD", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD},\
+    {"unknown_l3_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT}
+
+/*!
+ * \name UNKNOWN_L4_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD 0
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT          1
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT \
+    {"FIRST_4BYTES_OF_L4_PAYLOAD", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD},\
+    {"unknown_l4_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT}
+
+/*!
+ * \name UNKNOWN_L5_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1 0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3 1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7 2
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT          3
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT \
+    {"L5_BYTES_0_1", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1},\
+    {"L5_BYTES_2_3", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3},\
+    {"L5_BYTES_4_7", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7},\
+    {"unknown_l5_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT}
+
+/*!
+ * \name VLAN_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VLAN_T_CFI  0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VLAN_T_PCP  1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VLAN_T_TPID 2
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VLAN_T_VID  3
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VLAN_T_FID_COUNT          4
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT \
+    {"CFI", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VLAN_T_CFI},\
+    {"PCP", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VLAN_T_PCP},\
+    {"TPID", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VLAN_T_TPID},\
+    {"VID", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VLAN_T_VID},\
+    {"vlan_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VLAN_T_FID_COUNT}
+
+/*!
+ * \name VNTAG_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VNTAG_T_TAG  0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VNTAG_T_TPID 1
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VNTAG_T_FID_COUNT          2
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VNTAG_T_FIELD_NAME_MAP_INIT \
+    {"TAG", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VNTAG_T_TAG},\
+    {"TPID", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VNTAG_T_TPID},\
+    {"vntag_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VNTAG_T_FID_COUNT}
+
+/*!
+ * \name VXLAN_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VXLAN_T_FLAGS_RESERVED_1 0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VXLAN_T_RESERVED2        1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VXLAN_T_VN_ID            2
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VXLAN_T_FID_COUNT          3
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT \
+    {"FLAGS_RESERVED_1", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VXLAN_T_FLAGS_RESERVED_1},\
+    {"RESERVED2", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VXLAN_T_RESERVED2},\
+    {"VN_ID", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VXLAN_T_VN_ID},\
+    {"vxlan_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VXLAN_T_FID_COUNT}
+
+/*!
+ * \name WESP_T field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_FLAGS       0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_HEADER_LEN  1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_NEXT_HEADER 2
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_SEQ_NUM     3
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_SPI         4
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_TRAILER_LEN 5
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_WESP_IV     6
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_FID_COUNT          7
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_FIELD_NAME_MAP_INIT \
+    {"FLAGS", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_FLAGS},\
+    {"HEADER_LEN", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_HEADER_LEN},\
+    {"NEXT_HEADER", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_NEXT_HEADER},\
+    {"SEQ_NUM", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_SEQ_NUM},\
+    {"SPI", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_SPI},\
+    {"TRAILER_LEN", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_TRAILER_LEN},\
+    {"WESP_IV", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_WESP_IV},\
+    {"wesp_t fid count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_FID_COUNT}
+
+
+#endif /* BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_FLEXHDR_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_bcmpkt_rxpmd_flex_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_bcmpkt_rxpmd_flex_data.h
new file mode 100644
index 000000000000..6db8d7ce8127
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_bcmpkt_rxpmd_flex_data.h
@@ -0,0 +1,181 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) map.yml.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_DATA_H
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_DATA_H
+
+/*!
+ * \name RX flex metadata field IDs.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_DLB_ECMP_DESTINATION_15_0                                 0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0                                            1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_DVP_15_0                                                  2
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_7_0                                         3
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EGR_MTOP_INDEX_HI_3_0                                     4
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EGR_MTOP_INDEX_LO_EP_NIH_DROP_CODE_OR_IFP_OPAQUE_OBJ_15_0 5
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EM_FT_OPAQUE_OBJ_OR_IFP_OPAQUE_OBJ_15_0                   6
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_HIGH_3_0                                    7
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0                                    8
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_15_0                                 9
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_31_16                                10
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_15_0                                   11
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_16                                  12
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32                                  13
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0                                         14
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_IFP_IOAM_GBP_ACTION_3_0                                   15
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_IFP_TO_EP_MACSEC_INFO_OR_IFP_OPAQUE_OBJ_15_0              16
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_IFP_TS_CONTROL_ACTION_3_0                                 17
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_15_0                                        18
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_16                                       19
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_INGRESS_PP_PORT_7_0                                       20
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0            21
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0                               22
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_INT_PRI_3_0                                               23
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_L2_IIF_10_0                                               24
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_L2_OIF_10_0                                               25
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_L3_IIF_13_0                                               26
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0                                             27
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0                         28
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_15_0                                         29
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0                                       30
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0                                       31
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_SVP_15_0                                                  32
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0                              33
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0                                   34
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0                                         35
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_SYSTEM_SOURCE_15_0                                        36
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_TIMESTAMP_CTRL_3_0                                        37
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0                           38
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_VFI_15_0                                                  39
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_VLAN_TAG_PRESERVE_CTRL_SVP_MIRROR_ENABLE_3_0              40
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_FID_COUNT                       41
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_COUNT                    47
+
+/*!
+ * \name Packet Flex Reason Types.
+ */
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE                         0
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS                               1
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED 2
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED                    3
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED  4
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED                     5
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP                                  6
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT                                   7
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP                                     8
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER                               9
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED      10
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT                                   11
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP                           12
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS                      13
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE                      14
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP                           15
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS                      16
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR                            17
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF                        18
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR                            19
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL                        20
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD                    21
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0                      22
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1                      23
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2                      24
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3                      25
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4                      26
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5                      27
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6                      28
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7                      29
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD            30
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED              31
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED                  32
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU                    33
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MTOP_IPV4_GATEWAY                       34
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU                          35
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED              36
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT                            37
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_RESERVED_TRACE_BIT                      38
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP                                39
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD         40
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_SVP                                     41
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP                               42
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU                43
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR                     44
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED                       45
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_VFP                                     46
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT \
+    {"CB_STATION_MOVE", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE},\
+    {"CML_FLAGS", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS},\
+    {"DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED},\
+    {"DLB_ECMP_PKT_SAMPLED", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED},\
+    {"DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED},\
+    {"DLB_LAG_PKT_SAMPLED", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED},\
+    {"DST_FP", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP},\
+    {"EM_FT", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT},\
+    {"IFP", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP},\
+    {"IFP_METER", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER},\
+    {"IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED},\
+    {"IVXLT", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT},\
+    {"L2_DST_LOOKUP", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP},\
+    {"L2_DST_LOOKUP_MISS", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS},\
+    {"L2_SRC_STATIC_MOVE", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE},\
+    {"L3_DST_LOOKUP", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP},\
+    {"L3_DST_LOOKUP_MISS", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS},\
+    {"L3_HDR_ERROR", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR},\
+    {"L3_IIF_EQ_L3_OIF", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF},\
+    {"L3_TTL_ERROR", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR},\
+    {"LEARN_CACHE_FULL", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL},\
+    {"MACSA_MULTICAST_RSVD", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD},\
+    {"MATCHED_RULE_BIT_0", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0},\
+    {"MATCHED_RULE_BIT_1", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1},\
+    {"MATCHED_RULE_BIT_2", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2},\
+    {"MATCHED_RULE_BIT_3", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3},\
+    {"MATCHED_RULE_BIT_4", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4},\
+    {"MATCHED_RULE_BIT_5", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5},\
+    {"MATCHED_RULE_BIT_6", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6},\
+    {"MATCHED_RULE_BIT_7", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7},\
+    {"MEMBERSHIP_CHECK_FAILED_RSVD", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD},\
+    {"MIRROR_SAMPLER_EGR_SAMPLED", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED},\
+    {"MIRROR_SAMPLER_SAMPLED", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED},\
+    {"MPLS_CTRL_PKT_TO_CPU", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU},\
+    {"MTOP_IPV4_GATEWAY", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MTOP_IPV4_GATEWAY},\
+    {"NO_COPY_TO_CPU", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU},\
+    {"PKT_INTEGRITY_CHECK_FAILED", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED},\
+    {"PROTOCOL_PKT", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT},\
+    {"RESERVED_TRACE_BIT", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_RESERVED_TRACE_BIT},\
+    {"SER_DROP", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP},\
+    {"SPANNING_TREE_CHECK_FAILED_RSVD", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD},\
+    {"SVP", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_SVP},\
+    {"TRACE_DOP", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP},\
+    {"TRACE_DO_NOT_COPY_TO_CPU", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU},\
+    {"TRACE_DO_NOT_MIRROR", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR},\
+    {"URPF_CHECK_FAILED", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED},\
+    {"VFP", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_VFP},\
+    {"flex reason count", BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_COUNT}
+
+#endif /* BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_bcmpkt_rxpmd_match_id_defs.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_bcmpkt_rxpmd_match_id_defs.h
new file mode 100644
index 000000000000..965fa0798893
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_bcmpkt_rxpmd_match_id_defs.h
@@ -0,0 +1,405 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) bcm56780_a0_hna_6_5_31_3_0_sf_match_id_info.yml
+ * for device bcm56780_a0 and variant hna_6_5_31_3_0.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H
+
+#include <bcmpkt/bcmpkt_rxpmd_match_id.h>
+
+/*!
+ * \brief Get the Match ID DataBase information.
+ *
+ * \retval bcmpkt_rxpmd_match_id_db_info_t Match ID DataBase information.
+*/
+extern bcmpkt_rxpmd_match_id_db_info_t *
+    bcm56780_a0_hna_6_5_31_3_0_rxpmd_match_id_db_info_get(void);
+
+/*!
+ * \brief Get the Match ID Mapping information.
+ *
+ * \retval bcmpkt_rxpmd_match_id_map_info_t Match ID Mapping information.
+*/
+extern bcmpkt_rxpmd_match_id_map_info_t *
+    bcm56780_a0_hna_6_5_31_3_0_rxpmd_match_id_map_info_get(void);
+
+/*!
+  \name RXPMD Match IDs
+*/
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ETAG  0
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG  1
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2  2
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE  3
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG  4
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC  5
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SVTAG  6
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_VNTAG  7
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP  8
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1  9
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2  10
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD  11
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT  12
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE  13
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1  14
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2  15
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE  16
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE  17
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM  18
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY  19
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT  20
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ  21
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP  22
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA  23
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP  24
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4  25
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6  26
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0  27
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1  28
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2  29
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3  30
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4  31
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5  32
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6  33
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH  34
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW  35
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE  36
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588  37
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP  38
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES  39
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES  40
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP  41
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3  42
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4  43
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5  44
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN  45
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH  46
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK  47
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE  48
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ETAG  49
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG  50
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2  51
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE  52
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG  53
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC  54
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SVTAG  55
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_VNTAG  56
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP  57
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1  58
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2  59
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD  60
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT  61
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE  62
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1  63
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2  64
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE  65
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE  66
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM  67
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY  68
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT  69
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ  70
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP  71
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA  72
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP  73
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4  74
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6  75
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0  76
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1  77
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2  78
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3  79
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4  80
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5  81
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6  82
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH  83
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW  84
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE  85
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588  86
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP  87
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES  88
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES  89
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP  90
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3  91
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4  92
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5  93
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN  94
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ETAG  95
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG  96
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2  97
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE  98
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG  99
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC  100
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_VNTAG  101
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP  102
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1  103
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2  104
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD  105
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT  106
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE  107
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1  108
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2  109
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP  110
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA  111
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP  112
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4  113
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6  114
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE  115
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588  116
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP  117
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES  118
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES  119
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP  120
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3  121
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4  122
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5  123
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ETAG  124
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG  125
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2  126
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE  127
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG  128
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC  129
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SVTAG  130
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_VNTAG  131
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP  132
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1  133
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2  134
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD  135
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT  136
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE  137
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1  138
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2  139
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE  140
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE  141
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM  142
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY  143
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT  144
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ  145
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP  146
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA  147
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP  148
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4  149
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6  150
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0  151
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1  152
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2  153
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3  154
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4  155
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5  156
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6  157
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH  158
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW  159
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE  160
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588  161
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP  162
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES  163
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES  164
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP  165
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3  166
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4  167
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5  168
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN  169
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH  170
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK  171
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE  172
+#define BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_COUNT  173
+
+#define BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT \
+    {"EGRESS_PKT_FWD_L2_HDR_ETAG", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ETAG}, \
+    {"EGRESS_PKT_FWD_L2_HDR_ITAG", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG}, \
+    {"EGRESS_PKT_FWD_L2_HDR_L2", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2}, \
+    {"EGRESS_PKT_FWD_L2_HDR_NONE", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE}, \
+    {"EGRESS_PKT_FWD_L2_HDR_OTAG", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG}, \
+    {"EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC}, \
+    {"EGRESS_PKT_FWD_L2_HDR_SVTAG", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SVTAG}, \
+    {"EGRESS_PKT_FWD_L2_HDR_VNTAG", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_VNTAG}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ARP", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_BFD", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GPE", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ICMP", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IGMP", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV4", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV6", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS0", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS1", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS2", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS3", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS4", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS5", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS6", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_NONE", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_P_1588", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_RARP", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UDP", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_VXLAN", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN}, \
+    {"EGRESS_PKT_SYS_HDR_EP_NIH", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH}, \
+    {"EGRESS_PKT_SYS_HDR_LOOPBACK", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK}, \
+    {"EGRESS_PKT_SYS_HDR_NONE", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_ETAG", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ETAG}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_ITAG", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_L2", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_NONE", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_OTAG", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_SVTAG", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SVTAG}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_VNTAG", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_VNTAG}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN}, \
+    {"INGRESS_PKT_INNER_L2_HDR_ETAG", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ETAG}, \
+    {"INGRESS_PKT_INNER_L2_HDR_ITAG", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG}, \
+    {"INGRESS_PKT_INNER_L2_HDR_L2", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2}, \
+    {"INGRESS_PKT_INNER_L2_HDR_NONE", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE}, \
+    {"INGRESS_PKT_INNER_L2_HDR_OTAG", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG}, \
+    {"INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC}, \
+    {"INGRESS_PKT_INNER_L2_HDR_VNTAG", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_VNTAG}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ARP", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_BFD", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ICMP", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_IGMP", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV4", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV6", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_NONE", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_P_1588", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_RARP", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UDP", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_ETAG", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ETAG}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_ITAG", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_L2", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_NONE", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_OTAG", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_SVTAG", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SVTAG}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_VNTAG", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_VNTAG}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ARP", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_BFD", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GPE", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ICMP", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IGMP", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV4", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV6", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_NONE", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_P_1588", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_RARP", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UDP", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN}, \
+    {"INGRESS_PKT_SYS_HDR_EP_NIH", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH}, \
+    {"INGRESS_PKT_SYS_HDR_LOOPBACK", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK}, \
+    {"INGRESS_PKT_SYS_HDR_NONE", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE}, \
+    {"rxpmd_match_id_count", BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_COUNT}
+
+#endif /*! BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_bcmpkt_flexhdr.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_bcmpkt_flexhdr.h
deleted file mode 100644
index 30e952c73352..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_bcmpkt_flexhdr.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) header.yml.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_FLEXHDR_H
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_FLEXHDR_H
-
-#include <bcmpkt/bcmpkt_flexhdr_internal.h>
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ARP_T                      0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_AUTHEN_T                   1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T                      2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CNTAG_T                    3
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T  4
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T         5
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T         6
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_DEST_OPTION_T              7
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T        8
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_SUBHDR_5_T         9
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ESP_T                      10
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ETAG_T                     11
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ETHERTYPE_T                12
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_FRAG_T                     13
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T         14
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GPE_T                      15
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_CHKSUM_T               16
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_KEY_T                  17
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_ROUT_T                 18
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_SEQ_T                  19
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_T                      20
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T                 21
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_EXTENSION_0_T          22
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HOP_BY_HOP_T               23
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ICMP_T                     24
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_0_A_T          25
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_0_B_T          26
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_1_T            27
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_2_T            28
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_3_T            29
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_HEADER_T               30
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_MD_BASE_T              31
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_METADATA_T             32
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IGMP_T                     33
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPFIX_T                    34
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV4_T                     35
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV6_T                     36
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_L2_T                       37
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MIRROR_ERSPAN_SN_T         38
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MIRROR_TRANSPORT_T         39
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_ACH_T                 40
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_BV_T                  41
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_CW_T                  42
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_T                     43
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_P_1588_T                   44
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PIM_T                      45
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PROG_EXT_HDR_T             46
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_0_T                  47
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_1_T                  48
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T   49
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T   50
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RARP_T                     51
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ROUTING_T                  52
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RSPAN_T                    53
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_0_T             54
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T             55
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_2_T             56
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SNAP_LLC_T                 57
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_TCP_FIRST_4BYTES_T         58
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T         59
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UDP_T                      60
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L3_T               61
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L4_T               62
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L5_T               63
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VLAN_T                     64
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VNTAG_T                    65
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VXLAN_T                    66
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_WESP_T                     67
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_T               68
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_FLEXHDR_COUNT    69
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_FLEXHDR_NAME_MAP_INIT \
-    {"arp_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ARP_T},\
-    {"authen_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_AUTHEN_T},\
-    {"bfd_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T},\
-    {"cntag_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CNTAG_T},\
-    {"cpu_composites_0_ifa_l2_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T},\
-    {"cpu_composites_0_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T},\
-    {"cpu_composites_1_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T},\
-    {"dest_option_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_DEST_OPTION_T},\
-    {"erspan3_fixed_hdr_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T},\
-    {"erspan3_subhdr_5_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_SUBHDR_5_T},\
-    {"esp_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ESP_T},\
-    {"etag_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ETAG_T},\
-    {"ethertype_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ETHERTYPE_T},\
-    {"frag_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_FRAG_T},\
-    {"generic_loopback_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T},\
-    {"gpe_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GPE_T},\
-    {"gre_chksum_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_CHKSUM_T},\
-    {"gre_key_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_KEY_T},\
-    {"gre_rout_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_ROUT_T},\
-    {"gre_seq_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_SEQ_T},\
-    {"gre_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_T},\
-    {"hg3_base_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T},\
-    {"hg3_extension_0_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_EXTENSION_0_T},\
-    {"hop_by_hop_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HOP_BY_HOP_T},\
-    {"icmp_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ICMP_T},\
-    {"ifa_flex_md_0_a_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_0_A_T},\
-    {"ifa_flex_md_0_b_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_0_B_T},\
-    {"ifa_flex_md_1_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_1_T},\
-    {"ifa_flex_md_2_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_2_T},\
-    {"ifa_flex_md_3_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_3_T},\
-    {"ifa_header_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_HEADER_T},\
-    {"ifa_md_base_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_MD_BASE_T},\
-    {"ifa_metadata_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_METADATA_T},\
-    {"igmp_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IGMP_T},\
-    {"ipfix_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPFIX_T},\
-    {"ipv4_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV4_T},\
-    {"ipv6_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV6_T},\
-    {"l2_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_L2_T},\
-    {"mirror_erspan_sn_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MIRROR_ERSPAN_SN_T},\
-    {"mirror_transport_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MIRROR_TRANSPORT_T},\
-    {"mpls_ach_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_ACH_T},\
-    {"mpls_bv_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_BV_T},\
-    {"mpls_cw_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_CW_T},\
-    {"mpls_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_T},\
-    {"p_1588_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_P_1588_T},\
-    {"pim_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PIM_T},\
-    {"prog_ext_hdr_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PROG_EXT_HDR_T},\
-    {"psamp_0_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_0_T},\
-    {"psamp_1_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_1_T},\
-    {"psamp_mirror_on_drop_0_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T},\
-    {"psamp_mirror_on_drop_3_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T},\
-    {"rarp_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RARP_T},\
-    {"routing_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ROUTING_T},\
-    {"rspan_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RSPAN_T},\
-    {"sflow_shim_0_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_0_T},\
-    {"sflow_shim_1_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T},\
-    {"sflow_shim_2_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_2_T},\
-    {"snap_llc_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SNAP_LLC_T},\
-    {"tcp_first_4bytes_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_TCP_FIRST_4BYTES_T},\
-    {"tcp_last_16bytes_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T},\
-    {"udp_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UDP_T},\
-    {"unknown_l3_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L3_T},\
-    {"unknown_l4_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L4_T},\
-    {"unknown_l5_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L5_T},\
-    {"vlan_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VLAN_T},\
-    {"vntag_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VNTAG_T},\
-    {"vxlan_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VXLAN_T},\
-    {"wesp_t", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_WESP_T},\
-    {"RXPMD_FLEX_T", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_T},\
-    {"flexhdr count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_FLEXHDR_COUNT}
-
-#endif /* BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_FLEXHDR_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_bcmpkt_flexhdr_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_bcmpkt_flexhdr_data.h
deleted file mode 100644
index 2635fe090264..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_bcmpkt_flexhdr_data.h
+++ /dev/null
@@ -1,1324 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) header.yml.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_FLEXHDR_DATA_H
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_FLEXHDR_DATA_H
-
-/*!
- * \name ARP_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ARP_T_HARDWARE_LEN  0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ARP_T_HARDWARE_TYPE 1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ARP_T_OPERATION     2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ARP_T_PROT_ADDR_LEN 3
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ARP_T_PROTOCOL_TYPE 4
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ARP_T_SENDER_HA     5
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ARP_T_SENDER_IP     6
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ARP_T_TARGET_HA     7
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ARP_T_TARGET_IP     8
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ARP_T_FID_COUNT          9
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT \
-    {"HARDWARE_LEN", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ARP_T_HARDWARE_LEN},\
-    {"HARDWARE_TYPE", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ARP_T_HARDWARE_TYPE},\
-    {"OPERATION", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ARP_T_OPERATION},\
-    {"PROT_ADDR_LEN", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ARP_T_PROT_ADDR_LEN},\
-    {"PROTOCOL_TYPE", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ARP_T_PROTOCOL_TYPE},\
-    {"SENDER_HA", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ARP_T_SENDER_HA},\
-    {"SENDER_IP", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ARP_T_SENDER_IP},\
-    {"TARGET_HA", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ARP_T_TARGET_HA},\
-    {"TARGET_IP", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ARP_T_TARGET_IP},\
-    {"arp_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ARP_T_FID_COUNT}
-
-/*!
- * \name AUTHEN_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_AUTHEN_T_DATA        0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_AUTHEN_T_NEXT_HEADER 1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_AUTHEN_T_PAYLOAD_LEN 2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_AUTHEN_T_RESERVED    3
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_AUTHEN_T_SEQ_NUM     4
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_AUTHEN_T_SPI         5
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_AUTHEN_T_FID_COUNT          6
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_AUTHEN_T_FIELD_NAME_MAP_INIT \
-    {"DATA", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_AUTHEN_T_DATA},\
-    {"NEXT_HEADER", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_AUTHEN_T_NEXT_HEADER},\
-    {"PAYLOAD_LEN", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_AUTHEN_T_PAYLOAD_LEN},\
-    {"RESERVED", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_AUTHEN_T_RESERVED},\
-    {"SEQ_NUM", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_AUTHEN_T_SEQ_NUM},\
-    {"SPI", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_AUTHEN_T_SPI},\
-    {"authen_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_AUTHEN_T_FID_COUNT}
-
-/*!
- * \name BFD_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_AP            0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_BFD_LENGTH    1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_CPI           2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_DEM           3
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_DESMINTXINTV  4
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_DETECTMULT    5
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_DIAG          6
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_FIN           7
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_MINECHORXINTV 8
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_MPT           9
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_MYDISCRIM     10
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_POLL          11
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_REQMINRXINTV  12
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_STA           13
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_URDISCRIM     14
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_VERSION       15
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_FID_COUNT          16
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_FIELD_NAME_MAP_INIT \
-    {"AP", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_AP},\
-    {"BFD_LENGTH", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_BFD_LENGTH},\
-    {"CPI", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_CPI},\
-    {"DEM", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_DEM},\
-    {"DESMINTXINTV", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_DESMINTXINTV},\
-    {"DETECTMULT", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_DETECTMULT},\
-    {"DIAG", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_DIAG},\
-    {"FIN", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_FIN},\
-    {"MINECHORXINTV", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_MINECHORXINTV},\
-    {"MPT", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_MPT},\
-    {"MYDISCRIM", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_MYDISCRIM},\
-    {"POLL", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_POLL},\
-    {"REQMINRXINTV", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_REQMINRXINTV},\
-    {"STA", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_STA},\
-    {"URDISCRIM", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_URDISCRIM},\
-    {"VERSION", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_VERSION},\
-    {"bfd_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_FID_COUNT}
-
-/*!
- * \name CNTAG_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CNTAG_T_RPID 0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CNTAG_T_TPID 1
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CNTAG_T_FID_COUNT          2
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CNTAG_T_FIELD_NAME_MAP_INIT \
-    {"RPID", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CNTAG_T_RPID},\
-    {"TPID", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CNTAG_T_TPID},\
-    {"cntag_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CNTAG_T_FID_COUNT}
-
-/*!
- * \name CPU_COMPOSITES_0_IFA_L2_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_DMA_CONT0 0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_DMA_CONT1 1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_DMA_CONT2 2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_DMA_CONT3 3
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_DMA_CONT4 4
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_DMA_CONT5 5
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_DMA_CONT6 6
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_MACDA     7
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_MACSA     8
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_FID_COUNT          9
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_FIELD_NAME_MAP_INIT \
-    {"DMA_CONT0", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_DMA_CONT0},\
-    {"DMA_CONT1", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_DMA_CONT1},\
-    {"DMA_CONT2", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_DMA_CONT2},\
-    {"DMA_CONT3", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_DMA_CONT3},\
-    {"DMA_CONT4", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_DMA_CONT4},\
-    {"DMA_CONT5", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_DMA_CONT5},\
-    {"DMA_CONT6", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_DMA_CONT6},\
-    {"MACDA", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_MACDA},\
-    {"MACSA", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_MACSA},\
-    {"cpu_composites_0_ifa_l2_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_FID_COUNT}
-
-/*!
- * \name CPU_COMPOSITES_0_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0 0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1 1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2 2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3 3
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4 4
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5 5
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6 6
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT          7
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT \
-    {"DMA_CONT0", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0},\
-    {"DMA_CONT1", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1},\
-    {"DMA_CONT2", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2},\
-    {"DMA_CONT3", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3},\
-    {"DMA_CONT4", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4},\
-    {"DMA_CONT5", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5},\
-    {"DMA_CONT6", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6},\
-    {"cpu_composites_0_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT}
-
-/*!
- * \name CPU_COMPOSITES_1_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10 0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11 1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12 2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13 3
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14 4
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15 5
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16 6
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17 7
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7  8
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8  9
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9  10
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT          11
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT \
-    {"DMA_CONT10", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10},\
-    {"DMA_CONT11", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11},\
-    {"DMA_CONT12", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12},\
-    {"DMA_CONT13", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13},\
-    {"DMA_CONT14", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14},\
-    {"DMA_CONT15", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15},\
-    {"DMA_CONT16", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16},\
-    {"DMA_CONT17", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17},\
-    {"DMA_CONT7", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7},\
-    {"DMA_CONT8", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8},\
-    {"DMA_CONT9", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9},\
-    {"cpu_composites_1_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT}
-
-/*!
- * \name DEST_OPTION_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_DEST_OPTION_T_HDR_EXT_LEN 0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_DEST_OPTION_T_NEXT_HEADER 1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_DEST_OPTION_T_OPTION      2
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_DEST_OPTION_T_FID_COUNT          3
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_DEST_OPTION_T_FIELD_NAME_MAP_INIT \
-    {"HDR_EXT_LEN", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_DEST_OPTION_T_HDR_EXT_LEN},\
-    {"NEXT_HEADER", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_DEST_OPTION_T_NEXT_HEADER},\
-    {"OPTION", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_DEST_OPTION_T_OPTION},\
-    {"dest_option_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_DEST_OPTION_T_FID_COUNT}
-
-/*!
- * \name ERSPAN3_FIXED_HDR_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO               0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_COS               1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID           2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O 3
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID        4
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_T                 5
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP         6
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_VER               7
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN              8
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT          9
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT \
-    {"BSO", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO},\
-    {"COS", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_COS},\
-    {"GBP_SID", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID},\
-    {"P_FT_HWID_D_GRA_O", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O},\
-    {"SESSION_ID", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID},\
-    {"T", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_T},\
-    {"TIMESTAMP", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP},\
-    {"VER", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_VER},\
-    {"VLAN", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN},\
-    {"erspan3_fixed_hdr_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT}
-
-/*!
- * \name ERSPAN3_SUBHDR_5_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID 0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID     1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID   2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP   3
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT          4
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT \
-    {"PLATFORM_ID", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID},\
-    {"PORT_ID", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID},\
-    {"SWITCH_ID", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID},\
-    {"TIMESTAMP", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP},\
-    {"erspan3_subhdr_5_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT}
-
-/*!
- * \name ESP_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ESP_T_NEXT_HEADER 0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ESP_T_PAD         1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ESP_T_PAD_LEN     2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ESP_T_SEQ_NUM     3
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ESP_T_SPI         4
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ESP_T_FID_COUNT          5
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ESP_T_FIELD_NAME_MAP_INIT \
-    {"NEXT_HEADER", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ESP_T_NEXT_HEADER},\
-    {"PAD", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ESP_T_PAD},\
-    {"PAD_LEN", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ESP_T_PAD_LEN},\
-    {"SEQ_NUM", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ESP_T_SEQ_NUM},\
-    {"SPI", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ESP_T_SPI},\
-    {"esp_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ESP_T_FID_COUNT}
-
-/*!
- * \name ETAG_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ETAG_T_TAG  0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ETAG_T_TPID 1
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ETAG_T_FID_COUNT          2
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ETAG_T_FIELD_NAME_MAP_INIT \
-    {"TAG", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ETAG_T_TAG},\
-    {"TPID", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ETAG_T_TPID},\
-    {"etag_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ETAG_T_FID_COUNT}
-
-/*!
- * \name ETHERTYPE_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ETHERTYPE_T_TYPE 0
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ETHERTYPE_T_FID_COUNT          1
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT \
-    {"TYPE", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ETHERTYPE_T_TYPE},\
-    {"ethertype_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ETHERTYPE_T_FID_COUNT}
-
-/*!
- * \name FRAG_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_FRAG_T_FRAG_INFO   0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_FRAG_T_ID          1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_FRAG_T_NEXT_HEADER 2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_FRAG_T_RESERVED    3
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_FRAG_T_FID_COUNT          4
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_FRAG_T_FIELD_NAME_MAP_INIT \
-    {"FRAG_INFO", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_FRAG_T_FRAG_INFO},\
-    {"ID", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_FRAG_T_ID},\
-    {"NEXT_HEADER", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_FRAG_T_NEXT_HEADER},\
-    {"RESERVED", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_FRAG_T_RESERVED},\
-    {"frag_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_FRAG_T_FID_COUNT}
-
-/*!
- * \name GENERIC_LOOPBACK_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ    0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE   1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ        2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_FLAGS              3
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE        4
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY     5
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL     6
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ      7
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0  8
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1  9
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ            10
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1         11
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_2         12
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT 13
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE         14
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT          15
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT \
-    {"DESTINATION_OBJ", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ},\
-    {"DESTINATION_TYPE", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE},\
-    {"ENTROPY_OBJ", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ},\
-    {"FLAGS", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_FLAGS},\
-    {"HEADER_TYPE", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE},\
-    {"INPUT_PRIORITY", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY},\
-    {"INTERFACE_CTRL", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL},\
-    {"INTERFACE_OBJ", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ},\
-    {"PROCESSING_CTRL_0", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0},\
-    {"PROCESSING_CTRL_1", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1},\
-    {"QOS_OBJ", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ},\
-    {"RESERVED_1", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1},\
-    {"RESERVED_2", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_2},\
-    {"SOURCE_SYSTEM_PORT", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT},\
-    {"START_BYTE", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE},\
-    {"generic_loopback_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT}
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NO_OP       0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2_OIF      1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED    2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__VP          3
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP        4
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NHOP        5
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2MC_GROUP  6
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L3MC_GROUP  7
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED_1  8
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP_MEMBER 9
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__DEVICE_PORT 10
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_TYPE__TUNNEL  0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_TYPE__GENERIC 1
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__NOOP   0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__VFI    1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__L3_IIF 2
-
-/*!
- * \name GPE_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GPE_T_FLAGS         0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GPE_T_NEXT_PROTOCOL 1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GPE_T_RESERVED0     2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GPE_T_RESERVED1     3
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GPE_T_VNI           4
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GPE_T_FID_COUNT          5
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GPE_T_FIELD_NAME_MAP_INIT \
-    {"FLAGS", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GPE_T_FLAGS},\
-    {"NEXT_PROTOCOL", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GPE_T_NEXT_PROTOCOL},\
-    {"RESERVED0", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GPE_T_RESERVED0},\
-    {"RESERVED1", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GPE_T_RESERVED1},\
-    {"VNI", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GPE_T_VNI},\
-    {"gpe_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GPE_T_FID_COUNT}
-
-/*!
- * \name GRE_CHKSUM_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_CHKSUM_T_CHECKSUM 0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_CHKSUM_T_OFFSET   1
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_CHKSUM_T_FID_COUNT          2
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_CHKSUM_T_FIELD_NAME_MAP_INIT \
-    {"CHECKSUM", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_CHKSUM_T_CHECKSUM},\
-    {"OFFSET", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_CHKSUM_T_OFFSET},\
-    {"gre_chksum_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_CHKSUM_T_FID_COUNT}
-
-/*!
- * \name GRE_KEY_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_KEY_T_KEY 0
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_KEY_T_FID_COUNT          1
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_KEY_T_FIELD_NAME_MAP_INIT \
-    {"KEY", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_KEY_T_KEY},\
-    {"gre_key_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_KEY_T_FID_COUNT}
-
-/*!
- * \name GRE_ROUT_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_ROUT_T_ROUTING 0
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_ROUT_T_FID_COUNT          1
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_ROUT_T_FIELD_NAME_MAP_INIT \
-    {"ROUTING", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_ROUT_T_ROUTING},\
-    {"gre_rout_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_ROUT_T_FID_COUNT}
-
-/*!
- * \name GRE_SEQ_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_SEQ_T_SEQUENCE 0
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_SEQ_T_FID_COUNT          1
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_SEQ_T_FIELD_NAME_MAP_INIT \
-    {"SEQUENCE", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_SEQ_T_SEQUENCE},\
-    {"gre_seq_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_SEQ_T_FID_COUNT}
-
-/*!
- * \name GRE_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_T_C_R_K_S  0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_T_PROTOCOL 1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_T_RESERVED 2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_T_VERSION  3
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_T_FID_COUNT          4
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_T_FIELD_NAME_MAP_INIT \
-    {"C_R_K_S", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_T_C_R_K_S},\
-    {"PROTOCOL", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_T_PROTOCOL},\
-    {"RESERVED", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_T_RESERVED},\
-    {"VERSION", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_T_VERSION},\
-    {"gre_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_T_FID_COUNT}
-
-/*!
- * \name HG3_BASE_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_CN                      0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_CNG                     1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_ENTROPY                 2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_EXT_HDR_PRESENT         3
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_HG3_RESERVED            4
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_L3_ROUTED               5
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_MIRROR_COPY             6
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_RESERVED_ETYPE          7
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION      8
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION_TYPE 9
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_SYSTEM_SOURCE           10
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_TC                      11
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_VERSION                 12
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_FID_COUNT          13
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_FIELD_NAME_MAP_INIT \
-    {"CN", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_CN},\
-    {"CNG", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_CNG},\
-    {"ENTROPY", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_ENTROPY},\
-    {"EXT_HDR_PRESENT", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_EXT_HDR_PRESENT},\
-    {"HG3_RESERVED", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_HG3_RESERVED},\
-    {"L3_ROUTED", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_L3_ROUTED},\
-    {"MIRROR_COPY", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_MIRROR_COPY},\
-    {"RESERVED_ETYPE", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_RESERVED_ETYPE},\
-    {"SYSTEM_DESTINATION", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION},\
-    {"SYSTEM_DESTINATION_TYPE", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION_TYPE},\
-    {"SYSTEM_SOURCE", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_SYSTEM_SOURCE},\
-    {"TC", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_TC},\
-    {"VERSION", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_VERSION},\
-    {"hg3_base_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_FID_COUNT}
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__NO_OP       0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__L2_OIF      1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__RESERVED    2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__VP          3
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__ECMP        4
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__NHOP        5
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__L2MC_GROUP  6
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__L3MC_GROUP  7
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__RESERVED_1  8
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__ECMP_MEMBER 9
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__DEVICE_PORT 10
-
-/*!
- * \name HG3_EXTENSION_0_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_LSB      0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_MSB      1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_EXTENSION_0_T_DVP_OR_L3_IIF     2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_EXTENSION_0_T_FLAGS             3
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_EXTENSION_0_T_FORWARDING_DOMAIN 4
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_EXTENSION_0_T_SVP               5
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT          6
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_EXTENSION_0_T_FIELD_NAME_MAP_INIT \
-    {"CLASS_ID_LSB", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_LSB},\
-    {"CLASS_ID_MSB", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_MSB},\
-    {"DVP_OR_L3_IIF", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_EXTENSION_0_T_DVP_OR_L3_IIF},\
-    {"FLAGS", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_EXTENSION_0_T_FLAGS},\
-    {"FORWARDING_DOMAIN", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_EXTENSION_0_T_FORWARDING_DOMAIN},\
-    {"SVP", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_EXTENSION_0_T_SVP},\
-    {"hg3_extension_0_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT}
-
-/*!
- * \name HOP_BY_HOP_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HOP_BY_HOP_T_HDR_EXT_LEN 0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HOP_BY_HOP_T_NEXT_HEADER 1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HOP_BY_HOP_T_OPTION      2
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HOP_BY_HOP_T_FID_COUNT          3
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HOP_BY_HOP_T_FIELD_NAME_MAP_INIT \
-    {"HDR_EXT_LEN", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HOP_BY_HOP_T_HDR_EXT_LEN},\
-    {"NEXT_HEADER", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HOP_BY_HOP_T_NEXT_HEADER},\
-    {"OPTION", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HOP_BY_HOP_T_OPTION},\
-    {"hop_by_hop_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HOP_BY_HOP_T_FID_COUNT}
-
-/*!
- * \name ICMP_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ICMP_T_CHECKSUM  0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ICMP_T_CODE      1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ICMP_T_ICMP_TYPE 2
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ICMP_T_FID_COUNT          3
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT \
-    {"CHECKSUM", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ICMP_T_CHECKSUM},\
-    {"CODE", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ICMP_T_CODE},\
-    {"ICMP_TYPE", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ICMP_T_ICMP_TYPE},\
-    {"icmp_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ICMP_T_FID_COUNT}
-
-/*!
- * \name IFA_FLEX_MD_0_A_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_0_A_T_FWD_HDR_TTL   0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_0_A_T_LNS_DEVICE_ID 1
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT          2
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_0_A_T_FIELD_NAME_MAP_INIT \
-    {"FWD_HDR_TTL", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_0_A_T_FWD_HDR_TTL},\
-    {"LNS_DEVICE_ID", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_0_A_T_LNS_DEVICE_ID},\
-    {"ifa_flex_md_0_a_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT}
-
-/*!
- * \name IFA_FLEX_MD_0_B_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_0_B_T_CN               0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_0_B_T_PORT_SPEED       1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_0_B_T_QUEUE_ID         2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_0_B_T_RX_TIMESTAMP_SEC 3
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT          4
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_0_B_T_FIELD_NAME_MAP_INIT \
-    {"CN", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_0_B_T_CN},\
-    {"PORT_SPEED", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_0_B_T_PORT_SPEED},\
-    {"QUEUE_ID", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_0_B_T_QUEUE_ID},\
-    {"RX_TIMESTAMP_SEC", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_0_B_T_RX_TIMESTAMP_SEC},\
-    {"ifa_flex_md_0_b_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT}
-
-/*!
- * \name IFA_FLEX_MD_1_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_1_T_EGRESS_PORT_ID       0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_1_T_INGRESS_PORT_ID      1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_1_T_RX_TIMESTAMP_NANOSEC 2
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT          3
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_1_T_FIELD_NAME_MAP_INIT \
-    {"EGRESS_PORT_ID", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_1_T_EGRESS_PORT_ID},\
-    {"INGRESS_PORT_ID", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_1_T_INGRESS_PORT_ID},\
-    {"RX_TIMESTAMP_NANOSEC", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_1_T_RX_TIMESTAMP_NANOSEC},\
-    {"ifa_flex_md_1_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT}
-
-/*!
- * \name IFA_FLEX_MD_2_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_2_T_RESIDENCE_TIME_NANOSEC 0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_2_T_TX_QUEUE_BYTE_COUNT    1
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT          2
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_2_T_FIELD_NAME_MAP_INIT \
-    {"RESIDENCE_TIME_NANOSEC", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_2_T_RESIDENCE_TIME_NANOSEC},\
-    {"TX_QUEUE_BYTE_COUNT", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_2_T_TX_QUEUE_BYTE_COUNT},\
-    {"ifa_flex_md_2_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT}
-
-/*!
- * \name IFA_FLEX_MD_3_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_3_T_MMU_STAT_0 0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_3_T_MMU_STAT_1 1
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT          2
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_3_T_FIELD_NAME_MAP_INIT \
-    {"MMU_STAT_0", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_3_T_MMU_STAT_0},\
-    {"MMU_STAT_1", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_3_T_MMU_STAT_1},\
-    {"ifa_flex_md_3_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT}
-
-/*!
- * \name IFA_HEADER_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_HEADER_T_FLAGS      0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_HEADER_T_GNS        1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_HEADER_T_MAX_LENGTH 2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_HEADER_T_NEXT_HDR   3
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_HEADER_T_VER        4
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_HEADER_T_FID_COUNT          5
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_HEADER_T_FIELD_NAME_MAP_INIT \
-    {"FLAGS", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_HEADER_T_FLAGS},\
-    {"GNS", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_HEADER_T_GNS},\
-    {"MAX_LENGTH", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_HEADER_T_MAX_LENGTH},\
-    {"NEXT_HDR", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_HEADER_T_NEXT_HDR},\
-    {"VER", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_HEADER_T_VER},\
-    {"ifa_header_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_HEADER_T_FID_COUNT}
-
-/*!
- * \name IFA_MD_BASE_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_MD_BASE_T_ACTION_VECTOR            0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_MD_BASE_T_HOP_LIMIT_CURRENT_LENGTH 1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_MD_BASE_T_REQUEST_VECTOR           2
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_MD_BASE_T_FID_COUNT          3
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_MD_BASE_T_FIELD_NAME_MAP_INIT \
-    {"ACTION_VECTOR", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_MD_BASE_T_ACTION_VECTOR},\
-    {"HOP_LIMIT_CURRENT_LENGTH", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_MD_BASE_T_HOP_LIMIT_CURRENT_LENGTH},\
-    {"REQUEST_VECTOR", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_MD_BASE_T_REQUEST_VECTOR},\
-    {"ifa_md_base_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_MD_BASE_T_FID_COUNT}
-
-/*!
- * \name IFA_METADATA_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_METADATA_T_ACTION_VECTOR            0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_METADATA_T_HOP_LIMIT_CURRENT_LENGTH 1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_METADATA_T_METADATA                 2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_METADATA_T_REQUEST_VECTOR           3
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_METADATA_T_FID_COUNT          4
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_METADATA_T_FIELD_NAME_MAP_INIT \
-    {"ACTION_VECTOR", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_METADATA_T_ACTION_VECTOR},\
-    {"HOP_LIMIT_CURRENT_LENGTH", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_METADATA_T_HOP_LIMIT_CURRENT_LENGTH},\
-    {"METADATA", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_METADATA_T_METADATA},\
-    {"REQUEST_VECTOR", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_METADATA_T_REQUEST_VECTOR},\
-    {"ifa_metadata_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_METADATA_T_FID_COUNT}
-
-/*!
- * \name IGMP_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IGMP_T_CHECKSUM      0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IGMP_T_GROUP_ADDRESS 1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IGMP_T_IGMP_TYPE     2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IGMP_T_MAX_RESP_TIME 3
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IGMP_T_FID_COUNT          4
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IGMP_T_FIELD_NAME_MAP_INIT \
-    {"CHECKSUM", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IGMP_T_CHECKSUM},\
-    {"GROUP_ADDRESS", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IGMP_T_GROUP_ADDRESS},\
-    {"IGMP_TYPE", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IGMP_T_IGMP_TYPE},\
-    {"MAX_RESP_TIME", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IGMP_T_MAX_RESP_TIME},\
-    {"igmp_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IGMP_T_FID_COUNT}
-
-/*!
- * \name IPFIX_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPFIX_T_EXPORT_TIME   0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPFIX_T_LENGTH        1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPFIX_T_OBS_DOMAIN_ID 2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPFIX_T_SEQUENCE_NUM  3
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPFIX_T_VERSION       4
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPFIX_T_FID_COUNT          5
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT \
-    {"EXPORT_TIME", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPFIX_T_EXPORT_TIME},\
-    {"LENGTH", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPFIX_T_LENGTH},\
-    {"OBS_DOMAIN_ID", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPFIX_T_OBS_DOMAIN_ID},\
-    {"SEQUENCE_NUM", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPFIX_T_SEQUENCE_NUM},\
-    {"VERSION", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPFIX_T_VERSION},\
-    {"ipfix_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPFIX_T_FID_COUNT}
-
-/*!
- * \name IPV4_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV4_T_DA                0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET 1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV4_T_HDR_CHECKSUM      2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV4_T_ID                3
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV4_T_OPTION            4
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV4_T_PROTOCOL          5
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV4_T_SA                6
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV4_T_TOS               7
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV4_T_TOTAL_LENGTH      8
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV4_T_TTL               9
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV4_T_VERSION_HDR_LEN   10
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV4_T_FID_COUNT          11
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT \
-    {"DA", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV4_T_DA},\
-    {"FLAGS_FRAG_OFFSET", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET},\
-    {"HDR_CHECKSUM", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV4_T_HDR_CHECKSUM},\
-    {"ID", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV4_T_ID},\
-    {"OPTION", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV4_T_OPTION},\
-    {"PROTOCOL", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV4_T_PROTOCOL},\
-    {"SA", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV4_T_SA},\
-    {"TOS", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV4_T_TOS},\
-    {"TOTAL_LENGTH", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV4_T_TOTAL_LENGTH},\
-    {"TTL", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV4_T_TTL},\
-    {"VERSION_HDR_LEN", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV4_T_VERSION_HDR_LEN},\
-    {"ipv4_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV4_T_FID_COUNT}
-
-/*!
- * \name IPV6_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV6_T_DA             0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV6_T_FLOW_LABEL     1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV6_T_HOP_LIMIT      2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV6_T_NEXT_HEADER    3
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV6_T_PAYLOAD_LENGTH 4
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV6_T_SA             5
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV6_T_TRAFFIC_CLASS  6
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV6_T_VERSION        7
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV6_T_FID_COUNT          8
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT \
-    {"DA", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV6_T_DA},\
-    {"FLOW_LABEL", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV6_T_FLOW_LABEL},\
-    {"HOP_LIMIT", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV6_T_HOP_LIMIT},\
-    {"NEXT_HEADER", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV6_T_NEXT_HEADER},\
-    {"PAYLOAD_LENGTH", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV6_T_PAYLOAD_LENGTH},\
-    {"SA", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV6_T_SA},\
-    {"TRAFFIC_CLASS", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV6_T_TRAFFIC_CLASS},\
-    {"VERSION", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV6_T_VERSION},\
-    {"ipv6_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV6_T_FID_COUNT}
-
-/*!
- * \name L2_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_L2_T_MACDA 0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_L2_T_MACSA 1
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_L2_T_FID_COUNT          2
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_L2_T_FIELD_NAME_MAP_INIT \
-    {"MACDA", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_L2_T_MACDA},\
-    {"MACSA", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_L2_T_MACSA},\
-    {"l2_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_L2_T_FID_COUNT}
-
-/*!
- * \name MIRROR_ERSPAN_SN_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM 0
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT          1
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT \
-    {"SEQ_NUM", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM},\
-    {"mirror_erspan_sn_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT}
-
-/*!
- * \name MIRROR_TRANSPORT_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MIRROR_TRANSPORT_T_DATA 0
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT          1
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT \
-    {"DATA", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MIRROR_TRANSPORT_T_DATA},\
-    {"mirror_transport_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT}
-
-/*!
- * \name MPLS_ACH_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_ACH_T_CHANNEL_TYPE 0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_ACH_T_CW_TYPE      1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_ACH_T_RESERVED     2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_ACH_T_VERSION      3
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_ACH_T_FID_COUNT          4
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_ACH_T_FIELD_NAME_MAP_INIT \
-    {"CHANNEL_TYPE", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_ACH_T_CHANNEL_TYPE},\
-    {"CW_TYPE", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_ACH_T_CW_TYPE},\
-    {"RESERVED", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_ACH_T_RESERVED},\
-    {"VERSION", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_ACH_T_VERSION},\
-    {"mpls_ach_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_ACH_T_FID_COUNT}
-
-/*!
- * \name MPLS_BV_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_BV_T_VALUE 0
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_BV_T_FID_COUNT          1
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_BV_T_FIELD_NAME_MAP_INIT \
-    {"VALUE", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_BV_T_VALUE},\
-    {"mpls_bv_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_BV_T_FID_COUNT}
-
-/*!
- * \name MPLS_CW_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_CW_T_CW_TYPE    0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_CW_T_RESERVED   1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_CW_T_SEQ_NUMBER 2
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_CW_T_FID_COUNT          3
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_CW_T_FIELD_NAME_MAP_INIT \
-    {"CW_TYPE", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_CW_T_CW_TYPE},\
-    {"RESERVED", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_CW_T_RESERVED},\
-    {"SEQ_NUMBER", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_CW_T_SEQ_NUMBER},\
-    {"mpls_cw_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_CW_T_FID_COUNT}
-
-/*!
- * \name MPLS_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_T_BOS   0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_T_EXP   1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_T_LABEL 2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_T_TTL   3
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_T_FID_COUNT          4
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_T_FIELD_NAME_MAP_INIT \
-    {"BOS", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_T_BOS},\
-    {"EXP", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_T_EXP},\
-    {"LABEL", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_T_LABEL},\
-    {"TTL", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_T_TTL},\
-    {"mpls_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_T_FID_COUNT}
-
-/*!
- * \name P_1588_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_P_1588_T_CNTRL          0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_P_1588_T_CORRECTION     1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_P_1588_T_DOMAIN_NB      2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_P_1588_T_FLAGS          3
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_P_1588_T_LOGMSGINTERVAL 4
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_P_1588_T_MSG_LENGTH     5
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_P_1588_T_MSG_TYPE       6
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_P_1588_T_RESERVED1      7
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_P_1588_T_RESERVED2      8
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_P_1588_T_RESERVED3      9
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_P_1588_T_SEQ_ID         10
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_P_1588_T_SRCPORTID      11
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_P_1588_T_TRANSPORTSPEC  12
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_P_1588_T_VERSION        13
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_P_1588_T_FID_COUNT          14
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_P_1588_T_FIELD_NAME_MAP_INIT \
-    {"CNTRL", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_P_1588_T_CNTRL},\
-    {"CORRECTION", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_P_1588_T_CORRECTION},\
-    {"DOMAIN_NB", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_P_1588_T_DOMAIN_NB},\
-    {"FLAGS", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_P_1588_T_FLAGS},\
-    {"LOGMSGINTERVAL", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_P_1588_T_LOGMSGINTERVAL},\
-    {"MSG_LENGTH", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_P_1588_T_MSG_LENGTH},\
-    {"MSG_TYPE", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_P_1588_T_MSG_TYPE},\
-    {"RESERVED1", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_P_1588_T_RESERVED1},\
-    {"RESERVED2", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_P_1588_T_RESERVED2},\
-    {"RESERVED3", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_P_1588_T_RESERVED3},\
-    {"SEQ_ID", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_P_1588_T_SEQ_ID},\
-    {"SRCPORTID", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_P_1588_T_SRCPORTID},\
-    {"TRANSPORTSPEC", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_P_1588_T_TRANSPORTSPEC},\
-    {"VERSION", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_P_1588_T_VERSION},\
-    {"p_1588_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_P_1588_T_FID_COUNT}
-
-/*!
- * \name PIM_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PIM_T_HDR_BYTES_0_1 0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PIM_T_HDR_BYTES_2_3 1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PIM_T_HDR_BYTES_4_5 2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PIM_T_HDR_BYTES_6_7 3
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PIM_T_FID_COUNT          4
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PIM_T_FIELD_NAME_MAP_INIT \
-    {"HDR_BYTES_0_1", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PIM_T_HDR_BYTES_0_1},\
-    {"HDR_BYTES_2_3", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PIM_T_HDR_BYTES_2_3},\
-    {"HDR_BYTES_4_5", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PIM_T_HDR_BYTES_4_5},\
-    {"HDR_BYTES_6_7", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PIM_T_HDR_BYTES_6_7},\
-    {"pim_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PIM_T_FID_COUNT}
-
-/*!
- * \name PROG_EXT_HDR_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PROG_EXT_HDR_T_HDR_EXT_LEN 0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PROG_EXT_HDR_T_NEXT_HEADER 1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PROG_EXT_HDR_T_OPTION      2
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PROG_EXT_HDR_T_FID_COUNT          3
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PROG_EXT_HDR_T_FIELD_NAME_MAP_INIT \
-    {"HDR_EXT_LEN", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PROG_EXT_HDR_T_HDR_EXT_LEN},\
-    {"NEXT_HEADER", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PROG_EXT_HDR_T_NEXT_HEADER},\
-    {"OPTION", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PROG_EXT_HDR_T_OPTION},\
-    {"prog_ext_hdr_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PROG_EXT_HDR_T_FID_COUNT}
-
-/*!
- * \name PSAMP_0_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_0_T_FLOWSET        0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_0_T_LENGTH         1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_0_T_NEXT_HOP_INDEX 2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_0_T_OBS_TIME_NS    3
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_0_T_OBS_TIME_S     4
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_0_T_TEMPLATE_ID    5
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_0_T_FID_COUNT          6
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_0_T_FIELD_NAME_MAP_INIT \
-    {"FLOWSET", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_0_T_FLOWSET},\
-    {"LENGTH", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_0_T_LENGTH},\
-    {"NEXT_HOP_INDEX", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_0_T_NEXT_HOP_INDEX},\
-    {"OBS_TIME_NS", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_0_T_OBS_TIME_NS},\
-    {"OBS_TIME_S", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_0_T_OBS_TIME_S},\
-    {"TEMPLATE_ID", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_0_T_TEMPLATE_ID},\
-    {"psamp_0_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_0_T_FID_COUNT}
-
-/*!
- * \name PSAMP_1_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_1_T_DLB_ID         0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_1_T_EGRESS_PORT    1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_1_T_EPOCH          2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_1_T_INGRESS_PORT   3
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_1_T_SAMPLED_LENGTH 4
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_1_T_USER_META_DATA 5
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_1_T_VARIABLE_FLAG  6
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_1_T_FID_COUNT          7
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_1_T_FIELD_NAME_MAP_INIT \
-    {"DLB_ID", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_1_T_DLB_ID},\
-    {"EGRESS_PORT", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_1_T_EGRESS_PORT},\
-    {"EPOCH", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_1_T_EPOCH},\
-    {"INGRESS_PORT", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_1_T_INGRESS_PORT},\
-    {"SAMPLED_LENGTH", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_1_T_SAMPLED_LENGTH},\
-    {"USER_META_DATA", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_1_T_USER_META_DATA},\
-    {"VARIABLE_FLAG", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_1_T_VARIABLE_FLAG},\
-    {"psamp_1_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_1_T_FID_COUNT}
-
-/*!
- * \name PSAMP_MIRROR_ON_DROP_0_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT 0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT    1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH          2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS     3
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S      4
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID       5
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID     6
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT          7
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT \
-    {"EGRESS_MOD_PORT", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT},\
-    {"INGRESS_PORT", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT},\
-    {"LENGTH", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH},\
-    {"OBS_TIME_NS", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS},\
-    {"OBS_TIME_S", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S},\
-    {"SWITCH_ID", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID},\
-    {"TEMPLATE_ID", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID},\
-    {"psamp_mirror_on_drop_0_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT}
-
-/*!
- * \name PSAMP_MIRROR_ON_DROP_3_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_DROP_REASON             0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_MOD_STATE               1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_RESERVED_0              2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SAMPLED_LENGTH          3
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_UC_COS__COLOR__PROB_IDX 4
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_USER_META_DATA          5
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_VAR_LEN_INDICATOR       6
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT          7
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FIELD_NAME_MAP_INIT \
-    {"DROP_REASON", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_DROP_REASON},\
-    {"MOD_STATE", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_MOD_STATE},\
-    {"RESERVED_0", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_RESERVED_0},\
-    {"SAMPLED_LENGTH", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SAMPLED_LENGTH},\
-    {"UC_COS__COLOR__PROB_IDX", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_UC_COS__COLOR__PROB_IDX},\
-    {"USER_META_DATA", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_USER_META_DATA},\
-    {"VAR_LEN_INDICATOR", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_VAR_LEN_INDICATOR},\
-    {"psamp_mirror_on_drop_3_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT}
-
-/*!
- * \name RARP_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RARP_T_HARDWARE_LEN  0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RARP_T_HARDWARE_TYPE 1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RARP_T_OPERATION     2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RARP_T_PROT_ADDR_LEN 3
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RARP_T_PROTOCOL_TYPE 4
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RARP_T_SENDER_HA     5
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RARP_T_SENDER_IP     6
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RARP_T_TARGET_HA     7
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RARP_T_TARGET_IP     8
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RARP_T_FID_COUNT          9
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT \
-    {"HARDWARE_LEN", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RARP_T_HARDWARE_LEN},\
-    {"HARDWARE_TYPE", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RARP_T_HARDWARE_TYPE},\
-    {"OPERATION", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RARP_T_OPERATION},\
-    {"PROT_ADDR_LEN", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RARP_T_PROT_ADDR_LEN},\
-    {"PROTOCOL_TYPE", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RARP_T_PROTOCOL_TYPE},\
-    {"SENDER_HA", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RARP_T_SENDER_HA},\
-    {"SENDER_IP", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RARP_T_SENDER_IP},\
-    {"TARGET_HA", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RARP_T_TARGET_HA},\
-    {"TARGET_IP", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RARP_T_TARGET_IP},\
-    {"rarp_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RARP_T_FID_COUNT}
-
-/*!
- * \name ROUTING_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ROUTING_T_DATA          0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ROUTING_T_HDR_EXT_LEN   1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ROUTING_T_NEXT_HEADER   2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ROUTING_T_ROUTING_TYPE  3
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ROUTING_T_SEGMENTS_LEFT 4
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ROUTING_T_FID_COUNT          5
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ROUTING_T_FIELD_NAME_MAP_INIT \
-    {"DATA", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ROUTING_T_DATA},\
-    {"HDR_EXT_LEN", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ROUTING_T_HDR_EXT_LEN},\
-    {"NEXT_HEADER", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ROUTING_T_NEXT_HEADER},\
-    {"ROUTING_TYPE", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ROUTING_T_ROUTING_TYPE},\
-    {"SEGMENTS_LEFT", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ROUTING_T_SEGMENTS_LEFT},\
-    {"routing_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ROUTING_T_FID_COUNT}
-
-/*!
- * \name RSPAN_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RSPAN_T_TAG  0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RSPAN_T_TPID 1
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RSPAN_T_FID_COUNT          2
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RSPAN_T_FIELD_NAME_MAP_INIT \
-    {"TAG", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RSPAN_T_TAG},\
-    {"TPID", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RSPAN_T_TPID},\
-    {"rspan_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RSPAN_T_FID_COUNT}
-
-/*!
- * \name SFLOW_SHIM_0_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_0_T_SYS_DESTINATION 0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_0_T_SYS_SOURCE      1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_0_T_VERSION         2
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT          3
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_0_T_FIELD_NAME_MAP_INIT \
-    {"SYS_DESTINATION", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_0_T_SYS_DESTINATION},\
-    {"SYS_SOURCE", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_0_T_SYS_SOURCE},\
-    {"VERSION", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_0_T_VERSION},\
-    {"sflow_shim_0_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT}
-
-/*!
- * \name SFLOW_SHIM_1_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_DEST_SAMPLE 0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_DISCARDED   1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_FLEX_SAMPLE 2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_MCAST       3
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_SRC_SAMPLE  4
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_TRUNCATED   5
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_RESERVED         6
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_SYS_OPCODE       7
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT          8
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_FIELD_NAME_MAP_INIT \
-    {"FLAG_DEST_SAMPLE", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_DEST_SAMPLE},\
-    {"FLAG_DISCARDED", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_DISCARDED},\
-    {"FLAG_FLEX_SAMPLE", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_FLEX_SAMPLE},\
-    {"FLAG_MCAST", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_MCAST},\
-    {"FLAG_SRC_SAMPLE", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_SRC_SAMPLE},\
-    {"FLAG_TRUNCATED", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_TRUNCATED},\
-    {"RESERVED", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_RESERVED},\
-    {"SYS_OPCODE", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_SYS_OPCODE},\
-    {"sflow_shim_1_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT}
-
-/*!
- * \name SFLOW_SHIM_2_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_2_T_SEQUENCE_NUM   0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_2_T_USER_META_DATA 1
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT          2
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_2_T_FIELD_NAME_MAP_INIT \
-    {"SEQUENCE_NUM", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_2_T_SEQUENCE_NUM},\
-    {"USER_META_DATA", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_2_T_USER_META_DATA},\
-    {"sflow_shim_2_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT}
-
-/*!
- * \name SNAP_LLC_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SNAP_LLC_T_LENGTH   0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SNAP_LLC_T_SNAP_LLC 1
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SNAP_LLC_T_FID_COUNT          2
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SNAP_LLC_T_FIELD_NAME_MAP_INIT \
-    {"LENGTH", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SNAP_LLC_T_LENGTH},\
-    {"SNAP_LLC", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SNAP_LLC_T_SNAP_LLC},\
-    {"snap_llc_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SNAP_LLC_T_FID_COUNT}
-
-/*!
- * \name TCP_FIRST_4BYTES_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT 0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT 1
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT          2
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT \
-    {"DST_PORT", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT},\
-    {"SRC_PORT", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT},\
-    {"tcp_first_4bytes_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT}
-
-/*!
- * \name TCP_LAST_16BYTES_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM           0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM          1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS 2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM           3
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR        4
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE          5
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT          6
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT \
-    {"ACK_NUM", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM},\
-    {"CHECKSUM", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM},\
-    {"HDR_LEN_AND_FLAGS", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS},\
-    {"SEQ_NUM", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM},\
-    {"URGENT_PTR", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR},\
-    {"WIN_SIZE", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE},\
-    {"tcp_last_16bytes_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT}
-
-/*!
- * \name UDP_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UDP_T_CHECKSUM   0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UDP_T_DST_PORT   1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UDP_T_SRC_PORT   2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UDP_T_UDP_LENGTH 3
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UDP_T_FID_COUNT          4
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT \
-    {"CHECKSUM", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UDP_T_CHECKSUM},\
-    {"DST_PORT", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UDP_T_DST_PORT},\
-    {"SRC_PORT", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UDP_T_SRC_PORT},\
-    {"UDP_LENGTH", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UDP_T_UDP_LENGTH},\
-    {"udp_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UDP_T_FID_COUNT}
-
-/*!
- * \name UNKNOWN_L3_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD 0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD  1
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L3_T_FID_COUNT          2
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT \
-    {"FIRST_16BYTES_OF_L3_PAYLOAD", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD},\
-    {"NEXT_16BYTES_OF_L3_PAYLOAD", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD},\
-    {"unknown_l3_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L3_T_FID_COUNT}
-
-/*!
- * \name UNKNOWN_L4_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD 0
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L4_T_FID_COUNT          1
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT \
-    {"FIRST_4BYTES_OF_L4_PAYLOAD", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD},\
-    {"unknown_l4_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L4_T_FID_COUNT}
-
-/*!
- * \name UNKNOWN_L5_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1 0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3 1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7 2
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L5_T_FID_COUNT          3
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT \
-    {"L5_BYTES_0_1", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1},\
-    {"L5_BYTES_2_3", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3},\
-    {"L5_BYTES_4_7", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7},\
-    {"unknown_l5_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L5_T_FID_COUNT}
-
-/*!
- * \name VLAN_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VLAN_T_CFI  0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VLAN_T_PCP  1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VLAN_T_TPID 2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VLAN_T_VID  3
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VLAN_T_FID_COUNT          4
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT \
-    {"CFI", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VLAN_T_CFI},\
-    {"PCP", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VLAN_T_PCP},\
-    {"TPID", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VLAN_T_TPID},\
-    {"VID", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VLAN_T_VID},\
-    {"vlan_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VLAN_T_FID_COUNT}
-
-/*!
- * \name VNTAG_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VNTAG_T_TAG  0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VNTAG_T_TPID 1
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VNTAG_T_FID_COUNT          2
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VNTAG_T_FIELD_NAME_MAP_INIT \
-    {"TAG", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VNTAG_T_TAG},\
-    {"TPID", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VNTAG_T_TPID},\
-    {"vntag_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VNTAG_T_FID_COUNT}
-
-/*!
- * \name VXLAN_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VXLAN_T_FLAGS_RESERVED_1 0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VXLAN_T_RESERVED2        1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VXLAN_T_VN_ID            2
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VXLAN_T_FID_COUNT          3
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT \
-    {"FLAGS_RESERVED_1", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VXLAN_T_FLAGS_RESERVED_1},\
-    {"RESERVED2", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VXLAN_T_RESERVED2},\
-    {"VN_ID", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VXLAN_T_VN_ID},\
-    {"vxlan_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VXLAN_T_FID_COUNT}
-
-/*!
- * \name WESP_T field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_WESP_T_FLAGS       0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_WESP_T_HEADER_LEN  1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_WESP_T_NEXT_HEADER 2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_WESP_T_SEQ_NUM     3
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_WESP_T_SPI         4
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_WESP_T_TRAILER_LEN 5
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_WESP_T_WESP_IV     6
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_WESP_T_FID_COUNT          7
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_WESP_T_FIELD_NAME_MAP_INIT \
-    {"FLAGS", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_WESP_T_FLAGS},\
-    {"HEADER_LEN", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_WESP_T_HEADER_LEN},\
-    {"NEXT_HEADER", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_WESP_T_NEXT_HEADER},\
-    {"SEQ_NUM", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_WESP_T_SEQ_NUM},\
-    {"SPI", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_WESP_T_SPI},\
-    {"TRAILER_LEN", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_WESP_T_TRAILER_LEN},\
-    {"WESP_IV", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_WESP_T_WESP_IV},\
-    {"wesp_t fid count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_WESP_T_FID_COUNT}
-
-
-#endif /* BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_FLEXHDR_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_bcmpkt_rxpmd_flex_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_bcmpkt_rxpmd_flex_data.h
deleted file mode 100644
index a869f77fbca5..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_bcmpkt_rxpmd_flex_data.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) map.yml.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_DATA_H
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_DATA_H
-
-/*!
- * \name RX flex metadata field IDs.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_DLB_ECMP_DESTINATION_15_0                      0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0                                 1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_DVP_15_0                                       2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_7_0                              3
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_EM_FT_OPAQUE_OBJ_OR_IFP_OPAQUE_OBJ_15_0        4
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_HIGH_3_0                         5
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0                         6
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_0                        7
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32                       8
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0                              9
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_IFP_IOAM_GBP_ACTION_3_0                        10
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_IFP_TS_CONTROL_ACTION_3_0                      11
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_0                             12
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_INGRESS_PP_PORT_7_0                            13
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0 14
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0                    15
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_INT_PRI_3_0                                    16
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_L2_IIF_10_0                                    17
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_L2_OIF_10_0                                    18
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_L3_IIF_13_0                                    19
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0                                  20
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_MPLS_LABEL_DECAP_COUNT_3_0                     21
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0              22
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_15_0                              23
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0                            24
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0                            25
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_SVP_15_0                                       26
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0                   27
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0                        28
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0                              29
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_SYSTEM_SOURCE_15_0                             30
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_TIMESTAMP_CTRL_3_0                             31
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0                32
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_VFI_15_0                                       33
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_VLAN_TAG_PRESERVE_CTRL_SVP_MIRROR_ENABLE_1_0   34
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_FID_COUNT                       35
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_COUNT                    41
-
-/*!
- * \name Packet Flex Reason Types.
- */
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS                               0
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED 1
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED  2
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_DST_FP                                  3
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_EM_FT                                   4
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_IFP                                     5
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_IFP_METER                               6
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED      7
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_IVXLT                                   8
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP                           9
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS                      10
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE                      11
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP                           12
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS                      13
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR                            14
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF                        15
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR                            16
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL                        17
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD                    18
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0                      19
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1                      20
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2                      21
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3                      22
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4                      23
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5                      24
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6                      25
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7                      26
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD            27
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED              28
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED                  29
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU                    30
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU                          31
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED              32
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT                            33
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_RESERVED_TRACE_BIT                      34
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_SER_DROP                                35
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD         36
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_SVP                                     37
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP                               38
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED                       39
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_VFP                                     40
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT \
-    {"CML_FLAGS", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS},\
-    {"DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED},\
-    {"DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED},\
-    {"DST_FP", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_DST_FP},\
-    {"EM_FT", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_EM_FT},\
-    {"IFP", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_IFP},\
-    {"IFP_METER", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_IFP_METER},\
-    {"IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED},\
-    {"IVXLT", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_IVXLT},\
-    {"L2_DST_LOOKUP", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP},\
-    {"L2_DST_LOOKUP_MISS", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS},\
-    {"L2_SRC_STATIC_MOVE", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE},\
-    {"L3_DST_LOOKUP", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP},\
-    {"L3_DST_LOOKUP_MISS", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS},\
-    {"L3_HDR_ERROR", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR},\
-    {"L3_IIF_EQ_L3_OIF", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF},\
-    {"L3_TTL_ERROR", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR},\
-    {"LEARN_CACHE_FULL", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL},\
-    {"MACSA_MULTICAST_RSVD", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD},\
-    {"MATCHED_RULE_BIT_0", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0},\
-    {"MATCHED_RULE_BIT_1", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1},\
-    {"MATCHED_RULE_BIT_2", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2},\
-    {"MATCHED_RULE_BIT_3", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3},\
-    {"MATCHED_RULE_BIT_4", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4},\
-    {"MATCHED_RULE_BIT_5", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5},\
-    {"MATCHED_RULE_BIT_6", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6},\
-    {"MATCHED_RULE_BIT_7", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7},\
-    {"MEMBERSHIP_CHECK_FAILED_RSVD", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD},\
-    {"MIRROR_SAMPLER_EGR_SAMPLED", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED},\
-    {"MIRROR_SAMPLER_SAMPLED", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED},\
-    {"MPLS_CTRL_PKT_TO_CPU", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU},\
-    {"NO_COPY_TO_CPU", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU},\
-    {"PKT_INTEGRITY_CHECK_FAILED", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED},\
-    {"PROTOCOL_PKT", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT},\
-    {"RESERVED_TRACE_BIT", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_RESERVED_TRACE_BIT},\
-    {"SER_DROP", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_SER_DROP},\
-    {"SPANNING_TREE_CHECK_FAILED_RSVD", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD},\
-    {"SVP", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_SVP},\
-    {"TRACE_DOP", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP},\
-    {"URPF_CHECK_FAILED", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED},\
-    {"VFP", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_VFP},\
-    {"flex reason count", BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_COUNT}
-
-#endif /* BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_bcmpkt_rxpmd_match_id_defs.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_bcmpkt_rxpmd_match_id_defs.h
deleted file mode 100644
index af0fc82d32a0..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_bcmpkt_rxpmd_match_id_defs.h
+++ /dev/null
@@ -1,407 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) bcm56880_a0_dna_6_5_30_1_1_sf_match_id_info.yml
- * for device bcm56880_a0 and variant dna_6_5_30_1_1.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_MATCH_ID_DEFS_H
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_MATCH_ID_DEFS_H
-
-#include <bcmpkt/bcmpkt_rxpmd_match_id.h>
-
-/*!
- * \brief Get the Match ID DataBase information.
- *
- * \retval bcmpkt_rxpmd_match_id_db_info_t Match ID DataBase information.
-*/
-extern bcmpkt_rxpmd_match_id_db_info_t *
-    bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db_info_get(void);
-
-/*!
- * \brief Get the Match ID Mapping information.
- *
- * \retval bcmpkt_rxpmd_match_id_map_info_t Match ID Mapping information.
-*/
-extern bcmpkt_rxpmd_match_id_map_info_t *
-    bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_map_info_get(void);
-
-/*!
-  \name RXPMD Match IDs
-*/
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ETAG  0
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_BASE  1
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0  2
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG  3
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2  4
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE  5
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG  6
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC  7
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_VNTAG  8
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP  9
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1  10
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2  11
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD  12
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT  13
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE  14
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1  15
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2  16
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE  17
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE  18
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM  19
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY  20
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT  21
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ  22
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP  23
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA  24
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP  25
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4  26
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6  27
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0  28
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1  29
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2  30
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3  31
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4  32
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5  33
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6  34
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH  35
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW  36
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE  37
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588  38
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP  39
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES  40
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES  41
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP  42
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3  43
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4  44
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5  45
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN  46
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK  47
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE  48
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ETAG  49
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE  50
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0  51
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG  52
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2  53
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE  54
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG  55
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC  56
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_VNTAG  57
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP  58
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1  59
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2  60
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD  61
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT  62
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE  63
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1  64
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2  65
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE  66
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE  67
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM  68
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY  69
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT  70
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ  71
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP  72
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA  73
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP  74
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4  75
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6  76
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0  77
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1  78
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2  79
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3  80
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4  81
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5  82
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6  83
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH  84
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW  85
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE  86
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588  87
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP  88
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES  89
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES  90
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP  91
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3  92
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4  93
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5  94
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN  95
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ETAG  96
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG  97
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2  98
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE  99
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG  100
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC  101
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_VNTAG  102
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP  103
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1  104
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2  105
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD  106
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT  107
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE  108
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1  109
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2  110
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP  111
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA  112
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP  113
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4  114
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6  115
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE  116
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588  117
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP  118
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES  119
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES  120
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP  121
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3  122
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4  123
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5  124
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ETAG  125
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_BASE  126
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0  127
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG  128
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2  129
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE  130
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG  131
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC  132
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_VNTAG  133
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP  134
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1  135
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2  136
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD  137
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT  138
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE  139
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1  140
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2  141
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE  142
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE  143
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM  144
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY  145
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT  146
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ  147
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP  148
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA  149
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP  150
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4  151
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6  152
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0  153
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1  154
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2  155
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3  156
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4  157
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5  158
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6  159
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH  160
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW  161
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE  162
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588  163
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP  164
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES  165
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES  166
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP  167
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3  168
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4  169
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5  170
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN  171
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK  172
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE  173
-#define BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_COUNT  174
-
-#define BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT \
-    {"EGRESS_PKT_FWD_L2_HDR_ETAG", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ETAG}, \
-    {"EGRESS_PKT_FWD_L2_HDR_HG3_BASE", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_BASE}, \
-    {"EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0}, \
-    {"EGRESS_PKT_FWD_L2_HDR_ITAG", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG}, \
-    {"EGRESS_PKT_FWD_L2_HDR_L2", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2}, \
-    {"EGRESS_PKT_FWD_L2_HDR_NONE", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE}, \
-    {"EGRESS_PKT_FWD_L2_HDR_OTAG", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG}, \
-    {"EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC}, \
-    {"EGRESS_PKT_FWD_L2_HDR_VNTAG", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_VNTAG}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ARP", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_BFD", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GPE", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ICMP", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IGMP", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV4", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV6", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS0", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS1", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS2", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS3", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS4", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS5", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS6", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_NONE", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_P_1588", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_RARP", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UDP", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_VXLAN", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN}, \
-    {"EGRESS_PKT_SYS_HDR_LOOPBACK", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK}, \
-    {"EGRESS_PKT_SYS_HDR_NONE", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_ETAG", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ETAG}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_ITAG", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_L2", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_NONE", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_OTAG", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_VNTAG", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_VNTAG}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN}, \
-    {"INGRESS_PKT_INNER_L2_HDR_ETAG", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ETAG}, \
-    {"INGRESS_PKT_INNER_L2_HDR_ITAG", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG}, \
-    {"INGRESS_PKT_INNER_L2_HDR_L2", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2}, \
-    {"INGRESS_PKT_INNER_L2_HDR_NONE", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE}, \
-    {"INGRESS_PKT_INNER_L2_HDR_OTAG", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG}, \
-    {"INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC}, \
-    {"INGRESS_PKT_INNER_L2_HDR_VNTAG", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_VNTAG}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ARP", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_BFD", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ICMP", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_IGMP", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV4", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV6", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_NONE", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_P_1588", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_RARP", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UDP", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_ETAG", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ETAG}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_HG3_BASE", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_BASE}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_ITAG", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_L2", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_NONE", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_OTAG", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_VNTAG", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_VNTAG}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ARP", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_BFD", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GPE", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ICMP", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IGMP", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV4", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV6", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_NONE", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_P_1588", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_RARP", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UDP", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN}, \
-    {"INGRESS_PKT_SYS_HDR_LOOPBACK", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK}, \
-    {"INGRESS_PKT_SYS_HDR_NONE", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE}, \
-    {"rxpmd_match_id_count", BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_COUNT}
-
-#endif /*! BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_MATCH_ID_DEFS_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_bcmpkt_flexhdr.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_bcmpkt_flexhdr.h
new file mode 100644
index 000000000000..b76f75a3c381
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_bcmpkt_flexhdr.h
@@ -0,0 +1,178 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) header.yml.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_FLEXHDR_H
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_FLEXHDR_H
+
+#include <bcmpkt/bcmpkt_flexhdr_internal.h>
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T                      0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T                   1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T                      2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CNTAG_T                    3
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T  4
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T         5
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T         6
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_DEST_OPTION_T              7
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T        8
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T         9
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ESP_T                      10
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ETAG_T                     11
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ETHERTYPE_T                12
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_FRAG_T                     13
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T         14
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GPE_T                      15
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_CHKSUM_T               16
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_KEY_T                  17
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_ROUT_T                 18
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_SEQ_T                  19
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_T                      20
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T                 21
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T          22
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HOP_BY_HOP_T               23
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ICMP_T                     24
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_0_A_T          25
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_0_B_T          26
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_1_T            27
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_2_T            28
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_3_T            29
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_HEADER_T               30
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_MD_BASE_T              31
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_T             32
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IGMP_T                     33
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPFIX_T                    34
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T                     35
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T                     36
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_L2_T                       37
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_ERSPAN_SN_T         38
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_TRANSPORT_T         39
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_ACH_T                 40
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_BV_T                  41
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_CW_T                  42
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_T                     43
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T                   44
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PIM_T                      45
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PROG_EXT_HDR_T             46
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T                  47
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T                  48
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T   49
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T   50
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T                     51
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ROUTING_T                  52
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RSPAN_T                    53
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_0_T             54
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T             55
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_2_T             56
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SNAP_LLC_T                 57
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_TCP_FIRST_4BYTES_T         58
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T         59
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UDP_T                      60
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L3_T               61
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L4_T               62
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L5_T               63
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VLAN_T                     64
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VNTAG_T                    65
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VXLAN_T                    66
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T                     67
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_T               68
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_FLEXHDR_COUNT    69
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_FLEXHDR_NAME_MAP_INIT \
+    {"arp_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T},\
+    {"authen_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T},\
+    {"bfd_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T},\
+    {"cntag_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CNTAG_T},\
+    {"cpu_composites_0_ifa_l2_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T},\
+    {"cpu_composites_0_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T},\
+    {"cpu_composites_1_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T},\
+    {"dest_option_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_DEST_OPTION_T},\
+    {"erspan3_fixed_hdr_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T},\
+    {"erspan3_subhdr_5_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T},\
+    {"esp_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ESP_T},\
+    {"etag_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ETAG_T},\
+    {"ethertype_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ETHERTYPE_T},\
+    {"frag_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_FRAG_T},\
+    {"generic_loopback_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T},\
+    {"gpe_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GPE_T},\
+    {"gre_chksum_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_CHKSUM_T},\
+    {"gre_key_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_KEY_T},\
+    {"gre_rout_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_ROUT_T},\
+    {"gre_seq_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_SEQ_T},\
+    {"gre_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_T},\
+    {"hg3_base_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T},\
+    {"hg3_extension_0_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T},\
+    {"hop_by_hop_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HOP_BY_HOP_T},\
+    {"icmp_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ICMP_T},\
+    {"ifa_flex_md_0_a_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_0_A_T},\
+    {"ifa_flex_md_0_b_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_0_B_T},\
+    {"ifa_flex_md_1_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_1_T},\
+    {"ifa_flex_md_2_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_2_T},\
+    {"ifa_flex_md_3_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_3_T},\
+    {"ifa_header_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_HEADER_T},\
+    {"ifa_md_base_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_MD_BASE_T},\
+    {"ifa_metadata_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_T},\
+    {"igmp_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IGMP_T},\
+    {"ipfix_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPFIX_T},\
+    {"ipv4_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T},\
+    {"ipv6_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T},\
+    {"l2_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_L2_T},\
+    {"mirror_erspan_sn_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_ERSPAN_SN_T},\
+    {"mirror_transport_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_TRANSPORT_T},\
+    {"mpls_ach_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_ACH_T},\
+    {"mpls_bv_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_BV_T},\
+    {"mpls_cw_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_CW_T},\
+    {"mpls_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_T},\
+    {"p_1588_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T},\
+    {"pim_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PIM_T},\
+    {"prog_ext_hdr_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PROG_EXT_HDR_T},\
+    {"psamp_0_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T},\
+    {"psamp_1_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T},\
+    {"psamp_mirror_on_drop_0_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T},\
+    {"psamp_mirror_on_drop_3_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T},\
+    {"rarp_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T},\
+    {"routing_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ROUTING_T},\
+    {"rspan_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RSPAN_T},\
+    {"sflow_shim_0_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_0_T},\
+    {"sflow_shim_1_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T},\
+    {"sflow_shim_2_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_2_T},\
+    {"snap_llc_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SNAP_LLC_T},\
+    {"tcp_first_4bytes_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_TCP_FIRST_4BYTES_T},\
+    {"tcp_last_16bytes_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T},\
+    {"udp_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UDP_T},\
+    {"unknown_l3_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L3_T},\
+    {"unknown_l4_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L4_T},\
+    {"unknown_l5_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L5_T},\
+    {"vlan_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VLAN_T},\
+    {"vntag_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VNTAG_T},\
+    {"vxlan_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VXLAN_T},\
+    {"wesp_t", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T},\
+    {"RXPMD_FLEX_T", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_T},\
+    {"flexhdr count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_FLEXHDR_COUNT}
+
+#endif /* BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_FLEXHDR_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_bcmpkt_flexhdr_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_bcmpkt_flexhdr_data.h
new file mode 100644
index 000000000000..91a29b26cb38
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_bcmpkt_flexhdr_data.h
@@ -0,0 +1,1324 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) header.yml.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_FLEXHDR_DATA_H
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_FLEXHDR_DATA_H
+
+/*!
+ * \name ARP_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_HARDWARE_LEN  0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_HARDWARE_TYPE 1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_OPERATION     2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_PROT_ADDR_LEN 3
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_PROTOCOL_TYPE 4
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_SENDER_HA     5
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_SENDER_IP     6
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_TARGET_HA     7
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_TARGET_IP     8
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_FID_COUNT          9
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT \
+    {"HARDWARE_LEN", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_HARDWARE_LEN},\
+    {"HARDWARE_TYPE", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_HARDWARE_TYPE},\
+    {"OPERATION", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_OPERATION},\
+    {"PROT_ADDR_LEN", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_PROT_ADDR_LEN},\
+    {"PROTOCOL_TYPE", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_PROTOCOL_TYPE},\
+    {"SENDER_HA", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_SENDER_HA},\
+    {"SENDER_IP", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_SENDER_IP},\
+    {"TARGET_HA", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_TARGET_HA},\
+    {"TARGET_IP", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_TARGET_IP},\
+    {"arp_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_FID_COUNT}
+
+/*!
+ * \name AUTHEN_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T_DATA        0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T_NEXT_HEADER 1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T_PAYLOAD_LEN 2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T_RESERVED    3
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T_SEQ_NUM     4
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T_SPI         5
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T_FID_COUNT          6
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T_FIELD_NAME_MAP_INIT \
+    {"DATA", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T_DATA},\
+    {"NEXT_HEADER", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T_NEXT_HEADER},\
+    {"PAYLOAD_LEN", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T_PAYLOAD_LEN},\
+    {"RESERVED", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T_RESERVED},\
+    {"SEQ_NUM", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T_SEQ_NUM},\
+    {"SPI", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T_SPI},\
+    {"authen_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T_FID_COUNT}
+
+/*!
+ * \name BFD_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_AP            0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_BFD_LENGTH    1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_CPI           2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_DEM           3
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_DESMINTXINTV  4
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_DETECTMULT    5
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_DIAG          6
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_FIN           7
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_MINECHORXINTV 8
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_MPT           9
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_MYDISCRIM     10
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_POLL          11
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_REQMINRXINTV  12
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_STA           13
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_URDISCRIM     14
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_VERSION       15
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_FID_COUNT          16
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_FIELD_NAME_MAP_INIT \
+    {"AP", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_AP},\
+    {"BFD_LENGTH", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_BFD_LENGTH},\
+    {"CPI", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_CPI},\
+    {"DEM", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_DEM},\
+    {"DESMINTXINTV", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_DESMINTXINTV},\
+    {"DETECTMULT", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_DETECTMULT},\
+    {"DIAG", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_DIAG},\
+    {"FIN", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_FIN},\
+    {"MINECHORXINTV", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_MINECHORXINTV},\
+    {"MPT", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_MPT},\
+    {"MYDISCRIM", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_MYDISCRIM},\
+    {"POLL", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_POLL},\
+    {"REQMINRXINTV", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_REQMINRXINTV},\
+    {"STA", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_STA},\
+    {"URDISCRIM", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_URDISCRIM},\
+    {"VERSION", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_VERSION},\
+    {"bfd_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_FID_COUNT}
+
+/*!
+ * \name CNTAG_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CNTAG_T_RPID 0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CNTAG_T_TPID 1
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CNTAG_T_FID_COUNT          2
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CNTAG_T_FIELD_NAME_MAP_INIT \
+    {"RPID", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CNTAG_T_RPID},\
+    {"TPID", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CNTAG_T_TPID},\
+    {"cntag_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CNTAG_T_FID_COUNT}
+
+/*!
+ * \name CPU_COMPOSITES_0_IFA_L2_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_DMA_CONT0 0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_DMA_CONT1 1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_DMA_CONT2 2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_DMA_CONT3 3
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_DMA_CONT4 4
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_DMA_CONT5 5
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_DMA_CONT6 6
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_MACDA     7
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_MACSA     8
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_FID_COUNT          9
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_FIELD_NAME_MAP_INIT \
+    {"DMA_CONT0", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_DMA_CONT0},\
+    {"DMA_CONT1", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_DMA_CONT1},\
+    {"DMA_CONT2", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_DMA_CONT2},\
+    {"DMA_CONT3", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_DMA_CONT3},\
+    {"DMA_CONT4", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_DMA_CONT4},\
+    {"DMA_CONT5", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_DMA_CONT5},\
+    {"DMA_CONT6", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_DMA_CONT6},\
+    {"MACDA", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_MACDA},\
+    {"MACSA", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_MACSA},\
+    {"cpu_composites_0_ifa_l2_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_FID_COUNT}
+
+/*!
+ * \name CPU_COMPOSITES_0_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0 0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1 1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2 2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3 3
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4 4
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5 5
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6 6
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT          7
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT \
+    {"DMA_CONT0", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0},\
+    {"DMA_CONT1", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1},\
+    {"DMA_CONT2", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2},\
+    {"DMA_CONT3", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3},\
+    {"DMA_CONT4", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4},\
+    {"DMA_CONT5", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5},\
+    {"DMA_CONT6", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6},\
+    {"cpu_composites_0_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT}
+
+/*!
+ * \name CPU_COMPOSITES_1_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10 0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11 1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12 2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13 3
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14 4
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15 5
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16 6
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17 7
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7  8
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8  9
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9  10
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT          11
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT \
+    {"DMA_CONT10", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10},\
+    {"DMA_CONT11", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11},\
+    {"DMA_CONT12", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12},\
+    {"DMA_CONT13", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13},\
+    {"DMA_CONT14", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14},\
+    {"DMA_CONT15", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15},\
+    {"DMA_CONT16", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16},\
+    {"DMA_CONT17", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17},\
+    {"DMA_CONT7", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7},\
+    {"DMA_CONT8", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8},\
+    {"DMA_CONT9", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9},\
+    {"cpu_composites_1_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT}
+
+/*!
+ * \name DEST_OPTION_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_DEST_OPTION_T_HDR_EXT_LEN 0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_DEST_OPTION_T_NEXT_HEADER 1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_DEST_OPTION_T_OPTION      2
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_DEST_OPTION_T_FID_COUNT          3
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_DEST_OPTION_T_FIELD_NAME_MAP_INIT \
+    {"HDR_EXT_LEN", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_DEST_OPTION_T_HDR_EXT_LEN},\
+    {"NEXT_HEADER", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_DEST_OPTION_T_NEXT_HEADER},\
+    {"OPTION", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_DEST_OPTION_T_OPTION},\
+    {"dest_option_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_DEST_OPTION_T_FID_COUNT}
+
+/*!
+ * \name ERSPAN3_FIXED_HDR_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO               0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_COS               1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID           2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O 3
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID        4
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_T                 5
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP         6
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VER               7
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN              8
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT          9
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT \
+    {"BSO", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO},\
+    {"COS", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_COS},\
+    {"GBP_SID", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID},\
+    {"P_FT_HWID_D_GRA_O", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O},\
+    {"SESSION_ID", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID},\
+    {"T", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_T},\
+    {"TIMESTAMP", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP},\
+    {"VER", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VER},\
+    {"VLAN", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN},\
+    {"erspan3_fixed_hdr_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT}
+
+/*!
+ * \name ERSPAN3_SUBHDR_5_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID 0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID     1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID   2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP   3
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT          4
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT \
+    {"PLATFORM_ID", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID},\
+    {"PORT_ID", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID},\
+    {"SWITCH_ID", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID},\
+    {"TIMESTAMP", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP},\
+    {"erspan3_subhdr_5_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT}
+
+/*!
+ * \name ESP_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ESP_T_NEXT_HEADER 0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ESP_T_PAD         1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ESP_T_PAD_LEN     2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ESP_T_SEQ_NUM     3
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ESP_T_SPI         4
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ESP_T_FID_COUNT          5
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ESP_T_FIELD_NAME_MAP_INIT \
+    {"NEXT_HEADER", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ESP_T_NEXT_HEADER},\
+    {"PAD", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ESP_T_PAD},\
+    {"PAD_LEN", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ESP_T_PAD_LEN},\
+    {"SEQ_NUM", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ESP_T_SEQ_NUM},\
+    {"SPI", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ESP_T_SPI},\
+    {"esp_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ESP_T_FID_COUNT}
+
+/*!
+ * \name ETAG_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ETAG_T_TAG  0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ETAG_T_TPID 1
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ETAG_T_FID_COUNT          2
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ETAG_T_FIELD_NAME_MAP_INIT \
+    {"TAG", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ETAG_T_TAG},\
+    {"TPID", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ETAG_T_TPID},\
+    {"etag_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ETAG_T_FID_COUNT}
+
+/*!
+ * \name ETHERTYPE_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ETHERTYPE_T_TYPE 0
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ETHERTYPE_T_FID_COUNT          1
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT \
+    {"TYPE", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ETHERTYPE_T_TYPE},\
+    {"ethertype_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ETHERTYPE_T_FID_COUNT}
+
+/*!
+ * \name FRAG_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_FRAG_T_FRAG_INFO   0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_FRAG_T_ID          1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_FRAG_T_NEXT_HEADER 2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_FRAG_T_RESERVED    3
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_FRAG_T_FID_COUNT          4
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_FRAG_T_FIELD_NAME_MAP_INIT \
+    {"FRAG_INFO", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_FRAG_T_FRAG_INFO},\
+    {"ID", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_FRAG_T_ID},\
+    {"NEXT_HEADER", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_FRAG_T_NEXT_HEADER},\
+    {"RESERVED", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_FRAG_T_RESERVED},\
+    {"frag_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_FRAG_T_FID_COUNT}
+
+/*!
+ * \name GENERIC_LOOPBACK_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ    0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE   1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ        2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_FLAGS              3
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE        4
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY     5
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL     6
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ      7
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0  8
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1  9
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ            10
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1         11
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT 12
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE         13
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_SVP                14
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT          15
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT \
+    {"DESTINATION_OBJ", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ},\
+    {"DESTINATION_TYPE", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE},\
+    {"ENTROPY_OBJ", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ},\
+    {"FLAGS", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_FLAGS},\
+    {"HEADER_TYPE", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE},\
+    {"INPUT_PRIORITY", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY},\
+    {"INTERFACE_CTRL", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL},\
+    {"INTERFACE_OBJ", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ},\
+    {"PROCESSING_CTRL_0", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0},\
+    {"PROCESSING_CTRL_1", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1},\
+    {"QOS_OBJ", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ},\
+    {"RESERVED_1", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1},\
+    {"SOURCE_SYSTEM_PORT", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT},\
+    {"START_BYTE", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE},\
+    {"SVP", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_SVP},\
+    {"generic_loopback_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT}
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NO_OP       0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2_OIF      1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED    2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__VP          3
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP        4
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NHOP        5
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2MC_GROUP  6
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L3MC_GROUP  7
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED_1  8
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP_MEMBER 9
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__DEVICE_PORT 10
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_TYPE__TUNNEL  0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_TYPE__GENERIC 1
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__NOOP   0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__VFI    1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__L3_IIF 2
+
+/*!
+ * \name GPE_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GPE_T_FLAGS         0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GPE_T_NEXT_PROTOCOL 1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GPE_T_RESERVED0     2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GPE_T_RESERVED1     3
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GPE_T_VNI           4
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GPE_T_FID_COUNT          5
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GPE_T_FIELD_NAME_MAP_INIT \
+    {"FLAGS", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GPE_T_FLAGS},\
+    {"NEXT_PROTOCOL", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GPE_T_NEXT_PROTOCOL},\
+    {"RESERVED0", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GPE_T_RESERVED0},\
+    {"RESERVED1", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GPE_T_RESERVED1},\
+    {"VNI", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GPE_T_VNI},\
+    {"gpe_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GPE_T_FID_COUNT}
+
+/*!
+ * \name GRE_CHKSUM_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_CHKSUM_T_CHECKSUM 0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_CHKSUM_T_OFFSET   1
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT          2
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_CHKSUM_T_FIELD_NAME_MAP_INIT \
+    {"CHECKSUM", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_CHKSUM_T_CHECKSUM},\
+    {"OFFSET", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_CHKSUM_T_OFFSET},\
+    {"gre_chksum_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT}
+
+/*!
+ * \name GRE_KEY_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_KEY_T_KEY 0
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_KEY_T_FID_COUNT          1
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_KEY_T_FIELD_NAME_MAP_INIT \
+    {"KEY", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_KEY_T_KEY},\
+    {"gre_key_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_KEY_T_FID_COUNT}
+
+/*!
+ * \name GRE_ROUT_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_ROUT_T_ROUTING 0
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_ROUT_T_FID_COUNT          1
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_ROUT_T_FIELD_NAME_MAP_INIT \
+    {"ROUTING", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_ROUT_T_ROUTING},\
+    {"gre_rout_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_ROUT_T_FID_COUNT}
+
+/*!
+ * \name GRE_SEQ_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_SEQ_T_SEQUENCE 0
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_SEQ_T_FID_COUNT          1
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_SEQ_T_FIELD_NAME_MAP_INIT \
+    {"SEQUENCE", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_SEQ_T_SEQUENCE},\
+    {"gre_seq_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_SEQ_T_FID_COUNT}
+
+/*!
+ * \name GRE_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_T_C_R_K_S  0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_T_PROTOCOL 1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_T_RESERVED 2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_T_VERSION  3
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_T_FID_COUNT          4
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_T_FIELD_NAME_MAP_INIT \
+    {"C_R_K_S", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_T_C_R_K_S},\
+    {"PROTOCOL", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_T_PROTOCOL},\
+    {"RESERVED", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_T_RESERVED},\
+    {"VERSION", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_T_VERSION},\
+    {"gre_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_T_FID_COUNT}
+
+/*!
+ * \name HG3_BASE_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_CN                      0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_CNG                     1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_ENTROPY                 2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_EXT_HDR_PRESENT         3
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_HG3_RESERVED            4
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_L3_ROUTED               5
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_MIRROR_COPY             6
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_RESERVED_ETYPE          7
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION      8
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION_TYPE 9
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_SYSTEM_SOURCE           10
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_TC                      11
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_VERSION                 12
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_FID_COUNT          13
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_FIELD_NAME_MAP_INIT \
+    {"CN", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_CN},\
+    {"CNG", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_CNG},\
+    {"ENTROPY", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_ENTROPY},\
+    {"EXT_HDR_PRESENT", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_EXT_HDR_PRESENT},\
+    {"HG3_RESERVED", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_HG3_RESERVED},\
+    {"L3_ROUTED", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_L3_ROUTED},\
+    {"MIRROR_COPY", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_MIRROR_COPY},\
+    {"RESERVED_ETYPE", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_RESERVED_ETYPE},\
+    {"SYSTEM_DESTINATION", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION},\
+    {"SYSTEM_DESTINATION_TYPE", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION_TYPE},\
+    {"SYSTEM_SOURCE", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_SYSTEM_SOURCE},\
+    {"TC", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_TC},\
+    {"VERSION", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_VERSION},\
+    {"hg3_base_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_FID_COUNT}
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__NO_OP       0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__L2_OIF      1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__RESERVED    2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__VP          3
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__ECMP        4
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__NHOP        5
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__L2MC_GROUP  6
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__L3MC_GROUP  7
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__RESERVED_1  8
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__ECMP_MEMBER 9
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__DEVICE_PORT 10
+
+/*!
+ * \name HG3_EXTENSION_0_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_LSB      0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_MSB      1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T_DVP_OR_L3_IIF     2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T_FLAGS             3
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T_FORWARDING_DOMAIN 4
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T_SVP               5
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT          6
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T_FIELD_NAME_MAP_INIT \
+    {"CLASS_ID_LSB", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_LSB},\
+    {"CLASS_ID_MSB", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_MSB},\
+    {"DVP_OR_L3_IIF", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T_DVP_OR_L3_IIF},\
+    {"FLAGS", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T_FLAGS},\
+    {"FORWARDING_DOMAIN", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T_FORWARDING_DOMAIN},\
+    {"SVP", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T_SVP},\
+    {"hg3_extension_0_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT}
+
+/*!
+ * \name HOP_BY_HOP_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HOP_BY_HOP_T_HDR_EXT_LEN 0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HOP_BY_HOP_T_NEXT_HEADER 1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HOP_BY_HOP_T_OPTION      2
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT          3
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HOP_BY_HOP_T_FIELD_NAME_MAP_INIT \
+    {"HDR_EXT_LEN", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HOP_BY_HOP_T_HDR_EXT_LEN},\
+    {"NEXT_HEADER", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HOP_BY_HOP_T_NEXT_HEADER},\
+    {"OPTION", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HOP_BY_HOP_T_OPTION},\
+    {"hop_by_hop_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT}
+
+/*!
+ * \name ICMP_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ICMP_T_CHECKSUM  0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ICMP_T_CODE      1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ICMP_T_ICMP_TYPE 2
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ICMP_T_FID_COUNT          3
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT \
+    {"CHECKSUM", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ICMP_T_CHECKSUM},\
+    {"CODE", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ICMP_T_CODE},\
+    {"ICMP_TYPE", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ICMP_T_ICMP_TYPE},\
+    {"icmp_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ICMP_T_FID_COUNT}
+
+/*!
+ * \name IFA_FLEX_MD_0_A_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_0_A_T_FWD_HDR_TTL   0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_0_A_T_LNS_DEVICE_ID 1
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT          2
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_0_A_T_FIELD_NAME_MAP_INIT \
+    {"FWD_HDR_TTL", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_0_A_T_FWD_HDR_TTL},\
+    {"LNS_DEVICE_ID", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_0_A_T_LNS_DEVICE_ID},\
+    {"ifa_flex_md_0_a_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT}
+
+/*!
+ * \name IFA_FLEX_MD_0_B_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_0_B_T_CN               0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_0_B_T_PORT_SPEED       1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_0_B_T_QUEUE_ID         2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_0_B_T_RX_TIMESTAMP_SEC 3
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT          4
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_0_B_T_FIELD_NAME_MAP_INIT \
+    {"CN", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_0_B_T_CN},\
+    {"PORT_SPEED", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_0_B_T_PORT_SPEED},\
+    {"QUEUE_ID", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_0_B_T_QUEUE_ID},\
+    {"RX_TIMESTAMP_SEC", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_0_B_T_RX_TIMESTAMP_SEC},\
+    {"ifa_flex_md_0_b_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT}
+
+/*!
+ * \name IFA_FLEX_MD_1_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_1_T_EGRESS_PORT_ID       0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_1_T_INGRESS_PORT_ID      1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_1_T_RX_TIMESTAMP_NANOSEC 2
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT          3
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_1_T_FIELD_NAME_MAP_INIT \
+    {"EGRESS_PORT_ID", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_1_T_EGRESS_PORT_ID},\
+    {"INGRESS_PORT_ID", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_1_T_INGRESS_PORT_ID},\
+    {"RX_TIMESTAMP_NANOSEC", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_1_T_RX_TIMESTAMP_NANOSEC},\
+    {"ifa_flex_md_1_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT}
+
+/*!
+ * \name IFA_FLEX_MD_2_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_2_T_RESIDENCE_TIME_NANOSEC 0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_2_T_TX_QUEUE_BYTE_COUNT    1
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT          2
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_2_T_FIELD_NAME_MAP_INIT \
+    {"RESIDENCE_TIME_NANOSEC", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_2_T_RESIDENCE_TIME_NANOSEC},\
+    {"TX_QUEUE_BYTE_COUNT", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_2_T_TX_QUEUE_BYTE_COUNT},\
+    {"ifa_flex_md_2_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT}
+
+/*!
+ * \name IFA_FLEX_MD_3_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_3_T_MMU_STAT_0 0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_3_T_MMU_STAT_1 1
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT          2
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_3_T_FIELD_NAME_MAP_INIT \
+    {"MMU_STAT_0", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_3_T_MMU_STAT_0},\
+    {"MMU_STAT_1", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_3_T_MMU_STAT_1},\
+    {"ifa_flex_md_3_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT}
+
+/*!
+ * \name IFA_HEADER_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_HEADER_T_FLAGS      0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_HEADER_T_GNS        1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_HEADER_T_MAX_LENGTH 2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_HEADER_T_NEXT_HDR   3
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_HEADER_T_VER        4
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_HEADER_T_FID_COUNT          5
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_HEADER_T_FIELD_NAME_MAP_INIT \
+    {"FLAGS", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_HEADER_T_FLAGS},\
+    {"GNS", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_HEADER_T_GNS},\
+    {"MAX_LENGTH", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_HEADER_T_MAX_LENGTH},\
+    {"NEXT_HDR", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_HEADER_T_NEXT_HDR},\
+    {"VER", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_HEADER_T_VER},\
+    {"ifa_header_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_HEADER_T_FID_COUNT}
+
+/*!
+ * \name IFA_MD_BASE_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_MD_BASE_T_ACTION_VECTOR            0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_MD_BASE_T_HOP_LIMIT_CURRENT_LENGTH 1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_MD_BASE_T_REQUEST_VECTOR           2
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_MD_BASE_T_FID_COUNT          3
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_MD_BASE_T_FIELD_NAME_MAP_INIT \
+    {"ACTION_VECTOR", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_MD_BASE_T_ACTION_VECTOR},\
+    {"HOP_LIMIT_CURRENT_LENGTH", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_MD_BASE_T_HOP_LIMIT_CURRENT_LENGTH},\
+    {"REQUEST_VECTOR", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_MD_BASE_T_REQUEST_VECTOR},\
+    {"ifa_md_base_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_MD_BASE_T_FID_COUNT}
+
+/*!
+ * \name IFA_METADATA_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_T_ACTION_VECTOR            0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_T_HOP_LIMIT_CURRENT_LENGTH 1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_T_METADATA                 2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_T_REQUEST_VECTOR           3
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_T_FID_COUNT          4
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_T_FIELD_NAME_MAP_INIT \
+    {"ACTION_VECTOR", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_T_ACTION_VECTOR},\
+    {"HOP_LIMIT_CURRENT_LENGTH", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_T_HOP_LIMIT_CURRENT_LENGTH},\
+    {"METADATA", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_T_METADATA},\
+    {"REQUEST_VECTOR", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_T_REQUEST_VECTOR},\
+    {"ifa_metadata_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_T_FID_COUNT}
+
+/*!
+ * \name IGMP_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IGMP_T_CHECKSUM      0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IGMP_T_GROUP_ADDRESS 1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IGMP_T_IGMP_TYPE     2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IGMP_T_MAX_RESP_TIME 3
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IGMP_T_FID_COUNT          4
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IGMP_T_FIELD_NAME_MAP_INIT \
+    {"CHECKSUM", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IGMP_T_CHECKSUM},\
+    {"GROUP_ADDRESS", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IGMP_T_GROUP_ADDRESS},\
+    {"IGMP_TYPE", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IGMP_T_IGMP_TYPE},\
+    {"MAX_RESP_TIME", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IGMP_T_MAX_RESP_TIME},\
+    {"igmp_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IGMP_T_FID_COUNT}
+
+/*!
+ * \name IPFIX_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPFIX_T_EXPORT_TIME   0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPFIX_T_LENGTH        1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPFIX_T_OBS_DOMAIN_ID 2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPFIX_T_SEQUENCE_NUM  3
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPFIX_T_VERSION       4
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPFIX_T_FID_COUNT          5
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT \
+    {"EXPORT_TIME", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPFIX_T_EXPORT_TIME},\
+    {"LENGTH", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPFIX_T_LENGTH},\
+    {"OBS_DOMAIN_ID", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPFIX_T_OBS_DOMAIN_ID},\
+    {"SEQUENCE_NUM", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPFIX_T_SEQUENCE_NUM},\
+    {"VERSION", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPFIX_T_VERSION},\
+    {"ipfix_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPFIX_T_FID_COUNT}
+
+/*!
+ * \name IPV4_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_DA                0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET 1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_HDR_CHECKSUM      2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_ID                3
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_OPTION            4
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_PROTOCOL          5
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_SA                6
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_TOS               7
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_TOTAL_LENGTH      8
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_TTL               9
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_VERSION_HDR_LEN   10
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_FID_COUNT          11
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT \
+    {"DA", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_DA},\
+    {"FLAGS_FRAG_OFFSET", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET},\
+    {"HDR_CHECKSUM", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_HDR_CHECKSUM},\
+    {"ID", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_ID},\
+    {"OPTION", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_OPTION},\
+    {"PROTOCOL", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_PROTOCOL},\
+    {"SA", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_SA},\
+    {"TOS", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_TOS},\
+    {"TOTAL_LENGTH", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_TOTAL_LENGTH},\
+    {"TTL", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_TTL},\
+    {"VERSION_HDR_LEN", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_VERSION_HDR_LEN},\
+    {"ipv4_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_FID_COUNT}
+
+/*!
+ * \name IPV6_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_DA             0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_FLOW_LABEL     1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_HOP_LIMIT      2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_NEXT_HEADER    3
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_PAYLOAD_LENGTH 4
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_SA             5
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_TRAFFIC_CLASS  6
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_VERSION        7
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_FID_COUNT          8
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT \
+    {"DA", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_DA},\
+    {"FLOW_LABEL", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_FLOW_LABEL},\
+    {"HOP_LIMIT", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_HOP_LIMIT},\
+    {"NEXT_HEADER", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_NEXT_HEADER},\
+    {"PAYLOAD_LENGTH", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_PAYLOAD_LENGTH},\
+    {"SA", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_SA},\
+    {"TRAFFIC_CLASS", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_TRAFFIC_CLASS},\
+    {"VERSION", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_VERSION},\
+    {"ipv6_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_FID_COUNT}
+
+/*!
+ * \name L2_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_L2_T_MACDA 0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_L2_T_MACSA 1
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_L2_T_FID_COUNT          2
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_L2_T_FIELD_NAME_MAP_INIT \
+    {"MACDA", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_L2_T_MACDA},\
+    {"MACSA", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_L2_T_MACSA},\
+    {"l2_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_L2_T_FID_COUNT}
+
+/*!
+ * \name MIRROR_ERSPAN_SN_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM 0
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT          1
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT \
+    {"SEQ_NUM", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM},\
+    {"mirror_erspan_sn_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT}
+
+/*!
+ * \name MIRROR_TRANSPORT_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_TRANSPORT_T_DATA 0
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT          1
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT \
+    {"DATA", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_TRANSPORT_T_DATA},\
+    {"mirror_transport_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT}
+
+/*!
+ * \name MPLS_ACH_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_ACH_T_CHANNEL_TYPE 0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_ACH_T_CW_TYPE      1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_ACH_T_RESERVED     2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_ACH_T_VERSION      3
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_ACH_T_FID_COUNT          4
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_ACH_T_FIELD_NAME_MAP_INIT \
+    {"CHANNEL_TYPE", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_ACH_T_CHANNEL_TYPE},\
+    {"CW_TYPE", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_ACH_T_CW_TYPE},\
+    {"RESERVED", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_ACH_T_RESERVED},\
+    {"VERSION", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_ACH_T_VERSION},\
+    {"mpls_ach_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_ACH_T_FID_COUNT}
+
+/*!
+ * \name MPLS_BV_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_BV_T_VALUE 0
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_BV_T_FID_COUNT          1
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_BV_T_FIELD_NAME_MAP_INIT \
+    {"VALUE", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_BV_T_VALUE},\
+    {"mpls_bv_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_BV_T_FID_COUNT}
+
+/*!
+ * \name MPLS_CW_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_CW_T_CW_TYPE    0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_CW_T_RESERVED   1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_CW_T_SEQ_NUMBER 2
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_CW_T_FID_COUNT          3
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_CW_T_FIELD_NAME_MAP_INIT \
+    {"CW_TYPE", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_CW_T_CW_TYPE},\
+    {"RESERVED", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_CW_T_RESERVED},\
+    {"SEQ_NUMBER", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_CW_T_SEQ_NUMBER},\
+    {"mpls_cw_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_CW_T_FID_COUNT}
+
+/*!
+ * \name MPLS_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_T_BOS   0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_T_EXP   1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_T_LABEL 2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_T_TTL   3
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_T_FID_COUNT          4
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_T_FIELD_NAME_MAP_INIT \
+    {"BOS", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_T_BOS},\
+    {"EXP", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_T_EXP},\
+    {"LABEL", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_T_LABEL},\
+    {"TTL", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_T_TTL},\
+    {"mpls_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_T_FID_COUNT}
+
+/*!
+ * \name P_1588_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_CNTRL          0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_CORRECTION     1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_DOMAIN_NB      2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_FLAGS          3
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_LOGMSGINTERVAL 4
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_MSG_LENGTH     5
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_MSG_TYPE       6
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_RESERVED1      7
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_RESERVED2      8
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_RESERVED3      9
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_SEQ_ID         10
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_SRCPORTID      11
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_TRANSPORTSPEC  12
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_VERSION        13
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_FID_COUNT          14
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_FIELD_NAME_MAP_INIT \
+    {"CNTRL", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_CNTRL},\
+    {"CORRECTION", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_CORRECTION},\
+    {"DOMAIN_NB", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_DOMAIN_NB},\
+    {"FLAGS", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_FLAGS},\
+    {"LOGMSGINTERVAL", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_LOGMSGINTERVAL},\
+    {"MSG_LENGTH", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_MSG_LENGTH},\
+    {"MSG_TYPE", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_MSG_TYPE},\
+    {"RESERVED1", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_RESERVED1},\
+    {"RESERVED2", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_RESERVED2},\
+    {"RESERVED3", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_RESERVED3},\
+    {"SEQ_ID", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_SEQ_ID},\
+    {"SRCPORTID", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_SRCPORTID},\
+    {"TRANSPORTSPEC", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_TRANSPORTSPEC},\
+    {"VERSION", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_VERSION},\
+    {"p_1588_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_FID_COUNT}
+
+/*!
+ * \name PIM_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PIM_T_HDR_BYTES_0_1 0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PIM_T_HDR_BYTES_2_3 1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PIM_T_HDR_BYTES_4_5 2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PIM_T_HDR_BYTES_6_7 3
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PIM_T_FID_COUNT          4
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PIM_T_FIELD_NAME_MAP_INIT \
+    {"HDR_BYTES_0_1", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PIM_T_HDR_BYTES_0_1},\
+    {"HDR_BYTES_2_3", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PIM_T_HDR_BYTES_2_3},\
+    {"HDR_BYTES_4_5", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PIM_T_HDR_BYTES_4_5},\
+    {"HDR_BYTES_6_7", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PIM_T_HDR_BYTES_6_7},\
+    {"pim_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PIM_T_FID_COUNT}
+
+/*!
+ * \name PROG_EXT_HDR_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PROG_EXT_HDR_T_HDR_EXT_LEN 0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PROG_EXT_HDR_T_NEXT_HEADER 1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PROG_EXT_HDR_T_OPTION      2
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT          3
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PROG_EXT_HDR_T_FIELD_NAME_MAP_INIT \
+    {"HDR_EXT_LEN", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PROG_EXT_HDR_T_HDR_EXT_LEN},\
+    {"NEXT_HEADER", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PROG_EXT_HDR_T_NEXT_HEADER},\
+    {"OPTION", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PROG_EXT_HDR_T_OPTION},\
+    {"prog_ext_hdr_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_0_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T_FLOWSET        0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T_LENGTH         1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T_NEXT_HOP_INDEX 2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T_OBS_TIME_NS    3
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T_OBS_TIME_S     4
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T_TEMPLATE_ID    5
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T_FID_COUNT          6
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T_FIELD_NAME_MAP_INIT \
+    {"FLOWSET", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T_FLOWSET},\
+    {"LENGTH", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T_LENGTH},\
+    {"NEXT_HOP_INDEX", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T_NEXT_HOP_INDEX},\
+    {"OBS_TIME_NS", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T_OBS_TIME_NS},\
+    {"OBS_TIME_S", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T_OBS_TIME_S},\
+    {"TEMPLATE_ID", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T_TEMPLATE_ID},\
+    {"psamp_0_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_1_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_DLB_ID         0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_EGRESS_PORT    1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_EPOCH          2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_INGRESS_PORT   3
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_SAMPLED_LENGTH 4
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_USER_META_DATA 5
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_VARIABLE_FLAG  6
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_FID_COUNT          7
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_FIELD_NAME_MAP_INIT \
+    {"DLB_ID", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_DLB_ID},\
+    {"EGRESS_PORT", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_EGRESS_PORT},\
+    {"EPOCH", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_EPOCH},\
+    {"INGRESS_PORT", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_INGRESS_PORT},\
+    {"SAMPLED_LENGTH", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_SAMPLED_LENGTH},\
+    {"USER_META_DATA", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_USER_META_DATA},\
+    {"VARIABLE_FLAG", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_VARIABLE_FLAG},\
+    {"psamp_1_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_MIRROR_ON_DROP_0_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT 0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT    1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH          2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS     3
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S      4
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID       5
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID     6
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT          7
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT \
+    {"EGRESS_MOD_PORT", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT},\
+    {"INGRESS_PORT", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT},\
+    {"LENGTH", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH},\
+    {"OBS_TIME_NS", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS},\
+    {"OBS_TIME_S", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S},\
+    {"SWITCH_ID", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID},\
+    {"TEMPLATE_ID", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID},\
+    {"psamp_mirror_on_drop_0_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_MIRROR_ON_DROP_3_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_DROP_REASON             0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_MOD_STATE               1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_RESERVED_0              2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SAMPLED_LENGTH          3
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_UC_COS__COLOR__PROB_IDX 4
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_USER_META_DATA          5
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_VAR_LEN_INDICATOR       6
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT          7
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FIELD_NAME_MAP_INIT \
+    {"DROP_REASON", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_DROP_REASON},\
+    {"MOD_STATE", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_MOD_STATE},\
+    {"RESERVED_0", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_RESERVED_0},\
+    {"SAMPLED_LENGTH", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SAMPLED_LENGTH},\
+    {"UC_COS__COLOR__PROB_IDX", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_UC_COS__COLOR__PROB_IDX},\
+    {"USER_META_DATA", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_USER_META_DATA},\
+    {"VAR_LEN_INDICATOR", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_VAR_LEN_INDICATOR},\
+    {"psamp_mirror_on_drop_3_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT}
+
+/*!
+ * \name RARP_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_HARDWARE_LEN  0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_HARDWARE_TYPE 1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_OPERATION     2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_PROT_ADDR_LEN 3
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_PROTOCOL_TYPE 4
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_SENDER_HA     5
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_SENDER_IP     6
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_TARGET_HA     7
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_TARGET_IP     8
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_FID_COUNT          9
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT \
+    {"HARDWARE_LEN", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_HARDWARE_LEN},\
+    {"HARDWARE_TYPE", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_HARDWARE_TYPE},\
+    {"OPERATION", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_OPERATION},\
+    {"PROT_ADDR_LEN", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_PROT_ADDR_LEN},\
+    {"PROTOCOL_TYPE", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_PROTOCOL_TYPE},\
+    {"SENDER_HA", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_SENDER_HA},\
+    {"SENDER_IP", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_SENDER_IP},\
+    {"TARGET_HA", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_TARGET_HA},\
+    {"TARGET_IP", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_TARGET_IP},\
+    {"rarp_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_FID_COUNT}
+
+/*!
+ * \name ROUTING_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ROUTING_T_DATA          0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ROUTING_T_HDR_EXT_LEN   1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ROUTING_T_NEXT_HEADER   2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ROUTING_T_ROUTING_TYPE  3
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ROUTING_T_SEGMENTS_LEFT 4
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ROUTING_T_FID_COUNT          5
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ROUTING_T_FIELD_NAME_MAP_INIT \
+    {"DATA", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ROUTING_T_DATA},\
+    {"HDR_EXT_LEN", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ROUTING_T_HDR_EXT_LEN},\
+    {"NEXT_HEADER", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ROUTING_T_NEXT_HEADER},\
+    {"ROUTING_TYPE", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ROUTING_T_ROUTING_TYPE},\
+    {"SEGMENTS_LEFT", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ROUTING_T_SEGMENTS_LEFT},\
+    {"routing_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ROUTING_T_FID_COUNT}
+
+/*!
+ * \name RSPAN_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RSPAN_T_TAG  0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RSPAN_T_TPID 1
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RSPAN_T_FID_COUNT          2
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RSPAN_T_FIELD_NAME_MAP_INIT \
+    {"TAG", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RSPAN_T_TAG},\
+    {"TPID", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RSPAN_T_TPID},\
+    {"rspan_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RSPAN_T_FID_COUNT}
+
+/*!
+ * \name SFLOW_SHIM_0_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_0_T_SYS_DESTINATION 0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_0_T_SYS_SOURCE      1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_0_T_VERSION         2
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT          3
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_0_T_FIELD_NAME_MAP_INIT \
+    {"SYS_DESTINATION", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_0_T_SYS_DESTINATION},\
+    {"SYS_SOURCE", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_0_T_SYS_SOURCE},\
+    {"VERSION", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_0_T_VERSION},\
+    {"sflow_shim_0_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT}
+
+/*!
+ * \name SFLOW_SHIM_1_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DEST_SAMPLE 0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DISCARDED   1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_FLEX_SAMPLE 2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_MCAST       3
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_SRC_SAMPLE  4
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_TRUNCATED   5
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_RESERVED         6
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_SYS_OPCODE       7
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT          8
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_FIELD_NAME_MAP_INIT \
+    {"FLAG_DEST_SAMPLE", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DEST_SAMPLE},\
+    {"FLAG_DISCARDED", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DISCARDED},\
+    {"FLAG_FLEX_SAMPLE", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_FLEX_SAMPLE},\
+    {"FLAG_MCAST", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_MCAST},\
+    {"FLAG_SRC_SAMPLE", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_SRC_SAMPLE},\
+    {"FLAG_TRUNCATED", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_TRUNCATED},\
+    {"RESERVED", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_RESERVED},\
+    {"SYS_OPCODE", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_SYS_OPCODE},\
+    {"sflow_shim_1_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT}
+
+/*!
+ * \name SFLOW_SHIM_2_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_2_T_SEQUENCE_NUM   0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_2_T_USER_META_DATA 1
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT          2
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_2_T_FIELD_NAME_MAP_INIT \
+    {"SEQUENCE_NUM", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_2_T_SEQUENCE_NUM},\
+    {"USER_META_DATA", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_2_T_USER_META_DATA},\
+    {"sflow_shim_2_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT}
+
+/*!
+ * \name SNAP_LLC_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SNAP_LLC_T_LENGTH   0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SNAP_LLC_T_SNAP_LLC 1
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SNAP_LLC_T_FID_COUNT          2
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SNAP_LLC_T_FIELD_NAME_MAP_INIT \
+    {"LENGTH", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SNAP_LLC_T_LENGTH},\
+    {"SNAP_LLC", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SNAP_LLC_T_SNAP_LLC},\
+    {"snap_llc_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SNAP_LLC_T_FID_COUNT}
+
+/*!
+ * \name TCP_FIRST_4BYTES_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT 0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT 1
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT          2
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT \
+    {"DST_PORT", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT},\
+    {"SRC_PORT", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT},\
+    {"tcp_first_4bytes_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT}
+
+/*!
+ * \name TCP_LAST_16BYTES_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM           0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM          1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS 2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM           3
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR        4
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE          5
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT          6
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT \
+    {"ACK_NUM", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM},\
+    {"CHECKSUM", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM},\
+    {"HDR_LEN_AND_FLAGS", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS},\
+    {"SEQ_NUM", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM},\
+    {"URGENT_PTR", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR},\
+    {"WIN_SIZE", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE},\
+    {"tcp_last_16bytes_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT}
+
+/*!
+ * \name UDP_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UDP_T_CHECKSUM   0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UDP_T_DST_PORT   1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UDP_T_SRC_PORT   2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UDP_T_UDP_LENGTH 3
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UDP_T_FID_COUNT          4
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT \
+    {"CHECKSUM", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UDP_T_CHECKSUM},\
+    {"DST_PORT", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UDP_T_DST_PORT},\
+    {"SRC_PORT", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UDP_T_SRC_PORT},\
+    {"UDP_LENGTH", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UDP_T_UDP_LENGTH},\
+    {"udp_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UDP_T_FID_COUNT}
+
+/*!
+ * \name UNKNOWN_L3_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD 0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD  1
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT          2
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT \
+    {"FIRST_16BYTES_OF_L3_PAYLOAD", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD},\
+    {"NEXT_16BYTES_OF_L3_PAYLOAD", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD},\
+    {"unknown_l3_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT}
+
+/*!
+ * \name UNKNOWN_L4_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD 0
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT          1
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT \
+    {"FIRST_4BYTES_OF_L4_PAYLOAD", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD},\
+    {"unknown_l4_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT}
+
+/*!
+ * \name UNKNOWN_L5_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1 0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3 1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7 2
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT          3
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT \
+    {"L5_BYTES_0_1", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1},\
+    {"L5_BYTES_2_3", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3},\
+    {"L5_BYTES_4_7", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7},\
+    {"unknown_l5_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT}
+
+/*!
+ * \name VLAN_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VLAN_T_CFI  0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VLAN_T_PCP  1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VLAN_T_TPID 2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VLAN_T_VID  3
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VLAN_T_FID_COUNT          4
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT \
+    {"CFI", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VLAN_T_CFI},\
+    {"PCP", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VLAN_T_PCP},\
+    {"TPID", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VLAN_T_TPID},\
+    {"VID", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VLAN_T_VID},\
+    {"vlan_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VLAN_T_FID_COUNT}
+
+/*!
+ * \name VNTAG_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VNTAG_T_TAG  0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VNTAG_T_TPID 1
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VNTAG_T_FID_COUNT          2
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VNTAG_T_FIELD_NAME_MAP_INIT \
+    {"TAG", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VNTAG_T_TAG},\
+    {"TPID", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VNTAG_T_TPID},\
+    {"vntag_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VNTAG_T_FID_COUNT}
+
+/*!
+ * \name VXLAN_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VXLAN_T_FLAGS_RESERVED_1 0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VXLAN_T_RESERVED2        1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VXLAN_T_VN_ID            2
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VXLAN_T_FID_COUNT          3
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT \
+    {"FLAGS_RESERVED_1", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VXLAN_T_FLAGS_RESERVED_1},\
+    {"RESERVED2", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VXLAN_T_RESERVED2},\
+    {"VN_ID", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VXLAN_T_VN_ID},\
+    {"vxlan_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VXLAN_T_FID_COUNT}
+
+/*!
+ * \name WESP_T field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_FLAGS       0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_HEADER_LEN  1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_NEXT_HEADER 2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_SEQ_NUM     3
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_SPI         4
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_TRAILER_LEN 5
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_WESP_IV     6
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_FID_COUNT          7
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_FIELD_NAME_MAP_INIT \
+    {"FLAGS", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_FLAGS},\
+    {"HEADER_LEN", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_HEADER_LEN},\
+    {"NEXT_HEADER", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_NEXT_HEADER},\
+    {"SEQ_NUM", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_SEQ_NUM},\
+    {"SPI", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_SPI},\
+    {"TRAILER_LEN", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_TRAILER_LEN},\
+    {"WESP_IV", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_WESP_IV},\
+    {"wesp_t fid count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_FID_COUNT}
+
+
+#endif /* BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_FLEXHDR_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_bcmpkt_rxpmd_flex_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_bcmpkt_rxpmd_flex_data.h
new file mode 100644
index 000000000000..be757a27bc89
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_bcmpkt_rxpmd_flex_data.h
@@ -0,0 +1,164 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) map.yml.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_DATA_H
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_DATA_H
+
+/*!
+ * \name RX flex metadata field IDs.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_DLB_ECMP_DESTINATION_15_0                      0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0                                 1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_DVP_15_0                                       2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_7_0                              3
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_EM_FT_OPAQUE_OBJ_OR_IFP_OPAQUE_OBJ_15_0        4
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_HIGH_3_0                         5
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0                         6
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_0                        7
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32                       8
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0                              9
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_IFP_IOAM_GBP_ACTION_3_0                        10
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_IFP_TS_CONTROL_ACTION_3_0                      11
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_0                             12
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_INGRESS_PP_PORT_7_0                            13
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0 14
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0                    15
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_INT_PRI_3_0                                    16
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_L2_IIF_10_0                                    17
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_L2_OIF_10_0                                    18
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_L3_IIF_13_0                                    19
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0                                  20
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_MPLS_LABEL_DECAP_COUNT_3_0                     21
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0              22
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_15_0                              23
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0                            24
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0                            25
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_SVP_15_0                                       26
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0                   27
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0                        28
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_SYSTEM_ENTROPY_15_0                            29
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0                              30
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_SYSTEM_SOURCE_15_0                             31
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_TIMESTAMP_CTRL_3_0                             32
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0                33
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_VFI_15_0                                       34
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_VLAN_TAG_PRESERVE_CTRL_SVP_MIRROR_ENABLE_1_0   35
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_FID_COUNT                       36
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_COUNT                    41
+
+/*!
+ * \name Packet Flex Reason Types.
+ */
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS                               0
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED 1
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED  2
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP                                  3
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT                                   4
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_IFP                                     5
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER                               6
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED      7
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT                                   8
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP                           9
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS                      10
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE                      11
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP                           12
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS                      13
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR                            14
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF                        15
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR                            16
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL                        17
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD                    18
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0                      19
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1                      20
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2                      21
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3                      22
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4                      23
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5                      24
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6                      25
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7                      26
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD            27
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED              28
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED                  29
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU                    30
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU                          31
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED              32
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT                            33
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_RESERVED_TRACE_BIT                      34
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP                                35
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD         36
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_SVP                                     37
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP                               38
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED                       39
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_VFP                                     40
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT \
+    {"CML_FLAGS", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS},\
+    {"DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED},\
+    {"DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED},\
+    {"DST_FP", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP},\
+    {"EM_FT", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT},\
+    {"IFP", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_IFP},\
+    {"IFP_METER", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER},\
+    {"IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED},\
+    {"IVXLT", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT},\
+    {"L2_DST_LOOKUP", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP},\
+    {"L2_DST_LOOKUP_MISS", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS},\
+    {"L2_SRC_STATIC_MOVE", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE},\
+    {"L3_DST_LOOKUP", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP},\
+    {"L3_DST_LOOKUP_MISS", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS},\
+    {"L3_HDR_ERROR", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR},\
+    {"L3_IIF_EQ_L3_OIF", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF},\
+    {"L3_TTL_ERROR", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR},\
+    {"LEARN_CACHE_FULL", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL},\
+    {"MACSA_MULTICAST_RSVD", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD},\
+    {"MATCHED_RULE_BIT_0", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0},\
+    {"MATCHED_RULE_BIT_1", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1},\
+    {"MATCHED_RULE_BIT_2", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2},\
+    {"MATCHED_RULE_BIT_3", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3},\
+    {"MATCHED_RULE_BIT_4", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4},\
+    {"MATCHED_RULE_BIT_5", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5},\
+    {"MATCHED_RULE_BIT_6", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6},\
+    {"MATCHED_RULE_BIT_7", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7},\
+    {"MEMBERSHIP_CHECK_FAILED_RSVD", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD},\
+    {"MIRROR_SAMPLER_EGR_SAMPLED", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED},\
+    {"MIRROR_SAMPLER_SAMPLED", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED},\
+    {"MPLS_CTRL_PKT_TO_CPU", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU},\
+    {"NO_COPY_TO_CPU", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU},\
+    {"PKT_INTEGRITY_CHECK_FAILED", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED},\
+    {"PROTOCOL_PKT", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT},\
+    {"RESERVED_TRACE_BIT", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_RESERVED_TRACE_BIT},\
+    {"SER_DROP", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP},\
+    {"SPANNING_TREE_CHECK_FAILED_RSVD", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD},\
+    {"SVP", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_SVP},\
+    {"TRACE_DOP", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP},\
+    {"URPF_CHECK_FAILED", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED},\
+    {"VFP", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_VFP},\
+    {"flex reason count", BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_COUNT}
+
+#endif /* BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_bcmpkt_rxpmd_match_id_defs.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_bcmpkt_rxpmd_match_id_defs.h
new file mode 100644
index 000000000000..f1f6fffac541
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_bcmpkt_rxpmd_match_id_defs.h
@@ -0,0 +1,407 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) bcm56880_a0_dna_6_5_31_6_0_sf_match_id_info.yml
+ * for device bcm56880_a0 and variant dna_6_5_31_6_0.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H
+
+#include <bcmpkt/bcmpkt_rxpmd_match_id.h>
+
+/*!
+ * \brief Get the Match ID DataBase information.
+ *
+ * \retval bcmpkt_rxpmd_match_id_db_info_t Match ID DataBase information.
+*/
+extern bcmpkt_rxpmd_match_id_db_info_t *
+    bcm56880_a0_dna_6_5_31_6_0_rxpmd_match_id_db_info_get(void);
+
+/*!
+ * \brief Get the Match ID Mapping information.
+ *
+ * \retval bcmpkt_rxpmd_match_id_map_info_t Match ID Mapping information.
+*/
+extern bcmpkt_rxpmd_match_id_map_info_t *
+    bcm56880_a0_dna_6_5_31_6_0_rxpmd_match_id_map_info_get(void);
+
+/*!
+  \name RXPMD Match IDs
+*/
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ETAG  0
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_BASE  1
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0  2
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG  3
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2  4
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE  5
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG  6
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC  7
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_VNTAG  8
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP  9
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1  10
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2  11
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD  12
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT  13
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE  14
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1  15
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2  16
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE  17
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE  18
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM  19
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY  20
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT  21
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ  22
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP  23
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA  24
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP  25
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4  26
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6  27
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0  28
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1  29
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2  30
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3  31
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4  32
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5  33
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6  34
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH  35
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW  36
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE  37
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588  38
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP  39
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES  40
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES  41
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP  42
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3  43
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4  44
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5  45
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN  46
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK  47
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE  48
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ETAG  49
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE  50
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0  51
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG  52
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2  53
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE  54
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG  55
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC  56
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_VNTAG  57
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP  58
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1  59
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2  60
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD  61
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT  62
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE  63
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1  64
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2  65
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE  66
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE  67
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM  68
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY  69
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT  70
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ  71
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP  72
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA  73
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP  74
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4  75
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6  76
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0  77
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1  78
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2  79
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3  80
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4  81
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5  82
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6  83
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH  84
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW  85
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE  86
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588  87
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP  88
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES  89
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES  90
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP  91
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3  92
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4  93
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5  94
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN  95
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ETAG  96
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG  97
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2  98
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE  99
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG  100
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC  101
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_VNTAG  102
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP  103
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1  104
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2  105
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD  106
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT  107
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE  108
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1  109
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2  110
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP  111
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA  112
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP  113
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4  114
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6  115
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE  116
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588  117
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP  118
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES  119
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES  120
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP  121
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3  122
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4  123
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5  124
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ETAG  125
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_BASE  126
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0  127
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG  128
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2  129
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE  130
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG  131
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC  132
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_VNTAG  133
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP  134
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1  135
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2  136
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD  137
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT  138
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE  139
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1  140
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2  141
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE  142
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE  143
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM  144
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY  145
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT  146
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ  147
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP  148
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA  149
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP  150
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4  151
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6  152
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0  153
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1  154
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2  155
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3  156
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4  157
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5  158
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6  159
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH  160
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW  161
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE  162
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588  163
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP  164
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES  165
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES  166
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP  167
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3  168
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4  169
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5  170
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN  171
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK  172
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE  173
+#define BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_COUNT  174
+
+#define BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT \
+    {"EGRESS_PKT_FWD_L2_HDR_ETAG", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ETAG}, \
+    {"EGRESS_PKT_FWD_L2_HDR_HG3_BASE", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_BASE}, \
+    {"EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0}, \
+    {"EGRESS_PKT_FWD_L2_HDR_ITAG", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG}, \
+    {"EGRESS_PKT_FWD_L2_HDR_L2", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2}, \
+    {"EGRESS_PKT_FWD_L2_HDR_NONE", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE}, \
+    {"EGRESS_PKT_FWD_L2_HDR_OTAG", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG}, \
+    {"EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC}, \
+    {"EGRESS_PKT_FWD_L2_HDR_VNTAG", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_VNTAG}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ARP", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_BFD", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GPE", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ICMP", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IGMP", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV4", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV6", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS0", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS1", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS2", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS3", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS4", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS5", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS6", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_NONE", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_P_1588", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_RARP", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UDP", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_VXLAN", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN}, \
+    {"EGRESS_PKT_SYS_HDR_LOOPBACK", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK}, \
+    {"EGRESS_PKT_SYS_HDR_NONE", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_ETAG", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ETAG}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_ITAG", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_L2", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_NONE", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_OTAG", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_VNTAG", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_VNTAG}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN}, \
+    {"INGRESS_PKT_INNER_L2_HDR_ETAG", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ETAG}, \
+    {"INGRESS_PKT_INNER_L2_HDR_ITAG", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG}, \
+    {"INGRESS_PKT_INNER_L2_HDR_L2", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2}, \
+    {"INGRESS_PKT_INNER_L2_HDR_NONE", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE}, \
+    {"INGRESS_PKT_INNER_L2_HDR_OTAG", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG}, \
+    {"INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC}, \
+    {"INGRESS_PKT_INNER_L2_HDR_VNTAG", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_VNTAG}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ARP", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_BFD", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ICMP", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_IGMP", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV4", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV6", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_NONE", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_P_1588", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_RARP", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UDP", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_ETAG", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ETAG}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_HG3_BASE", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_BASE}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_ITAG", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_L2", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_NONE", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_OTAG", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_VNTAG", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_VNTAG}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ARP", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_BFD", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GPE", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ICMP", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IGMP", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV4", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV6", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_NONE", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_P_1588", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_RARP", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UDP", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN}, \
+    {"INGRESS_PKT_SYS_HDR_LOOPBACK", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK}, \
+    {"INGRESS_PKT_SYS_HDR_NONE", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE}, \
+    {"rxpmd_match_id_count", BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_COUNT}
+
+#endif /*! BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_bcmpkt_flexhdr.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_bcmpkt_flexhdr.h
deleted file mode 100644
index 1e4c749bfc14..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_bcmpkt_flexhdr.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) header.yml.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_FLEXHDR_H
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_FLEXHDR_H
-
-#include <bcmpkt/bcmpkt_flexhdr_internal.h>
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ARP_T                      0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_AUTHEN_T                   1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T                      2
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CNTAG_T                    3
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_0_T         4
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_1_T         5
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_DEST_OPTION_T              6
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T        7
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T         8
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ESP_T                      9
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ETAG_T                     10
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ETHERTYPE_T                11
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_FRAG_T                     12
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T         13
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GPE_T                      14
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_CHKSUM_T               15
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_KEY_T                  16
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_ROUT_T                 17
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_SEQ_T                  18
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_T                      19
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_HOP_BY_HOP_T               20
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ICMP_T                     21
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_0_A_T          22
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_0_B_T          23
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_1_T            24
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_2_T            25
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_3_T            26
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_HEADER_T               27
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_MD_BASE_T              28
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_METADATA_T             29
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IGMP_T                     30
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPFIX_T                    31
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV4_T                     32
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV6_T                     33
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_L2_T                       34
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MIRROR_ERSPAN_SN_T         35
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MIRROR_TRANSPORT_T         36
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_ACH_T                 37
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_BV_T                  38
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_CW_T                  39
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_T                     40
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_P_1588_T                   41
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PROG_EXT_HDR_T             42
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_0_T                  43
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_1_T                  44
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T   45
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T   46
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RARP_T                     47
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ROUTING_T                  48
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RSPAN_T                    49
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_0_T             50
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_1_T             51
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_2_T             52
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SNAP_LLC_T                 53
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_TCP_FIRST_4BYTES_T         54
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_TCP_LAST_16BYTES_T         55
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UDP_T                      56
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L3_T               57
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L4_T               58
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L5_T               59
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VLAN_T                     60
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VNTAG_T                    61
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VXLAN_T                    62
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_WESP_T                     63
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_T               64
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_FLEXHDR_COUNT    65
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_FLEXHDR_NAME_MAP_INIT \
-    {"arp_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ARP_T},\
-    {"authen_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_AUTHEN_T},\
-    {"bfd_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T},\
-    {"cntag_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CNTAG_T},\
-    {"cpu_composites_0_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_0_T},\
-    {"cpu_composites_1_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_1_T},\
-    {"dest_option_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_DEST_OPTION_T},\
-    {"erspan3_fixed_hdr_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T},\
-    {"erspan3_subhdr_5_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T},\
-    {"esp_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ESP_T},\
-    {"etag_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ETAG_T},\
-    {"ethertype_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ETHERTYPE_T},\
-    {"frag_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_FRAG_T},\
-    {"generic_loopback_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T},\
-    {"gpe_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GPE_T},\
-    {"gre_chksum_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_CHKSUM_T},\
-    {"gre_key_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_KEY_T},\
-    {"gre_rout_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_ROUT_T},\
-    {"gre_seq_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_SEQ_T},\
-    {"gre_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_T},\
-    {"hop_by_hop_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_HOP_BY_HOP_T},\
-    {"icmp_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ICMP_T},\
-    {"ifa_flex_md_0_a_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_0_A_T},\
-    {"ifa_flex_md_0_b_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_0_B_T},\
-    {"ifa_flex_md_1_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_1_T},\
-    {"ifa_flex_md_2_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_2_T},\
-    {"ifa_flex_md_3_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_3_T},\
-    {"ifa_header_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_HEADER_T},\
-    {"ifa_md_base_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_MD_BASE_T},\
-    {"ifa_metadata_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_METADATA_T},\
-    {"igmp_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IGMP_T},\
-    {"ipfix_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPFIX_T},\
-    {"ipv4_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV4_T},\
-    {"ipv6_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV6_T},\
-    {"l2_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_L2_T},\
-    {"mirror_erspan_sn_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MIRROR_ERSPAN_SN_T},\
-    {"mirror_transport_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MIRROR_TRANSPORT_T},\
-    {"mpls_ach_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_ACH_T},\
-    {"mpls_bv_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_BV_T},\
-    {"mpls_cw_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_CW_T},\
-    {"mpls_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_T},\
-    {"p_1588_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_P_1588_T},\
-    {"prog_ext_hdr_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PROG_EXT_HDR_T},\
-    {"psamp_0_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_0_T},\
-    {"psamp_1_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_1_T},\
-    {"psamp_mirror_on_drop_0_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T},\
-    {"psamp_mirror_on_drop_3_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T},\
-    {"rarp_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RARP_T},\
-    {"routing_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ROUTING_T},\
-    {"rspan_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RSPAN_T},\
-    {"sflow_shim_0_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_0_T},\
-    {"sflow_shim_1_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_1_T},\
-    {"sflow_shim_2_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_2_T},\
-    {"snap_llc_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SNAP_LLC_T},\
-    {"tcp_first_4bytes_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_TCP_FIRST_4BYTES_T},\
-    {"tcp_last_16bytes_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_TCP_LAST_16BYTES_T},\
-    {"udp_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UDP_T},\
-    {"unknown_l3_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L3_T},\
-    {"unknown_l4_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L4_T},\
-    {"unknown_l5_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L5_T},\
-    {"vlan_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VLAN_T},\
-    {"vntag_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VNTAG_T},\
-    {"vxlan_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VXLAN_T},\
-    {"wesp_t", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_WESP_T},\
-    {"RXPMD_FLEX_T", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_T},\
-    {"flexhdr count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_FLEXHDR_COUNT}
-
-#endif /* BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_FLEXHDR_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_bcmpkt_flexhdr_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_bcmpkt_flexhdr_data.h
deleted file mode 100644
index 6b5f4c667fcd..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_bcmpkt_flexhdr_data.h
+++ /dev/null
@@ -1,1212 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) header.yml.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_FLEXHDR_DATA_H
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_FLEXHDR_DATA_H
-
-/*!
- * \name ARP_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ARP_T_HARDWARE_LEN  0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ARP_T_HARDWARE_TYPE 1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ARP_T_OPERATION     2
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ARP_T_PROT_ADDR_LEN 3
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ARP_T_PROTOCOL_TYPE 4
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ARP_T_SENDER_HA     5
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ARP_T_SENDER_IP     6
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ARP_T_TARGET_HA     7
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ARP_T_TARGET_IP     8
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ARP_T_FID_COUNT          9
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT \
-    {"HARDWARE_LEN", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ARP_T_HARDWARE_LEN},\
-    {"HARDWARE_TYPE", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ARP_T_HARDWARE_TYPE},\
-    {"OPERATION", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ARP_T_OPERATION},\
-    {"PROT_ADDR_LEN", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ARP_T_PROT_ADDR_LEN},\
-    {"PROTOCOL_TYPE", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ARP_T_PROTOCOL_TYPE},\
-    {"SENDER_HA", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ARP_T_SENDER_HA},\
-    {"SENDER_IP", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ARP_T_SENDER_IP},\
-    {"TARGET_HA", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ARP_T_TARGET_HA},\
-    {"TARGET_IP", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ARP_T_TARGET_IP},\
-    {"arp_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ARP_T_FID_COUNT}
-
-/*!
- * \name AUTHEN_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_AUTHEN_T_DATA        0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_AUTHEN_T_NEXT_HEADER 1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_AUTHEN_T_PAYLOAD_LEN 2
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_AUTHEN_T_RESERVED    3
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_AUTHEN_T_SEQ_NUM     4
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_AUTHEN_T_SPI         5
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_AUTHEN_T_FID_COUNT          6
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_AUTHEN_T_FIELD_NAME_MAP_INIT \
-    {"DATA", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_AUTHEN_T_DATA},\
-    {"NEXT_HEADER", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_AUTHEN_T_NEXT_HEADER},\
-    {"PAYLOAD_LEN", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_AUTHEN_T_PAYLOAD_LEN},\
-    {"RESERVED", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_AUTHEN_T_RESERVED},\
-    {"SEQ_NUM", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_AUTHEN_T_SEQ_NUM},\
-    {"SPI", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_AUTHEN_T_SPI},\
-    {"authen_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_AUTHEN_T_FID_COUNT}
-
-/*!
- * \name BFD_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_AP            0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_BFD_LENGTH    1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_CPI           2
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_DEM           3
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_DESMINTXINTV  4
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_DETECTMULT    5
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_DIAG          6
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_FIN           7
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_MINECHORXINTV 8
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_MPT           9
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_MYDISCRIM     10
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_POLL          11
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_REQMINRXINTV  12
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_STA           13
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_URDISCRIM     14
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_VERSION       15
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_FID_COUNT          16
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_FIELD_NAME_MAP_INIT \
-    {"AP", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_AP},\
-    {"BFD_LENGTH", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_BFD_LENGTH},\
-    {"CPI", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_CPI},\
-    {"DEM", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_DEM},\
-    {"DESMINTXINTV", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_DESMINTXINTV},\
-    {"DETECTMULT", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_DETECTMULT},\
-    {"DIAG", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_DIAG},\
-    {"FIN", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_FIN},\
-    {"MINECHORXINTV", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_MINECHORXINTV},\
-    {"MPT", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_MPT},\
-    {"MYDISCRIM", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_MYDISCRIM},\
-    {"POLL", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_POLL},\
-    {"REQMINRXINTV", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_REQMINRXINTV},\
-    {"STA", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_STA},\
-    {"URDISCRIM", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_URDISCRIM},\
-    {"VERSION", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_VERSION},\
-    {"bfd_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_FID_COUNT}
-
-/*!
- * \name CNTAG_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CNTAG_T_RPID 0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CNTAG_T_TPID 1
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CNTAG_T_FID_COUNT          2
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CNTAG_T_FIELD_NAME_MAP_INIT \
-    {"RPID", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CNTAG_T_RPID},\
-    {"TPID", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CNTAG_T_TPID},\
-    {"cntag_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CNTAG_T_FID_COUNT}
-
-/*!
- * \name CPU_COMPOSITES_0_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0 0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1 1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2 2
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3 3
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4 4
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5 5
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6 6
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT          7
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT \
-    {"DMA_CONT0", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0},\
-    {"DMA_CONT1", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1},\
-    {"DMA_CONT2", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2},\
-    {"DMA_CONT3", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3},\
-    {"DMA_CONT4", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4},\
-    {"DMA_CONT5", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5},\
-    {"DMA_CONT6", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6},\
-    {"cpu_composites_0_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT}
-
-/*!
- * \name CPU_COMPOSITES_1_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10 0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11 1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12 2
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13 3
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14 4
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15 5
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16 6
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17 7
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7  8
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8  9
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9  10
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT          11
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT \
-    {"DMA_CONT10", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10},\
-    {"DMA_CONT11", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11},\
-    {"DMA_CONT12", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12},\
-    {"DMA_CONT13", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13},\
-    {"DMA_CONT14", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14},\
-    {"DMA_CONT15", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15},\
-    {"DMA_CONT16", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16},\
-    {"DMA_CONT17", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17},\
-    {"DMA_CONT7", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7},\
-    {"DMA_CONT8", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8},\
-    {"DMA_CONT9", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9},\
-    {"cpu_composites_1_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT}
-
-/*!
- * \name DEST_OPTION_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_DEST_OPTION_T_HDR_EXT_LEN 0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_DEST_OPTION_T_NEXT_HEADER 1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_DEST_OPTION_T_OPTION      2
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_DEST_OPTION_T_FID_COUNT          3
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_DEST_OPTION_T_FIELD_NAME_MAP_INIT \
-    {"HDR_EXT_LEN", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_DEST_OPTION_T_HDR_EXT_LEN},\
-    {"NEXT_HEADER", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_DEST_OPTION_T_NEXT_HEADER},\
-    {"OPTION", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_DEST_OPTION_T_OPTION},\
-    {"dest_option_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_DEST_OPTION_T_FID_COUNT}
-
-/*!
- * \name ERSPAN3_FIXED_HDR_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO               0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_COS               1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID           2
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O 3
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID        4
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_T                 5
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP         6
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VER               7
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN              8
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT          9
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT \
-    {"BSO", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO},\
-    {"COS", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_COS},\
-    {"GBP_SID", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID},\
-    {"P_FT_HWID_D_GRA_O", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O},\
-    {"SESSION_ID", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID},\
-    {"T", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_T},\
-    {"TIMESTAMP", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP},\
-    {"VER", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VER},\
-    {"VLAN", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN},\
-    {"erspan3_fixed_hdr_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT}
-
-/*!
- * \name ERSPAN3_SUBHDR_5_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID 0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID     1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID   2
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP   3
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT          4
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT \
-    {"PLATFORM_ID", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID},\
-    {"PORT_ID", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID},\
-    {"SWITCH_ID", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID},\
-    {"TIMESTAMP", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP},\
-    {"erspan3_subhdr_5_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT}
-
-/*!
- * \name ESP_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ESP_T_NEXT_HEADER 0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ESP_T_PAD         1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ESP_T_PAD_LEN     2
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ESP_T_SEQ_NUM     3
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ESP_T_SPI         4
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ESP_T_FID_COUNT          5
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ESP_T_FIELD_NAME_MAP_INIT \
-    {"NEXT_HEADER", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ESP_T_NEXT_HEADER},\
-    {"PAD", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ESP_T_PAD},\
-    {"PAD_LEN", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ESP_T_PAD_LEN},\
-    {"SEQ_NUM", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ESP_T_SEQ_NUM},\
-    {"SPI", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ESP_T_SPI},\
-    {"esp_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ESP_T_FID_COUNT}
-
-/*!
- * \name ETAG_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ETAG_T_TAG  0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ETAG_T_TPID 1
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ETAG_T_FID_COUNT          2
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ETAG_T_FIELD_NAME_MAP_INIT \
-    {"TAG", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ETAG_T_TAG},\
-    {"TPID", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ETAG_T_TPID},\
-    {"etag_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ETAG_T_FID_COUNT}
-
-/*!
- * \name ETHERTYPE_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ETHERTYPE_T_TYPE 0
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ETHERTYPE_T_FID_COUNT          1
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT \
-    {"TYPE", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ETHERTYPE_T_TYPE},\
-    {"ethertype_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ETHERTYPE_T_FID_COUNT}
-
-/*!
- * \name FRAG_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_FRAG_T_FRAG_INFO   0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_FRAG_T_ID          1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_FRAG_T_NEXT_HEADER 2
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_FRAG_T_RESERVED    3
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_FRAG_T_FID_COUNT          4
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_FRAG_T_FIELD_NAME_MAP_INIT \
-    {"FRAG_INFO", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_FRAG_T_FRAG_INFO},\
-    {"ID", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_FRAG_T_ID},\
-    {"NEXT_HEADER", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_FRAG_T_NEXT_HEADER},\
-    {"RESERVED", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_FRAG_T_RESERVED},\
-    {"frag_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_FRAG_T_FID_COUNT}
-
-/*!
- * \name GENERIC_LOOPBACK_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ    0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE   1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ        2
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_FLAGS              3
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE        4
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY     5
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL     6
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ      7
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0  8
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1  9
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ            10
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1         11
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT 12
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE         13
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_SVP                14
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT          15
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT \
-    {"DESTINATION_OBJ", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ},\
-    {"DESTINATION_TYPE", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE},\
-    {"ENTROPY_OBJ", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ},\
-    {"FLAGS", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_FLAGS},\
-    {"HEADER_TYPE", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE},\
-    {"INPUT_PRIORITY", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY},\
-    {"INTERFACE_CTRL", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL},\
-    {"INTERFACE_OBJ", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ},\
-    {"PROCESSING_CTRL_0", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0},\
-    {"PROCESSING_CTRL_1", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1},\
-    {"QOS_OBJ", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ},\
-    {"RESERVED_1", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1},\
-    {"SOURCE_SYSTEM_PORT", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT},\
-    {"START_BYTE", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE},\
-    {"SVP", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_SVP},\
-    {"generic_loopback_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT}
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NO_OP       0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2_OIF      1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED    2
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__VP          3
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP        4
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NHOP        5
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2MC_GROUP  6
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L3MC_GROUP  7
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED_1  8
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP_MEMBER 9
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__DEVICE_PORT 10
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_TYPE__TUNNEL  0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_TYPE__GENERIC 1
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__NOOP   0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__VFI    1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__L3_IIF 2
-
-/*!
- * \name GPE_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GPE_T_FLAGS         0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GPE_T_NEXT_PROTOCOL 1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GPE_T_RESERVED0     2
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GPE_T_RESERVED1     3
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GPE_T_VNI           4
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GPE_T_FID_COUNT          5
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GPE_T_FIELD_NAME_MAP_INIT \
-    {"FLAGS", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GPE_T_FLAGS},\
-    {"NEXT_PROTOCOL", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GPE_T_NEXT_PROTOCOL},\
-    {"RESERVED0", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GPE_T_RESERVED0},\
-    {"RESERVED1", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GPE_T_RESERVED1},\
-    {"VNI", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GPE_T_VNI},\
-    {"gpe_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GPE_T_FID_COUNT}
-
-/*!
- * \name GRE_CHKSUM_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_CHKSUM_T_CHECKSUM 0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_CHKSUM_T_OFFSET   1
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT          2
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_CHKSUM_T_FIELD_NAME_MAP_INIT \
-    {"CHECKSUM", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_CHKSUM_T_CHECKSUM},\
-    {"OFFSET", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_CHKSUM_T_OFFSET},\
-    {"gre_chksum_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT}
-
-/*!
- * \name GRE_KEY_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_KEY_T_KEY 0
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_KEY_T_FID_COUNT          1
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_KEY_T_FIELD_NAME_MAP_INIT \
-    {"KEY", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_KEY_T_KEY},\
-    {"gre_key_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_KEY_T_FID_COUNT}
-
-/*!
- * \name GRE_ROUT_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_ROUT_T_ROUTING 0
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_ROUT_T_FID_COUNT          1
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_ROUT_T_FIELD_NAME_MAP_INIT \
-    {"ROUTING", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_ROUT_T_ROUTING},\
-    {"gre_rout_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_ROUT_T_FID_COUNT}
-
-/*!
- * \name GRE_SEQ_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_SEQ_T_SEQUENCE 0
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_SEQ_T_FID_COUNT          1
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_SEQ_T_FIELD_NAME_MAP_INIT \
-    {"SEQUENCE", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_SEQ_T_SEQUENCE},\
-    {"gre_seq_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_SEQ_T_FID_COUNT}
-
-/*!
- * \name GRE_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_T_C_R_K_S  0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_T_PROTOCOL 1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_T_RESERVED 2
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_T_VERSION  3
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_T_FID_COUNT          4
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_T_FIELD_NAME_MAP_INIT \
-    {"C_R_K_S", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_T_C_R_K_S},\
-    {"PROTOCOL", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_T_PROTOCOL},\
-    {"RESERVED", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_T_RESERVED},\
-    {"VERSION", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_T_VERSION},\
-    {"gre_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_T_FID_COUNT}
-
-/*!
- * \name HOP_BY_HOP_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_HOP_BY_HOP_T_HDR_EXT_LEN 0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_HOP_BY_HOP_T_NEXT_HEADER 1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_HOP_BY_HOP_T_OPTION      2
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT          3
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_HOP_BY_HOP_T_FIELD_NAME_MAP_INIT \
-    {"HDR_EXT_LEN", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_HOP_BY_HOP_T_HDR_EXT_LEN},\
-    {"NEXT_HEADER", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_HOP_BY_HOP_T_NEXT_HEADER},\
-    {"OPTION", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_HOP_BY_HOP_T_OPTION},\
-    {"hop_by_hop_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT}
-
-/*!
- * \name ICMP_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ICMP_T_CHECKSUM  0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ICMP_T_CODE      1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ICMP_T_ICMP_TYPE 2
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ICMP_T_FID_COUNT          3
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT \
-    {"CHECKSUM", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ICMP_T_CHECKSUM},\
-    {"CODE", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ICMP_T_CODE},\
-    {"ICMP_TYPE", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ICMP_T_ICMP_TYPE},\
-    {"icmp_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ICMP_T_FID_COUNT}
-
-/*!
- * \name IFA_FLEX_MD_0_A_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_0_A_T_FWD_HDR_TTL   0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_0_A_T_LNS_DEVICE_ID 1
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT          2
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_0_A_T_FIELD_NAME_MAP_INIT \
-    {"FWD_HDR_TTL", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_0_A_T_FWD_HDR_TTL},\
-    {"LNS_DEVICE_ID", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_0_A_T_LNS_DEVICE_ID},\
-    {"ifa_flex_md_0_a_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT}
-
-/*!
- * \name IFA_FLEX_MD_0_B_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_CN               0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_PORT_SPEED       1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_QUEUE_ID         2
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_RX_TIMESTAMP_SEC 3
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT          4
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_FIELD_NAME_MAP_INIT \
-    {"CN", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_CN},\
-    {"PORT_SPEED", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_PORT_SPEED},\
-    {"QUEUE_ID", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_QUEUE_ID},\
-    {"RX_TIMESTAMP_SEC", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_RX_TIMESTAMP_SEC},\
-    {"ifa_flex_md_0_b_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT}
-
-/*!
- * \name IFA_FLEX_MD_1_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_1_T_EGRESS_PORT_ID       0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_1_T_INGRESS_PORT_ID      1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_1_T_RX_TIMESTAMP_NANOSEC 2
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT          3
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_1_T_FIELD_NAME_MAP_INIT \
-    {"EGRESS_PORT_ID", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_1_T_EGRESS_PORT_ID},\
-    {"INGRESS_PORT_ID", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_1_T_INGRESS_PORT_ID},\
-    {"RX_TIMESTAMP_NANOSEC", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_1_T_RX_TIMESTAMP_NANOSEC},\
-    {"ifa_flex_md_1_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT}
-
-/*!
- * \name IFA_FLEX_MD_2_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_2_T_RESIDENCE_TIME_NANOSEC 0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_2_T_TX_QUEUE_BYTE_COUNT    1
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT          2
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_2_T_FIELD_NAME_MAP_INIT \
-    {"RESIDENCE_TIME_NANOSEC", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_2_T_RESIDENCE_TIME_NANOSEC},\
-    {"TX_QUEUE_BYTE_COUNT", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_2_T_TX_QUEUE_BYTE_COUNT},\
-    {"ifa_flex_md_2_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT}
-
-/*!
- * \name IFA_FLEX_MD_3_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_3_T_MMU_STAT_0 0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_3_T_MMU_STAT_1 1
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT          2
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_3_T_FIELD_NAME_MAP_INIT \
-    {"MMU_STAT_0", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_3_T_MMU_STAT_0},\
-    {"MMU_STAT_1", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_3_T_MMU_STAT_1},\
-    {"ifa_flex_md_3_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT}
-
-/*!
- * \name IFA_HEADER_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_HEADER_T_FLAGS      0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_HEADER_T_GNS        1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_HEADER_T_MAX_LENGTH 2
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_HEADER_T_NEXT_HDR   3
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_HEADER_T_VER        4
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_HEADER_T_FID_COUNT          5
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_HEADER_T_FIELD_NAME_MAP_INIT \
-    {"FLAGS", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_HEADER_T_FLAGS},\
-    {"GNS", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_HEADER_T_GNS},\
-    {"MAX_LENGTH", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_HEADER_T_MAX_LENGTH},\
-    {"NEXT_HDR", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_HEADER_T_NEXT_HDR},\
-    {"VER", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_HEADER_T_VER},\
-    {"ifa_header_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_HEADER_T_FID_COUNT}
-
-/*!
- * \name IFA_MD_BASE_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_MD_BASE_T_ACTION_VECTOR            0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_MD_BASE_T_HOP_LIMIT_CURRENT_LENGTH 1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_MD_BASE_T_REQUEST_VECTOR           2
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_MD_BASE_T_FID_COUNT          3
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_MD_BASE_T_FIELD_NAME_MAP_INIT \
-    {"ACTION_VECTOR", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_MD_BASE_T_ACTION_VECTOR},\
-    {"HOP_LIMIT_CURRENT_LENGTH", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_MD_BASE_T_HOP_LIMIT_CURRENT_LENGTH},\
-    {"REQUEST_VECTOR", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_MD_BASE_T_REQUEST_VECTOR},\
-    {"ifa_md_base_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_MD_BASE_T_FID_COUNT}
-
-/*!
- * \name IFA_METADATA_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_METADATA_T_ACTION_VECTOR            0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_METADATA_T_HOP_LIMIT_CURRENT_LENGTH 1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_METADATA_T_METADATA                 2
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_METADATA_T_REQUEST_VECTOR           3
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_METADATA_T_FID_COUNT          4
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_METADATA_T_FIELD_NAME_MAP_INIT \
-    {"ACTION_VECTOR", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_METADATA_T_ACTION_VECTOR},\
-    {"HOP_LIMIT_CURRENT_LENGTH", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_METADATA_T_HOP_LIMIT_CURRENT_LENGTH},\
-    {"METADATA", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_METADATA_T_METADATA},\
-    {"REQUEST_VECTOR", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_METADATA_T_REQUEST_VECTOR},\
-    {"ifa_metadata_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_METADATA_T_FID_COUNT}
-
-/*!
- * \name IGMP_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IGMP_T_CHECKSUM      0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IGMP_T_GROUP_ADDRESS 1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IGMP_T_IGMP_TYPE     2
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IGMP_T_MAX_RESP_TIME 3
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IGMP_T_FID_COUNT          4
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IGMP_T_FIELD_NAME_MAP_INIT \
-    {"CHECKSUM", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IGMP_T_CHECKSUM},\
-    {"GROUP_ADDRESS", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IGMP_T_GROUP_ADDRESS},\
-    {"IGMP_TYPE", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IGMP_T_IGMP_TYPE},\
-    {"MAX_RESP_TIME", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IGMP_T_MAX_RESP_TIME},\
-    {"igmp_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IGMP_T_FID_COUNT}
-
-/*!
- * \name IPFIX_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPFIX_T_EXPORT_TIME   0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPFIX_T_LENGTH        1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPFIX_T_OBS_DOMAIN_ID 2
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPFIX_T_SEQUENCE_NUM  3
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPFIX_T_VERSION       4
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPFIX_T_FID_COUNT          5
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT \
-    {"EXPORT_TIME", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPFIX_T_EXPORT_TIME},\
-    {"LENGTH", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPFIX_T_LENGTH},\
-    {"OBS_DOMAIN_ID", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPFIX_T_OBS_DOMAIN_ID},\
-    {"SEQUENCE_NUM", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPFIX_T_SEQUENCE_NUM},\
-    {"VERSION", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPFIX_T_VERSION},\
-    {"ipfix_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPFIX_T_FID_COUNT}
-
-/*!
- * \name IPV4_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV4_T_DA                0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET 1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV4_T_HDR_CHECKSUM      2
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV4_T_ID                3
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV4_T_OPTION            4
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV4_T_PROTOCOL          5
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV4_T_SA                6
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV4_T_TOS               7
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV4_T_TOTAL_LENGTH      8
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV4_T_TTL               9
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV4_T_VERSION_HDR_LEN   10
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV4_T_FID_COUNT          11
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT \
-    {"DA", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV4_T_DA},\
-    {"FLAGS_FRAG_OFFSET", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET},\
-    {"HDR_CHECKSUM", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV4_T_HDR_CHECKSUM},\
-    {"ID", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV4_T_ID},\
-    {"OPTION", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV4_T_OPTION},\
-    {"PROTOCOL", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV4_T_PROTOCOL},\
-    {"SA", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV4_T_SA},\
-    {"TOS", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV4_T_TOS},\
-    {"TOTAL_LENGTH", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV4_T_TOTAL_LENGTH},\
-    {"TTL", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV4_T_TTL},\
-    {"VERSION_HDR_LEN", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV4_T_VERSION_HDR_LEN},\
-    {"ipv4_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV4_T_FID_COUNT}
-
-/*!
- * \name IPV6_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV6_T_DA             0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV6_T_FLOW_LABEL     1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV6_T_HOP_LIMIT      2
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV6_T_NEXT_HEADER    3
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV6_T_PAYLOAD_LENGTH 4
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV6_T_SA             5
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV6_T_TRAFFIC_CLASS  6
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV6_T_VERSION        7
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV6_T_FID_COUNT          8
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT \
-    {"DA", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV6_T_DA},\
-    {"FLOW_LABEL", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV6_T_FLOW_LABEL},\
-    {"HOP_LIMIT", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV6_T_HOP_LIMIT},\
-    {"NEXT_HEADER", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV6_T_NEXT_HEADER},\
-    {"PAYLOAD_LENGTH", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV6_T_PAYLOAD_LENGTH},\
-    {"SA", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV6_T_SA},\
-    {"TRAFFIC_CLASS", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV6_T_TRAFFIC_CLASS},\
-    {"VERSION", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV6_T_VERSION},\
-    {"ipv6_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV6_T_FID_COUNT}
-
-/*!
- * \name L2_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_L2_T_MACDA 0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_L2_T_MACSA 1
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_L2_T_FID_COUNT          2
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_L2_T_FIELD_NAME_MAP_INIT \
-    {"MACDA", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_L2_T_MACDA},\
-    {"MACSA", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_L2_T_MACSA},\
-    {"l2_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_L2_T_FID_COUNT}
-
-/*!
- * \name MIRROR_ERSPAN_SN_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM 0
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT          1
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT \
-    {"SEQ_NUM", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM},\
-    {"mirror_erspan_sn_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT}
-
-/*!
- * \name MIRROR_TRANSPORT_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MIRROR_TRANSPORT_T_DATA 0
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT          1
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT \
-    {"DATA", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MIRROR_TRANSPORT_T_DATA},\
-    {"mirror_transport_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT}
-
-/*!
- * \name MPLS_ACH_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_ACH_T_CHANNEL_TYPE 0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_ACH_T_CW_TYPE      1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_ACH_T_RESERVED     2
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_ACH_T_VERSION      3
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_ACH_T_FID_COUNT          4
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_ACH_T_FIELD_NAME_MAP_INIT \
-    {"CHANNEL_TYPE", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_ACH_T_CHANNEL_TYPE},\
-    {"CW_TYPE", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_ACH_T_CW_TYPE},\
-    {"RESERVED", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_ACH_T_RESERVED},\
-    {"VERSION", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_ACH_T_VERSION},\
-    {"mpls_ach_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_ACH_T_FID_COUNT}
-
-/*!
- * \name MPLS_BV_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_BV_T_VALUE 0
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_BV_T_FID_COUNT          1
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_BV_T_FIELD_NAME_MAP_INIT \
-    {"VALUE", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_BV_T_VALUE},\
-    {"mpls_bv_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_BV_T_FID_COUNT}
-
-/*!
- * \name MPLS_CW_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_CW_T_CW_TYPE    0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_CW_T_RESERVED   1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_CW_T_SEQ_NUMBER 2
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_CW_T_FID_COUNT          3
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_CW_T_FIELD_NAME_MAP_INIT \
-    {"CW_TYPE", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_CW_T_CW_TYPE},\
-    {"RESERVED", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_CW_T_RESERVED},\
-    {"SEQ_NUMBER", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_CW_T_SEQ_NUMBER},\
-    {"mpls_cw_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_CW_T_FID_COUNT}
-
-/*!
- * \name MPLS_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_T_BOS   0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_T_EXP   1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_T_LABEL 2
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_T_TTL   3
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_T_FID_COUNT          4
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_T_FIELD_NAME_MAP_INIT \
-    {"BOS", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_T_BOS},\
-    {"EXP", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_T_EXP},\
-    {"LABEL", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_T_LABEL},\
-    {"TTL", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_T_TTL},\
-    {"mpls_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_T_FID_COUNT}
-
-/*!
- * \name P_1588_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_P_1588_T_CNTRL          0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_P_1588_T_CORRECTION     1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_P_1588_T_DOMAIN_NB      2
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_P_1588_T_FLAGS          3
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_P_1588_T_LOGMSGINTERVAL 4
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_P_1588_T_MSG_LENGTH     5
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_P_1588_T_MSG_TYPE       6
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_P_1588_T_RESERVED1      7
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_P_1588_T_RESERVED2      8
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_P_1588_T_RESERVED3      9
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_P_1588_T_SEQ_ID         10
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_P_1588_T_SRCPORTID      11
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_P_1588_T_TRANSPORTSPEC  12
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_P_1588_T_VERSION        13
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_P_1588_T_FID_COUNT          14
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_P_1588_T_FIELD_NAME_MAP_INIT \
-    {"CNTRL", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_P_1588_T_CNTRL},\
-    {"CORRECTION", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_P_1588_T_CORRECTION},\
-    {"DOMAIN_NB", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_P_1588_T_DOMAIN_NB},\
-    {"FLAGS", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_P_1588_T_FLAGS},\
-    {"LOGMSGINTERVAL", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_P_1588_T_LOGMSGINTERVAL},\
-    {"MSG_LENGTH", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_P_1588_T_MSG_LENGTH},\
-    {"MSG_TYPE", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_P_1588_T_MSG_TYPE},\
-    {"RESERVED1", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_P_1588_T_RESERVED1},\
-    {"RESERVED2", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_P_1588_T_RESERVED2},\
-    {"RESERVED3", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_P_1588_T_RESERVED3},\
-    {"SEQ_ID", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_P_1588_T_SEQ_ID},\
-    {"SRCPORTID", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_P_1588_T_SRCPORTID},\
-    {"TRANSPORTSPEC", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_P_1588_T_TRANSPORTSPEC},\
-    {"VERSION", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_P_1588_T_VERSION},\
-    {"p_1588_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_P_1588_T_FID_COUNT}
-
-/*!
- * \name PROG_EXT_HDR_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PROG_EXT_HDR_T_HDR_EXT_LEN 0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PROG_EXT_HDR_T_NEXT_HEADER 1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PROG_EXT_HDR_T_OPTION      2
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT          3
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PROG_EXT_HDR_T_FIELD_NAME_MAP_INIT \
-    {"HDR_EXT_LEN", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PROG_EXT_HDR_T_HDR_EXT_LEN},\
-    {"NEXT_HEADER", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PROG_EXT_HDR_T_NEXT_HEADER},\
-    {"OPTION", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PROG_EXT_HDR_T_OPTION},\
-    {"prog_ext_hdr_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT}
-
-/*!
- * \name PSAMP_0_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_0_T_FLOWSET        0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_0_T_LENGTH         1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_0_T_NEXT_HOP_INDEX 2
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_0_T_OBS_TIME_NS    3
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_0_T_OBS_TIME_S     4
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_0_T_TEMPLATE_ID    5
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_0_T_FID_COUNT          6
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_0_T_FIELD_NAME_MAP_INIT \
-    {"FLOWSET", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_0_T_FLOWSET},\
-    {"LENGTH", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_0_T_LENGTH},\
-    {"NEXT_HOP_INDEX", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_0_T_NEXT_HOP_INDEX},\
-    {"OBS_TIME_NS", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_0_T_OBS_TIME_NS},\
-    {"OBS_TIME_S", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_0_T_OBS_TIME_S},\
-    {"TEMPLATE_ID", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_0_T_TEMPLATE_ID},\
-    {"psamp_0_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_0_T_FID_COUNT}
-
-/*!
- * \name PSAMP_1_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_1_T_DLB_ID         0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_1_T_EGRESS_PORT    1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_1_T_EPOCH          2
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_1_T_INGRESS_PORT   3
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_1_T_SAMPLED_LENGTH 4
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_1_T_USER_META_DATA 5
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_1_T_VARIABLE_FLAG  6
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_1_T_FID_COUNT          7
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_1_T_FIELD_NAME_MAP_INIT \
-    {"DLB_ID", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_1_T_DLB_ID},\
-    {"EGRESS_PORT", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_1_T_EGRESS_PORT},\
-    {"EPOCH", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_1_T_EPOCH},\
-    {"INGRESS_PORT", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_1_T_INGRESS_PORT},\
-    {"SAMPLED_LENGTH", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_1_T_SAMPLED_LENGTH},\
-    {"USER_META_DATA", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_1_T_USER_META_DATA},\
-    {"VARIABLE_FLAG", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_1_T_VARIABLE_FLAG},\
-    {"psamp_1_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_1_T_FID_COUNT}
-
-/*!
- * \name PSAMP_MIRROR_ON_DROP_0_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT 0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT    1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH          2
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS     3
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S      4
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID       5
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID     6
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT          7
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT \
-    {"EGRESS_MOD_PORT", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT},\
-    {"INGRESS_PORT", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT},\
-    {"LENGTH", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH},\
-    {"OBS_TIME_NS", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS},\
-    {"OBS_TIME_S", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S},\
-    {"SWITCH_ID", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID},\
-    {"TEMPLATE_ID", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID},\
-    {"psamp_mirror_on_drop_0_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT}
-
-/*!
- * \name PSAMP_MIRROR_ON_DROP_3_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_DROP_REASON             0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_MOD_STATE               1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_RESERVED_0              2
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SAMPLED_LENGTH          3
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_UC_COS__COLOR__PROB_IDX 4
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_USER_META_DATA          5
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_VAR_LEN_INDICATOR       6
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT          7
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FIELD_NAME_MAP_INIT \
-    {"DROP_REASON", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_DROP_REASON},\
-    {"MOD_STATE", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_MOD_STATE},\
-    {"RESERVED_0", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_RESERVED_0},\
-    {"SAMPLED_LENGTH", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SAMPLED_LENGTH},\
-    {"UC_COS__COLOR__PROB_IDX", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_UC_COS__COLOR__PROB_IDX},\
-    {"USER_META_DATA", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_USER_META_DATA},\
-    {"VAR_LEN_INDICATOR", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_VAR_LEN_INDICATOR},\
-    {"psamp_mirror_on_drop_3_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT}
-
-/*!
- * \name RARP_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RARP_T_HARDWARE_LEN  0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RARP_T_HARDWARE_TYPE 1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RARP_T_OPERATION     2
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RARP_T_PROT_ADDR_LEN 3
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RARP_T_PROTOCOL_TYPE 4
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RARP_T_SENDER_HA     5
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RARP_T_SENDER_IP     6
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RARP_T_TARGET_HA     7
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RARP_T_TARGET_IP     8
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RARP_T_FID_COUNT          9
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT \
-    {"HARDWARE_LEN", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RARP_T_HARDWARE_LEN},\
-    {"HARDWARE_TYPE", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RARP_T_HARDWARE_TYPE},\
-    {"OPERATION", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RARP_T_OPERATION},\
-    {"PROT_ADDR_LEN", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RARP_T_PROT_ADDR_LEN},\
-    {"PROTOCOL_TYPE", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RARP_T_PROTOCOL_TYPE},\
-    {"SENDER_HA", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RARP_T_SENDER_HA},\
-    {"SENDER_IP", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RARP_T_SENDER_IP},\
-    {"TARGET_HA", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RARP_T_TARGET_HA},\
-    {"TARGET_IP", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RARP_T_TARGET_IP},\
-    {"rarp_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RARP_T_FID_COUNT}
-
-/*!
- * \name ROUTING_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ROUTING_T_DATA          0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ROUTING_T_HDR_EXT_LEN   1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ROUTING_T_NEXT_HEADER   2
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ROUTING_T_ROUTING_TYPE  3
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ROUTING_T_SEGMENTS_LEFT 4
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ROUTING_T_FID_COUNT          5
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ROUTING_T_FIELD_NAME_MAP_INIT \
-    {"DATA", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ROUTING_T_DATA},\
-    {"HDR_EXT_LEN", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ROUTING_T_HDR_EXT_LEN},\
-    {"NEXT_HEADER", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ROUTING_T_NEXT_HEADER},\
-    {"ROUTING_TYPE", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ROUTING_T_ROUTING_TYPE},\
-    {"SEGMENTS_LEFT", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ROUTING_T_SEGMENTS_LEFT},\
-    {"routing_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ROUTING_T_FID_COUNT}
-
-/*!
- * \name RSPAN_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RSPAN_T_TAG  0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RSPAN_T_TPID 1
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RSPAN_T_FID_COUNT          2
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RSPAN_T_FIELD_NAME_MAP_INIT \
-    {"TAG", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RSPAN_T_TAG},\
-    {"TPID", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RSPAN_T_TPID},\
-    {"rspan_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RSPAN_T_FID_COUNT}
-
-/*!
- * \name SFLOW_SHIM_0_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_0_T_SYS_DESTINATION 0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_0_T_SYS_SOURCE      1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_0_T_VERSION         2
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT          3
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_0_T_FIELD_NAME_MAP_INIT \
-    {"SYS_DESTINATION", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_0_T_SYS_DESTINATION},\
-    {"SYS_SOURCE", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_0_T_SYS_SOURCE},\
-    {"VERSION", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_0_T_VERSION},\
-    {"sflow_shim_0_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT}
-
-/*!
- * \name SFLOW_SHIM_1_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DEST_SAMPLE 0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DISCARDED   1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_FLEX_SAMPLE 2
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_MCAST       3
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_SRC_SAMPLE  4
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_TRUNCATED   5
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_1_T_RESERVED         6
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_1_T_SYS_OPCODE       7
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT          8
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_1_T_FIELD_NAME_MAP_INIT \
-    {"FLAG_DEST_SAMPLE", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DEST_SAMPLE},\
-    {"FLAG_DISCARDED", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DISCARDED},\
-    {"FLAG_FLEX_SAMPLE", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_FLEX_SAMPLE},\
-    {"FLAG_MCAST", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_MCAST},\
-    {"FLAG_SRC_SAMPLE", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_SRC_SAMPLE},\
-    {"FLAG_TRUNCATED", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_TRUNCATED},\
-    {"RESERVED", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_1_T_RESERVED},\
-    {"SYS_OPCODE", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_1_T_SYS_OPCODE},\
-    {"sflow_shim_1_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT}
-
-/*!
- * \name SFLOW_SHIM_2_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_2_T_SEQUENCE_NUM   0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_2_T_USER_META_DATA 1
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT          2
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_2_T_FIELD_NAME_MAP_INIT \
-    {"SEQUENCE_NUM", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_2_T_SEQUENCE_NUM},\
-    {"USER_META_DATA", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_2_T_USER_META_DATA},\
-    {"sflow_shim_2_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT}
-
-/*!
- * \name SNAP_LLC_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SNAP_LLC_T_LENGTH   0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SNAP_LLC_T_SNAP_LLC 1
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SNAP_LLC_T_FID_COUNT          2
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SNAP_LLC_T_FIELD_NAME_MAP_INIT \
-    {"LENGTH", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SNAP_LLC_T_LENGTH},\
-    {"SNAP_LLC", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SNAP_LLC_T_SNAP_LLC},\
-    {"snap_llc_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SNAP_LLC_T_FID_COUNT}
-
-/*!
- * \name TCP_FIRST_4BYTES_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT 0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT 1
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT          2
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT \
-    {"DST_PORT", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT},\
-    {"SRC_PORT", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT},\
-    {"tcp_first_4bytes_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT}
-
-/*!
- * \name TCP_LAST_16BYTES_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM           0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM          1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS 2
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM           3
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR        4
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE          5
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT          6
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT \
-    {"ACK_NUM", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM},\
-    {"CHECKSUM", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM},\
-    {"HDR_LEN_AND_FLAGS", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS},\
-    {"SEQ_NUM", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM},\
-    {"URGENT_PTR", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR},\
-    {"WIN_SIZE", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE},\
-    {"tcp_last_16bytes_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT}
-
-/*!
- * \name UDP_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UDP_T_CHECKSUM   0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UDP_T_DST_PORT   1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UDP_T_SRC_PORT   2
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UDP_T_UDP_LENGTH 3
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UDP_T_FID_COUNT          4
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT \
-    {"CHECKSUM", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UDP_T_CHECKSUM},\
-    {"DST_PORT", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UDP_T_DST_PORT},\
-    {"SRC_PORT", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UDP_T_SRC_PORT},\
-    {"UDP_LENGTH", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UDP_T_UDP_LENGTH},\
-    {"udp_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UDP_T_FID_COUNT}
-
-/*!
- * \name UNKNOWN_L3_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD 0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD  1
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT          2
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT \
-    {"FIRST_16BYTES_OF_L3_PAYLOAD", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD},\
-    {"NEXT_16BYTES_OF_L3_PAYLOAD", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD},\
-    {"unknown_l3_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT}
-
-/*!
- * \name UNKNOWN_L4_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD 0
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT          1
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT \
-    {"FIRST_4BYTES_OF_L4_PAYLOAD", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD},\
-    {"unknown_l4_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT}
-
-/*!
- * \name UNKNOWN_L5_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1 0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3 1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7 2
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT          3
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT \
-    {"L5_BYTES_0_1", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1},\
-    {"L5_BYTES_2_3", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3},\
-    {"L5_BYTES_4_7", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7},\
-    {"unknown_l5_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT}
-
-/*!
- * \name VLAN_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VLAN_T_CFI  0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VLAN_T_PCP  1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VLAN_T_TPID 2
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VLAN_T_VID  3
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VLAN_T_FID_COUNT          4
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT \
-    {"CFI", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VLAN_T_CFI},\
-    {"PCP", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VLAN_T_PCP},\
-    {"TPID", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VLAN_T_TPID},\
-    {"VID", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VLAN_T_VID},\
-    {"vlan_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VLAN_T_FID_COUNT}
-
-/*!
- * \name VNTAG_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VNTAG_T_TAG  0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VNTAG_T_TPID 1
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VNTAG_T_FID_COUNT          2
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VNTAG_T_FIELD_NAME_MAP_INIT \
-    {"TAG", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VNTAG_T_TAG},\
-    {"TPID", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VNTAG_T_TPID},\
-    {"vntag_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VNTAG_T_FID_COUNT}
-
-/*!
- * \name VXLAN_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VXLAN_T_FLAGS_RESERVED_1 0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VXLAN_T_RESERVED2        1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VXLAN_T_VN_ID            2
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VXLAN_T_FID_COUNT          3
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT \
-    {"FLAGS_RESERVED_1", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VXLAN_T_FLAGS_RESERVED_1},\
-    {"RESERVED2", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VXLAN_T_RESERVED2},\
-    {"VN_ID", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VXLAN_T_VN_ID},\
-    {"vxlan_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VXLAN_T_FID_COUNT}
-
-/*!
- * \name WESP_T field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_WESP_T_FLAGS       0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_WESP_T_HEADER_LEN  1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_WESP_T_NEXT_HEADER 2
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_WESP_T_SEQ_NUM     3
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_WESP_T_SPI         4
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_WESP_T_TRAILER_LEN 5
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_WESP_T_WESP_IV     6
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_WESP_T_FID_COUNT          7
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_WESP_T_FIELD_NAME_MAP_INIT \
-    {"FLAGS", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_WESP_T_FLAGS},\
-    {"HEADER_LEN", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_WESP_T_HEADER_LEN},\
-    {"NEXT_HEADER", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_WESP_T_NEXT_HEADER},\
-    {"SEQ_NUM", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_WESP_T_SEQ_NUM},\
-    {"SPI", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_WESP_T_SPI},\
-    {"TRAILER_LEN", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_WESP_T_TRAILER_LEN},\
-    {"WESP_IV", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_WESP_T_WESP_IV},\
-    {"wesp_t fid count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_WESP_T_FID_COUNT}
-
-
-#endif /* BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_FLEXHDR_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_bcmpkt_rxpmd_flex_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_bcmpkt_rxpmd_flex_data.h
deleted file mode 100644
index d986e9c3dc94..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_bcmpkt_rxpmd_flex_data.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) map.yml.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_DATA_H
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_DATA_H
-
-/*!
- * \name RX flex metadata field IDs.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_DLB_ECMP_DESTINATION_15_0                      0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0                                 1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_DVP_15_0                                       2
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_7_0                              3
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_EM_FT_OPAQUE_OBJ_OR_IFP_OPAQUE_OBJ_15_0        4
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_HIGH_3_0                         5
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0                         6
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_0                        7
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32                       8
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0                              9
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_IFP_IOAM_GBP_ACTION_3_0                        10
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_IFP_TS_CONTROL_ACTION_3_0                      11
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_ING_PORT_GROUP_ID_3_0_3_0                      12
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_ING_PORT_GROUP_ID_7_4_3_0                      13
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_0                             14
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_INGRESS_PP_PORT_ITAG_PRESERVE_15_0             15
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0 16
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0                    17
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_INT_PRI_3_0                                    18
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_L2_IIF_10_0                                    19
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_L2_OIF_10_0                                    20
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_L3_IIF_13_0                                    21
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0                                  22
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0              23
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_15_0                              24
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0                            25
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0                            26
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_SVP_15_0                                       27
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0                   28
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0                        29
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0                              30
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_SYSTEM_SOURCE_15_0                             31
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_TIMESTAMP_CTRL_3_0                             32
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0                33
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_VFI_15_0                                       34
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_FID_COUNT                       35
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_COUNT                    42
-
-/*!
- * \name Packet Flex Reason Types.
- */
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE                         0
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS                               1
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED 2
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED  3
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP                                  4
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT                                   5
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP                                     6
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER                               7
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED      8
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT                                   9
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP                           10
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS                      11
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE                      12
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP                           13
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS                      14
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR                            15
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF                        16
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR                            17
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL                        18
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD                    19
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0                      20
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1                      21
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2                      22
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3                      23
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4                      24
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5                      25
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6                      26
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7                      27
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD            28
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED              29
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED                  30
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU                    31
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU                          32
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED              33
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT                            34
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_RESERVED_TRACE_BIT                      35
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP                                36
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD         37
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_SVP                                     38
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP                               39
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED                       40
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_VFP                                     41
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT \
-    {"CB_STATION_MOVE", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE},\
-    {"CML_FLAGS", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS},\
-    {"DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED},\
-    {"DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED},\
-    {"DST_FP", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP},\
-    {"EM_FT", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT},\
-    {"IFP", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP},\
-    {"IFP_METER", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER},\
-    {"IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED},\
-    {"IVXLT", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT},\
-    {"L2_DST_LOOKUP", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP},\
-    {"L2_DST_LOOKUP_MISS", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS},\
-    {"L2_SRC_STATIC_MOVE", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE},\
-    {"L3_DST_LOOKUP", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP},\
-    {"L3_DST_LOOKUP_MISS", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS},\
-    {"L3_HDR_ERROR", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR},\
-    {"L3_IIF_EQ_L3_OIF", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF},\
-    {"L3_TTL_ERROR", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR},\
-    {"LEARN_CACHE_FULL", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL},\
-    {"MACSA_MULTICAST_RSVD", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD},\
-    {"MATCHED_RULE_BIT_0", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0},\
-    {"MATCHED_RULE_BIT_1", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1},\
-    {"MATCHED_RULE_BIT_2", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2},\
-    {"MATCHED_RULE_BIT_3", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3},\
-    {"MATCHED_RULE_BIT_4", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4},\
-    {"MATCHED_RULE_BIT_5", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5},\
-    {"MATCHED_RULE_BIT_6", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6},\
-    {"MATCHED_RULE_BIT_7", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7},\
-    {"MEMBERSHIP_CHECK_FAILED_RSVD", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD},\
-    {"MIRROR_SAMPLER_EGR_SAMPLED", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED},\
-    {"MIRROR_SAMPLER_SAMPLED", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED},\
-    {"MPLS_CTRL_PKT_TO_CPU", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU},\
-    {"NO_COPY_TO_CPU", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU},\
-    {"PKT_INTEGRITY_CHECK_FAILED", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED},\
-    {"PROTOCOL_PKT", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT},\
-    {"RESERVED_TRACE_BIT", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_RESERVED_TRACE_BIT},\
-    {"SER_DROP", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP},\
-    {"SPANNING_TREE_CHECK_FAILED_RSVD", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD},\
-    {"SVP", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_SVP},\
-    {"TRACE_DOP", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP},\
-    {"URPF_CHECK_FAILED", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED},\
-    {"VFP", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_VFP},\
-    {"flex reason count", BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_COUNT}
-
-#endif /* BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_bcmpkt_rxpmd_match_id_defs.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_bcmpkt_rxpmd_match_id_defs.h
deleted file mode 100644
index a0ee1dc92c9d..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_bcmpkt_rxpmd_match_id_defs.h
+++ /dev/null
@@ -1,395 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) bcm56880_a0_hna_6_5_30_3_0_sf_match_id_info.yml
- * for device bcm56880_a0 and variant hna_6_5_30_3_0.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H
-
-#include <bcmpkt/bcmpkt_rxpmd_match_id.h>
-
-/*!
- * \brief Get the Match ID DataBase information.
- *
- * \retval bcmpkt_rxpmd_match_id_db_info_t Match ID DataBase information.
-*/
-extern bcmpkt_rxpmd_match_id_db_info_t *
-    bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db_info_get(void);
-
-/*!
- * \brief Get the Match ID Mapping information.
- *
- * \retval bcmpkt_rxpmd_match_id_map_info_t Match ID Mapping information.
-*/
-extern bcmpkt_rxpmd_match_id_map_info_t *
-    bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_map_info_get(void);
-
-/*!
-  \name RXPMD Match IDs
-*/
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ETAG  0
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG  1
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2  2
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE  3
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG  4
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC  5
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_VNTAG  6
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP  7
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1  8
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2  9
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD  10
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT  11
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE  12
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1  13
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2  14
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE  15
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE  16
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM  17
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY  18
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT  19
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ  20
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP  21
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA  22
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP  23
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4  24
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6  25
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0  26
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1  27
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2  28
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3  29
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4  30
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5  31
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6  32
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH  33
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW  34
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE  35
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588  36
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP  37
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES  38
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES  39
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP  40
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3  41
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4  42
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5  43
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN  44
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK  45
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE  46
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ETAG  47
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG  48
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2  49
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE  50
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG  51
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC  52
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_VNTAG  53
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP  54
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1  55
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2  56
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD  57
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT  58
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE  59
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1  60
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2  61
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE  62
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE  63
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM  64
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY  65
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT  66
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ  67
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP  68
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA  69
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP  70
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4  71
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6  72
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0  73
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1  74
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2  75
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3  76
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4  77
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5  78
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6  79
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH  80
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW  81
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE  82
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588  83
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP  84
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES  85
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES  86
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP  87
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3  88
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4  89
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5  90
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN  91
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ETAG  92
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG  93
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2  94
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE  95
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG  96
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC  97
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_VNTAG  98
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP  99
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1  100
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2  101
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD  102
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT  103
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE  104
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1  105
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2  106
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP  107
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA  108
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP  109
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4  110
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6  111
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE  112
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588  113
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP  114
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES  115
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES  116
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP  117
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3  118
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4  119
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5  120
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ETAG  121
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG  122
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2  123
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE  124
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG  125
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC  126
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_VNTAG  127
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP  128
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1  129
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2  130
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD  131
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT  132
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE  133
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1  134
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2  135
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE  136
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE  137
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM  138
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY  139
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT  140
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ  141
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP  142
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA  143
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP  144
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4  145
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6  146
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0  147
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1  148
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2  149
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3  150
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4  151
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5  152
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6  153
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH  154
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW  155
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE  156
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588  157
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP  158
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES  159
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES  160
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP  161
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3  162
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4  163
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5  164
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN  165
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK  166
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE  167
-#define BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_COUNT  168
-
-#define BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT \
-    {"EGRESS_PKT_FWD_L2_HDR_ETAG", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ETAG}, \
-    {"EGRESS_PKT_FWD_L2_HDR_ITAG", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG}, \
-    {"EGRESS_PKT_FWD_L2_HDR_L2", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2}, \
-    {"EGRESS_PKT_FWD_L2_HDR_NONE", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE}, \
-    {"EGRESS_PKT_FWD_L2_HDR_OTAG", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG}, \
-    {"EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC}, \
-    {"EGRESS_PKT_FWD_L2_HDR_VNTAG", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_VNTAG}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ARP", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_BFD", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GPE", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ICMP", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IGMP", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV4", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV6", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS0", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS1", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS2", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS3", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS4", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS5", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS6", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_NONE", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_P_1588", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_RARP", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UDP", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_VXLAN", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN}, \
-    {"EGRESS_PKT_SYS_HDR_LOOPBACK", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK}, \
-    {"EGRESS_PKT_SYS_HDR_NONE", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_ETAG", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ETAG}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_ITAG", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_L2", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_NONE", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_OTAG", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_VNTAG", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_VNTAG}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN}, \
-    {"INGRESS_PKT_INNER_L2_HDR_ETAG", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ETAG}, \
-    {"INGRESS_PKT_INNER_L2_HDR_ITAG", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG}, \
-    {"INGRESS_PKT_INNER_L2_HDR_L2", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2}, \
-    {"INGRESS_PKT_INNER_L2_HDR_NONE", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE}, \
-    {"INGRESS_PKT_INNER_L2_HDR_OTAG", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG}, \
-    {"INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC}, \
-    {"INGRESS_PKT_INNER_L2_HDR_VNTAG", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_VNTAG}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ARP", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_BFD", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ICMP", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_IGMP", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV4", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV6", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_NONE", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_P_1588", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_RARP", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UDP", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_ETAG", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ETAG}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_ITAG", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_L2", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_NONE", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_OTAG", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_VNTAG", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_VNTAG}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ARP", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_BFD", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GPE", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ICMP", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IGMP", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV4", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV6", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_NONE", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_P_1588", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_RARP", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UDP", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN}, \
-    {"INGRESS_PKT_SYS_HDR_LOOPBACK", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK}, \
-    {"INGRESS_PKT_SYS_HDR_NONE", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE}, \
-    {"rxpmd_match_id_count", BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_COUNT}
-
-#endif /*! BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_bcmpkt_flexhdr.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_bcmpkt_flexhdr.h
new file mode 100644
index 000000000000..8717982e665f
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_bcmpkt_flexhdr.h
@@ -0,0 +1,170 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) header.yml.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_FLEXHDR_H
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_FLEXHDR_H
+
+#include <bcmpkt/bcmpkt_flexhdr_internal.h>
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T                      0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T                   1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T                      2
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CNTAG_T                    3
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T         4
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T         5
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_DEST_OPTION_T              6
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T        7
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T         8
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ESP_T                      9
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ETAG_T                     10
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T                11
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_FRAG_T                     12
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T         13
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GPE_T                      14
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_CHKSUM_T               15
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_KEY_T                  16
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_ROUT_T                 17
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_SEQ_T                  18
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_T                      19
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_HOP_BY_HOP_T               20
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ICMP_T                     21
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_A_T          22
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_B_T          23
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_1_T            24
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_2_T            25
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_3_T            26
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_HEADER_T               27
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_MD_BASE_T              28
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_METADATA_T             29
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IGMP_T                     30
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPFIX_T                    31
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T                     32
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T                     33
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_L2_T                       34
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T         35
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T         36
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_ACH_T                 37
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_BV_T                  38
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_CW_T                  39
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_T                     40
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T                   41
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PROG_EXT_HDR_T             42
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T                  43
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T                  44
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T   45
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T   46
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T                     47
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ROUTING_T                  48
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RSPAN_T                    49
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_0_T             50
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T             51
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_2_T             52
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SNAP_LLC_T                 53
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T         54
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T         55
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UDP_T                      56
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T               57
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T               58
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T               59
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VLAN_T                     60
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VNTAG_T                    61
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VXLAN_T                    62
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T                     63
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_T               64
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_FLEXHDR_COUNT    65
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_FLEXHDR_NAME_MAP_INIT \
+    {"arp_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T},\
+    {"authen_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T},\
+    {"bfd_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T},\
+    {"cntag_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CNTAG_T},\
+    {"cpu_composites_0_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T},\
+    {"cpu_composites_1_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T},\
+    {"dest_option_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_DEST_OPTION_T},\
+    {"erspan3_fixed_hdr_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T},\
+    {"erspan3_subhdr_5_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T},\
+    {"esp_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ESP_T},\
+    {"etag_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ETAG_T},\
+    {"ethertype_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T},\
+    {"frag_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_FRAG_T},\
+    {"generic_loopback_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T},\
+    {"gpe_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GPE_T},\
+    {"gre_chksum_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_CHKSUM_T},\
+    {"gre_key_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_KEY_T},\
+    {"gre_rout_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_ROUT_T},\
+    {"gre_seq_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_SEQ_T},\
+    {"gre_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_T},\
+    {"hop_by_hop_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_HOP_BY_HOP_T},\
+    {"icmp_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ICMP_T},\
+    {"ifa_flex_md_0_a_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_A_T},\
+    {"ifa_flex_md_0_b_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_B_T},\
+    {"ifa_flex_md_1_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_1_T},\
+    {"ifa_flex_md_2_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_2_T},\
+    {"ifa_flex_md_3_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_3_T},\
+    {"ifa_header_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_HEADER_T},\
+    {"ifa_md_base_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_MD_BASE_T},\
+    {"ifa_metadata_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_METADATA_T},\
+    {"igmp_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IGMP_T},\
+    {"ipfix_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPFIX_T},\
+    {"ipv4_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T},\
+    {"ipv6_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T},\
+    {"l2_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_L2_T},\
+    {"mirror_erspan_sn_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T},\
+    {"mirror_transport_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T},\
+    {"mpls_ach_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_ACH_T},\
+    {"mpls_bv_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_BV_T},\
+    {"mpls_cw_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_CW_T},\
+    {"mpls_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_T},\
+    {"p_1588_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T},\
+    {"prog_ext_hdr_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PROG_EXT_HDR_T},\
+    {"psamp_0_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T},\
+    {"psamp_1_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T},\
+    {"psamp_mirror_on_drop_0_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T},\
+    {"psamp_mirror_on_drop_3_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T},\
+    {"rarp_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T},\
+    {"routing_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ROUTING_T},\
+    {"rspan_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RSPAN_T},\
+    {"sflow_shim_0_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_0_T},\
+    {"sflow_shim_1_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T},\
+    {"sflow_shim_2_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_2_T},\
+    {"snap_llc_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SNAP_LLC_T},\
+    {"tcp_first_4bytes_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T},\
+    {"tcp_last_16bytes_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T},\
+    {"udp_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UDP_T},\
+    {"unknown_l3_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T},\
+    {"unknown_l4_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T},\
+    {"unknown_l5_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T},\
+    {"vlan_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VLAN_T},\
+    {"vntag_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VNTAG_T},\
+    {"vxlan_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VXLAN_T},\
+    {"wesp_t", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T},\
+    {"RXPMD_FLEX_T", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_T},\
+    {"flexhdr count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_FLEXHDR_COUNT}
+
+#endif /* BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_FLEXHDR_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_bcmpkt_flexhdr_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_bcmpkt_flexhdr_data.h
new file mode 100644
index 000000000000..28d093fe322f
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_bcmpkt_flexhdr_data.h
@@ -0,0 +1,1212 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) header.yml.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_FLEXHDR_DATA_H
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_FLEXHDR_DATA_H
+
+/*!
+ * \name ARP_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_HARDWARE_LEN  0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_HARDWARE_TYPE 1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_OPERATION     2
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_PROT_ADDR_LEN 3
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_PROTOCOL_TYPE 4
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_SENDER_HA     5
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_SENDER_IP     6
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_TARGET_HA     7
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_TARGET_IP     8
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_FID_COUNT          9
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT \
+    {"HARDWARE_LEN", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_HARDWARE_LEN},\
+    {"HARDWARE_TYPE", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_HARDWARE_TYPE},\
+    {"OPERATION", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_OPERATION},\
+    {"PROT_ADDR_LEN", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_PROT_ADDR_LEN},\
+    {"PROTOCOL_TYPE", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_PROTOCOL_TYPE},\
+    {"SENDER_HA", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_SENDER_HA},\
+    {"SENDER_IP", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_SENDER_IP},\
+    {"TARGET_HA", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_TARGET_HA},\
+    {"TARGET_IP", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_TARGET_IP},\
+    {"arp_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_FID_COUNT}
+
+/*!
+ * \name AUTHEN_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T_DATA        0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T_NEXT_HEADER 1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T_PAYLOAD_LEN 2
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T_RESERVED    3
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T_SEQ_NUM     4
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T_SPI         5
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T_FID_COUNT          6
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T_FIELD_NAME_MAP_INIT \
+    {"DATA", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T_DATA},\
+    {"NEXT_HEADER", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T_NEXT_HEADER},\
+    {"PAYLOAD_LEN", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T_PAYLOAD_LEN},\
+    {"RESERVED", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T_RESERVED},\
+    {"SEQ_NUM", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T_SEQ_NUM},\
+    {"SPI", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T_SPI},\
+    {"authen_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T_FID_COUNT}
+
+/*!
+ * \name BFD_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_AP            0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_BFD_LENGTH    1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_CPI           2
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_DEM           3
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_DESMINTXINTV  4
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_DETECTMULT    5
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_DIAG          6
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_FIN           7
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_MINECHORXINTV 8
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_MPT           9
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_MYDISCRIM     10
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_POLL          11
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_REQMINRXINTV  12
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_STA           13
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_URDISCRIM     14
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_VERSION       15
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_FID_COUNT          16
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_FIELD_NAME_MAP_INIT \
+    {"AP", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_AP},\
+    {"BFD_LENGTH", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_BFD_LENGTH},\
+    {"CPI", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_CPI},\
+    {"DEM", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_DEM},\
+    {"DESMINTXINTV", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_DESMINTXINTV},\
+    {"DETECTMULT", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_DETECTMULT},\
+    {"DIAG", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_DIAG},\
+    {"FIN", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_FIN},\
+    {"MINECHORXINTV", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_MINECHORXINTV},\
+    {"MPT", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_MPT},\
+    {"MYDISCRIM", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_MYDISCRIM},\
+    {"POLL", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_POLL},\
+    {"REQMINRXINTV", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_REQMINRXINTV},\
+    {"STA", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_STA},\
+    {"URDISCRIM", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_URDISCRIM},\
+    {"VERSION", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_VERSION},\
+    {"bfd_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_FID_COUNT}
+
+/*!
+ * \name CNTAG_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CNTAG_T_RPID 0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CNTAG_T_TPID 1
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CNTAG_T_FID_COUNT          2
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CNTAG_T_FIELD_NAME_MAP_INIT \
+    {"RPID", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CNTAG_T_RPID},\
+    {"TPID", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CNTAG_T_TPID},\
+    {"cntag_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CNTAG_T_FID_COUNT}
+
+/*!
+ * \name CPU_COMPOSITES_0_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0 0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1 1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2 2
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3 3
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4 4
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5 5
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6 6
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT          7
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT \
+    {"DMA_CONT0", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0},\
+    {"DMA_CONT1", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1},\
+    {"DMA_CONT2", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2},\
+    {"DMA_CONT3", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3},\
+    {"DMA_CONT4", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4},\
+    {"DMA_CONT5", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5},\
+    {"DMA_CONT6", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6},\
+    {"cpu_composites_0_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT}
+
+/*!
+ * \name CPU_COMPOSITES_1_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10 0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11 1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12 2
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13 3
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14 4
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15 5
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16 6
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17 7
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7  8
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8  9
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9  10
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT          11
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT \
+    {"DMA_CONT10", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10},\
+    {"DMA_CONT11", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11},\
+    {"DMA_CONT12", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12},\
+    {"DMA_CONT13", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13},\
+    {"DMA_CONT14", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14},\
+    {"DMA_CONT15", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15},\
+    {"DMA_CONT16", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16},\
+    {"DMA_CONT17", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17},\
+    {"DMA_CONT7", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7},\
+    {"DMA_CONT8", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8},\
+    {"DMA_CONT9", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9},\
+    {"cpu_composites_1_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT}
+
+/*!
+ * \name DEST_OPTION_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_DEST_OPTION_T_HDR_EXT_LEN 0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_DEST_OPTION_T_NEXT_HEADER 1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_DEST_OPTION_T_OPTION      2
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_DEST_OPTION_T_FID_COUNT          3
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_DEST_OPTION_T_FIELD_NAME_MAP_INIT \
+    {"HDR_EXT_LEN", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_DEST_OPTION_T_HDR_EXT_LEN},\
+    {"NEXT_HEADER", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_DEST_OPTION_T_NEXT_HEADER},\
+    {"OPTION", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_DEST_OPTION_T_OPTION},\
+    {"dest_option_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_DEST_OPTION_T_FID_COUNT}
+
+/*!
+ * \name ERSPAN3_FIXED_HDR_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO               0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_COS               1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID           2
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O 3
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID        4
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_T                 5
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP         6
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VER               7
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN              8
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT          9
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT \
+    {"BSO", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO},\
+    {"COS", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_COS},\
+    {"GBP_SID", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID},\
+    {"P_FT_HWID_D_GRA_O", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O},\
+    {"SESSION_ID", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID},\
+    {"T", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_T},\
+    {"TIMESTAMP", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP},\
+    {"VER", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VER},\
+    {"VLAN", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN},\
+    {"erspan3_fixed_hdr_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT}
+
+/*!
+ * \name ERSPAN3_SUBHDR_5_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID 0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID     1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID   2
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP   3
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT          4
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT \
+    {"PLATFORM_ID", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID},\
+    {"PORT_ID", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID},\
+    {"SWITCH_ID", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID},\
+    {"TIMESTAMP", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP},\
+    {"erspan3_subhdr_5_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT}
+
+/*!
+ * \name ESP_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ESP_T_NEXT_HEADER 0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ESP_T_PAD         1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ESP_T_PAD_LEN     2
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ESP_T_SEQ_NUM     3
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ESP_T_SPI         4
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ESP_T_FID_COUNT          5
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ESP_T_FIELD_NAME_MAP_INIT \
+    {"NEXT_HEADER", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ESP_T_NEXT_HEADER},\
+    {"PAD", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ESP_T_PAD},\
+    {"PAD_LEN", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ESP_T_PAD_LEN},\
+    {"SEQ_NUM", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ESP_T_SEQ_NUM},\
+    {"SPI", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ESP_T_SPI},\
+    {"esp_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ESP_T_FID_COUNT}
+
+/*!
+ * \name ETAG_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ETAG_T_TAG  0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ETAG_T_TPID 1
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ETAG_T_FID_COUNT          2
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ETAG_T_FIELD_NAME_MAP_INIT \
+    {"TAG", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ETAG_T_TAG},\
+    {"TPID", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ETAG_T_TPID},\
+    {"etag_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ETAG_T_FID_COUNT}
+
+/*!
+ * \name ETHERTYPE_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T_TYPE 0
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T_FID_COUNT          1
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT \
+    {"TYPE", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T_TYPE},\
+    {"ethertype_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T_FID_COUNT}
+
+/*!
+ * \name FRAG_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_FRAG_T_FRAG_INFO   0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_FRAG_T_ID          1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_FRAG_T_NEXT_HEADER 2
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_FRAG_T_RESERVED    3
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_FRAG_T_FID_COUNT          4
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_FRAG_T_FIELD_NAME_MAP_INIT \
+    {"FRAG_INFO", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_FRAG_T_FRAG_INFO},\
+    {"ID", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_FRAG_T_ID},\
+    {"NEXT_HEADER", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_FRAG_T_NEXT_HEADER},\
+    {"RESERVED", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_FRAG_T_RESERVED},\
+    {"frag_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_FRAG_T_FID_COUNT}
+
+/*!
+ * \name GENERIC_LOOPBACK_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ    0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE   1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ        2
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_FLAGS              3
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE        4
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY     5
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL     6
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ      7
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0  8
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1  9
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ            10
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1         11
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT 12
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE         13
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_SVP                14
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT          15
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT \
+    {"DESTINATION_OBJ", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ},\
+    {"DESTINATION_TYPE", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE},\
+    {"ENTROPY_OBJ", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ},\
+    {"FLAGS", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_FLAGS},\
+    {"HEADER_TYPE", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE},\
+    {"INPUT_PRIORITY", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY},\
+    {"INTERFACE_CTRL", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL},\
+    {"INTERFACE_OBJ", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ},\
+    {"PROCESSING_CTRL_0", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0},\
+    {"PROCESSING_CTRL_1", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1},\
+    {"QOS_OBJ", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ},\
+    {"RESERVED_1", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1},\
+    {"SOURCE_SYSTEM_PORT", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT},\
+    {"START_BYTE", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE},\
+    {"SVP", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_SVP},\
+    {"generic_loopback_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT}
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NO_OP       0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2_OIF      1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED    2
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__VP          3
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP        4
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NHOP        5
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2MC_GROUP  6
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L3MC_GROUP  7
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED_1  8
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP_MEMBER 9
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__DEVICE_PORT 10
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_TYPE__TUNNEL  0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_TYPE__GENERIC 1
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__NOOP   0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__VFI    1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__L3_IIF 2
+
+/*!
+ * \name GPE_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GPE_T_FLAGS         0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GPE_T_NEXT_PROTOCOL 1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GPE_T_RESERVED0     2
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GPE_T_RESERVED1     3
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GPE_T_VNI           4
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GPE_T_FID_COUNT          5
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GPE_T_FIELD_NAME_MAP_INIT \
+    {"FLAGS", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GPE_T_FLAGS},\
+    {"NEXT_PROTOCOL", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GPE_T_NEXT_PROTOCOL},\
+    {"RESERVED0", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GPE_T_RESERVED0},\
+    {"RESERVED1", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GPE_T_RESERVED1},\
+    {"VNI", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GPE_T_VNI},\
+    {"gpe_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GPE_T_FID_COUNT}
+
+/*!
+ * \name GRE_CHKSUM_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_CHKSUM_T_CHECKSUM 0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_CHKSUM_T_OFFSET   1
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT          2
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_CHKSUM_T_FIELD_NAME_MAP_INIT \
+    {"CHECKSUM", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_CHKSUM_T_CHECKSUM},\
+    {"OFFSET", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_CHKSUM_T_OFFSET},\
+    {"gre_chksum_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT}
+
+/*!
+ * \name GRE_KEY_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_KEY_T_KEY 0
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_KEY_T_FID_COUNT          1
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_KEY_T_FIELD_NAME_MAP_INIT \
+    {"KEY", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_KEY_T_KEY},\
+    {"gre_key_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_KEY_T_FID_COUNT}
+
+/*!
+ * \name GRE_ROUT_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_ROUT_T_ROUTING 0
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_ROUT_T_FID_COUNT          1
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_ROUT_T_FIELD_NAME_MAP_INIT \
+    {"ROUTING", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_ROUT_T_ROUTING},\
+    {"gre_rout_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_ROUT_T_FID_COUNT}
+
+/*!
+ * \name GRE_SEQ_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_SEQ_T_SEQUENCE 0
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_SEQ_T_FID_COUNT          1
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_SEQ_T_FIELD_NAME_MAP_INIT \
+    {"SEQUENCE", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_SEQ_T_SEQUENCE},\
+    {"gre_seq_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_SEQ_T_FID_COUNT}
+
+/*!
+ * \name GRE_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_T_C_R_K_S  0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_T_PROTOCOL 1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_T_RESERVED 2
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_T_VERSION  3
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_T_FID_COUNT          4
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_T_FIELD_NAME_MAP_INIT \
+    {"C_R_K_S", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_T_C_R_K_S},\
+    {"PROTOCOL", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_T_PROTOCOL},\
+    {"RESERVED", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_T_RESERVED},\
+    {"VERSION", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_T_VERSION},\
+    {"gre_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_T_FID_COUNT}
+
+/*!
+ * \name HOP_BY_HOP_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_HOP_BY_HOP_T_HDR_EXT_LEN 0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_HOP_BY_HOP_T_NEXT_HEADER 1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_HOP_BY_HOP_T_OPTION      2
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT          3
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_HOP_BY_HOP_T_FIELD_NAME_MAP_INIT \
+    {"HDR_EXT_LEN", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_HOP_BY_HOP_T_HDR_EXT_LEN},\
+    {"NEXT_HEADER", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_HOP_BY_HOP_T_NEXT_HEADER},\
+    {"OPTION", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_HOP_BY_HOP_T_OPTION},\
+    {"hop_by_hop_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT}
+
+/*!
+ * \name ICMP_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ICMP_T_CHECKSUM  0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ICMP_T_CODE      1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ICMP_T_ICMP_TYPE 2
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ICMP_T_FID_COUNT          3
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT \
+    {"CHECKSUM", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ICMP_T_CHECKSUM},\
+    {"CODE", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ICMP_T_CODE},\
+    {"ICMP_TYPE", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ICMP_T_ICMP_TYPE},\
+    {"icmp_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ICMP_T_FID_COUNT}
+
+/*!
+ * \name IFA_FLEX_MD_0_A_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_A_T_FWD_HDR_TTL   0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_A_T_LNS_DEVICE_ID 1
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT          2
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_A_T_FIELD_NAME_MAP_INIT \
+    {"FWD_HDR_TTL", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_A_T_FWD_HDR_TTL},\
+    {"LNS_DEVICE_ID", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_A_T_LNS_DEVICE_ID},\
+    {"ifa_flex_md_0_a_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT}
+
+/*!
+ * \name IFA_FLEX_MD_0_B_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_CN               0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_PORT_SPEED       1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_QUEUE_ID         2
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_RX_TIMESTAMP_SEC 3
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT          4
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_FIELD_NAME_MAP_INIT \
+    {"CN", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_CN},\
+    {"PORT_SPEED", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_PORT_SPEED},\
+    {"QUEUE_ID", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_QUEUE_ID},\
+    {"RX_TIMESTAMP_SEC", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_RX_TIMESTAMP_SEC},\
+    {"ifa_flex_md_0_b_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT}
+
+/*!
+ * \name IFA_FLEX_MD_1_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_1_T_EGRESS_PORT_ID       0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_1_T_INGRESS_PORT_ID      1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_1_T_RX_TIMESTAMP_NANOSEC 2
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT          3
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_1_T_FIELD_NAME_MAP_INIT \
+    {"EGRESS_PORT_ID", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_1_T_EGRESS_PORT_ID},\
+    {"INGRESS_PORT_ID", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_1_T_INGRESS_PORT_ID},\
+    {"RX_TIMESTAMP_NANOSEC", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_1_T_RX_TIMESTAMP_NANOSEC},\
+    {"ifa_flex_md_1_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT}
+
+/*!
+ * \name IFA_FLEX_MD_2_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_2_T_RESIDENCE_TIME_NANOSEC 0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_2_T_TX_QUEUE_BYTE_COUNT    1
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT          2
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_2_T_FIELD_NAME_MAP_INIT \
+    {"RESIDENCE_TIME_NANOSEC", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_2_T_RESIDENCE_TIME_NANOSEC},\
+    {"TX_QUEUE_BYTE_COUNT", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_2_T_TX_QUEUE_BYTE_COUNT},\
+    {"ifa_flex_md_2_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT}
+
+/*!
+ * \name IFA_FLEX_MD_3_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_3_T_MMU_STAT_0 0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_3_T_MMU_STAT_1 1
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT          2
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_3_T_FIELD_NAME_MAP_INIT \
+    {"MMU_STAT_0", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_3_T_MMU_STAT_0},\
+    {"MMU_STAT_1", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_3_T_MMU_STAT_1},\
+    {"ifa_flex_md_3_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT}
+
+/*!
+ * \name IFA_HEADER_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_HEADER_T_FLAGS      0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_HEADER_T_GNS        1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_HEADER_T_MAX_LENGTH 2
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_HEADER_T_NEXT_HDR   3
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_HEADER_T_VER        4
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_HEADER_T_FID_COUNT          5
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_HEADER_T_FIELD_NAME_MAP_INIT \
+    {"FLAGS", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_HEADER_T_FLAGS},\
+    {"GNS", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_HEADER_T_GNS},\
+    {"MAX_LENGTH", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_HEADER_T_MAX_LENGTH},\
+    {"NEXT_HDR", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_HEADER_T_NEXT_HDR},\
+    {"VER", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_HEADER_T_VER},\
+    {"ifa_header_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_HEADER_T_FID_COUNT}
+
+/*!
+ * \name IFA_MD_BASE_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_MD_BASE_T_ACTION_VECTOR            0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_MD_BASE_T_HOP_LIMIT_CURRENT_LENGTH 1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_MD_BASE_T_REQUEST_VECTOR           2
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_MD_BASE_T_FID_COUNT          3
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_MD_BASE_T_FIELD_NAME_MAP_INIT \
+    {"ACTION_VECTOR", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_MD_BASE_T_ACTION_VECTOR},\
+    {"HOP_LIMIT_CURRENT_LENGTH", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_MD_BASE_T_HOP_LIMIT_CURRENT_LENGTH},\
+    {"REQUEST_VECTOR", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_MD_BASE_T_REQUEST_VECTOR},\
+    {"ifa_md_base_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_MD_BASE_T_FID_COUNT}
+
+/*!
+ * \name IFA_METADATA_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_METADATA_T_ACTION_VECTOR            0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_METADATA_T_HOP_LIMIT_CURRENT_LENGTH 1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_METADATA_T_METADATA                 2
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_METADATA_T_REQUEST_VECTOR           3
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_METADATA_T_FID_COUNT          4
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_METADATA_T_FIELD_NAME_MAP_INIT \
+    {"ACTION_VECTOR", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_METADATA_T_ACTION_VECTOR},\
+    {"HOP_LIMIT_CURRENT_LENGTH", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_METADATA_T_HOP_LIMIT_CURRENT_LENGTH},\
+    {"METADATA", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_METADATA_T_METADATA},\
+    {"REQUEST_VECTOR", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_METADATA_T_REQUEST_VECTOR},\
+    {"ifa_metadata_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_METADATA_T_FID_COUNT}
+
+/*!
+ * \name IGMP_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IGMP_T_CHECKSUM      0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IGMP_T_GROUP_ADDRESS 1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IGMP_T_IGMP_TYPE     2
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IGMP_T_MAX_RESP_TIME 3
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IGMP_T_FID_COUNT          4
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IGMP_T_FIELD_NAME_MAP_INIT \
+    {"CHECKSUM", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IGMP_T_CHECKSUM},\
+    {"GROUP_ADDRESS", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IGMP_T_GROUP_ADDRESS},\
+    {"IGMP_TYPE", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IGMP_T_IGMP_TYPE},\
+    {"MAX_RESP_TIME", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IGMP_T_MAX_RESP_TIME},\
+    {"igmp_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IGMP_T_FID_COUNT}
+
+/*!
+ * \name IPFIX_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPFIX_T_EXPORT_TIME   0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPFIX_T_LENGTH        1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPFIX_T_OBS_DOMAIN_ID 2
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPFIX_T_SEQUENCE_NUM  3
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPFIX_T_VERSION       4
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPFIX_T_FID_COUNT          5
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT \
+    {"EXPORT_TIME", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPFIX_T_EXPORT_TIME},\
+    {"LENGTH", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPFIX_T_LENGTH},\
+    {"OBS_DOMAIN_ID", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPFIX_T_OBS_DOMAIN_ID},\
+    {"SEQUENCE_NUM", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPFIX_T_SEQUENCE_NUM},\
+    {"VERSION", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPFIX_T_VERSION},\
+    {"ipfix_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPFIX_T_FID_COUNT}
+
+/*!
+ * \name IPV4_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_DA                0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET 1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_HDR_CHECKSUM      2
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_ID                3
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_OPTION            4
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_PROTOCOL          5
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_SA                6
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_TOS               7
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_TOTAL_LENGTH      8
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_TTL               9
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_VERSION_HDR_LEN   10
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_FID_COUNT          11
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT \
+    {"DA", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_DA},\
+    {"FLAGS_FRAG_OFFSET", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET},\
+    {"HDR_CHECKSUM", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_HDR_CHECKSUM},\
+    {"ID", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_ID},\
+    {"OPTION", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_OPTION},\
+    {"PROTOCOL", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_PROTOCOL},\
+    {"SA", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_SA},\
+    {"TOS", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_TOS},\
+    {"TOTAL_LENGTH", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_TOTAL_LENGTH},\
+    {"TTL", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_TTL},\
+    {"VERSION_HDR_LEN", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_VERSION_HDR_LEN},\
+    {"ipv4_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_FID_COUNT}
+
+/*!
+ * \name IPV6_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_DA             0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_FLOW_LABEL     1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_HOP_LIMIT      2
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_NEXT_HEADER    3
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_PAYLOAD_LENGTH 4
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_SA             5
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_TRAFFIC_CLASS  6
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_VERSION        7
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_FID_COUNT          8
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT \
+    {"DA", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_DA},\
+    {"FLOW_LABEL", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_FLOW_LABEL},\
+    {"HOP_LIMIT", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_HOP_LIMIT},\
+    {"NEXT_HEADER", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_NEXT_HEADER},\
+    {"PAYLOAD_LENGTH", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_PAYLOAD_LENGTH},\
+    {"SA", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_SA},\
+    {"TRAFFIC_CLASS", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_TRAFFIC_CLASS},\
+    {"VERSION", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_VERSION},\
+    {"ipv6_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_FID_COUNT}
+
+/*!
+ * \name L2_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_L2_T_MACDA 0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_L2_T_MACSA 1
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_L2_T_FID_COUNT          2
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_L2_T_FIELD_NAME_MAP_INIT \
+    {"MACDA", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_L2_T_MACDA},\
+    {"MACSA", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_L2_T_MACSA},\
+    {"l2_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_L2_T_FID_COUNT}
+
+/*!
+ * \name MIRROR_ERSPAN_SN_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM 0
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT          1
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT \
+    {"SEQ_NUM", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM},\
+    {"mirror_erspan_sn_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT}
+
+/*!
+ * \name MIRROR_TRANSPORT_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T_DATA 0
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT          1
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT \
+    {"DATA", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T_DATA},\
+    {"mirror_transport_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT}
+
+/*!
+ * \name MPLS_ACH_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_ACH_T_CHANNEL_TYPE 0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_ACH_T_CW_TYPE      1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_ACH_T_RESERVED     2
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_ACH_T_VERSION      3
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_ACH_T_FID_COUNT          4
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_ACH_T_FIELD_NAME_MAP_INIT \
+    {"CHANNEL_TYPE", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_ACH_T_CHANNEL_TYPE},\
+    {"CW_TYPE", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_ACH_T_CW_TYPE},\
+    {"RESERVED", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_ACH_T_RESERVED},\
+    {"VERSION", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_ACH_T_VERSION},\
+    {"mpls_ach_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_ACH_T_FID_COUNT}
+
+/*!
+ * \name MPLS_BV_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_BV_T_VALUE 0
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_BV_T_FID_COUNT          1
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_BV_T_FIELD_NAME_MAP_INIT \
+    {"VALUE", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_BV_T_VALUE},\
+    {"mpls_bv_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_BV_T_FID_COUNT}
+
+/*!
+ * \name MPLS_CW_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_CW_T_CW_TYPE    0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_CW_T_RESERVED   1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_CW_T_SEQ_NUMBER 2
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_CW_T_FID_COUNT          3
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_CW_T_FIELD_NAME_MAP_INIT \
+    {"CW_TYPE", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_CW_T_CW_TYPE},\
+    {"RESERVED", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_CW_T_RESERVED},\
+    {"SEQ_NUMBER", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_CW_T_SEQ_NUMBER},\
+    {"mpls_cw_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_CW_T_FID_COUNT}
+
+/*!
+ * \name MPLS_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_T_BOS   0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_T_EXP   1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_T_LABEL 2
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_T_TTL   3
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_T_FID_COUNT          4
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_T_FIELD_NAME_MAP_INIT \
+    {"BOS", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_T_BOS},\
+    {"EXP", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_T_EXP},\
+    {"LABEL", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_T_LABEL},\
+    {"TTL", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_T_TTL},\
+    {"mpls_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_T_FID_COUNT}
+
+/*!
+ * \name P_1588_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_CNTRL          0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_CORRECTION     1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_DOMAIN_NB      2
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_FLAGS          3
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_LOGMSGINTERVAL 4
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_MSG_LENGTH     5
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_MSG_TYPE       6
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_RESERVED1      7
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_RESERVED2      8
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_RESERVED3      9
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_SEQ_ID         10
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_SRCPORTID      11
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_TRANSPORTSPEC  12
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_VERSION        13
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_FID_COUNT          14
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_FIELD_NAME_MAP_INIT \
+    {"CNTRL", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_CNTRL},\
+    {"CORRECTION", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_CORRECTION},\
+    {"DOMAIN_NB", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_DOMAIN_NB},\
+    {"FLAGS", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_FLAGS},\
+    {"LOGMSGINTERVAL", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_LOGMSGINTERVAL},\
+    {"MSG_LENGTH", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_MSG_LENGTH},\
+    {"MSG_TYPE", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_MSG_TYPE},\
+    {"RESERVED1", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_RESERVED1},\
+    {"RESERVED2", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_RESERVED2},\
+    {"RESERVED3", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_RESERVED3},\
+    {"SEQ_ID", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_SEQ_ID},\
+    {"SRCPORTID", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_SRCPORTID},\
+    {"TRANSPORTSPEC", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_TRANSPORTSPEC},\
+    {"VERSION", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_VERSION},\
+    {"p_1588_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_FID_COUNT}
+
+/*!
+ * \name PROG_EXT_HDR_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PROG_EXT_HDR_T_HDR_EXT_LEN 0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PROG_EXT_HDR_T_NEXT_HEADER 1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PROG_EXT_HDR_T_OPTION      2
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT          3
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PROG_EXT_HDR_T_FIELD_NAME_MAP_INIT \
+    {"HDR_EXT_LEN", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PROG_EXT_HDR_T_HDR_EXT_LEN},\
+    {"NEXT_HEADER", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PROG_EXT_HDR_T_NEXT_HEADER},\
+    {"OPTION", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PROG_EXT_HDR_T_OPTION},\
+    {"prog_ext_hdr_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_0_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T_FLOWSET        0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T_LENGTH         1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T_NEXT_HOP_INDEX 2
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T_OBS_TIME_NS    3
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T_OBS_TIME_S     4
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T_TEMPLATE_ID    5
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T_FID_COUNT          6
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T_FIELD_NAME_MAP_INIT \
+    {"FLOWSET", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T_FLOWSET},\
+    {"LENGTH", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T_LENGTH},\
+    {"NEXT_HOP_INDEX", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T_NEXT_HOP_INDEX},\
+    {"OBS_TIME_NS", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T_OBS_TIME_NS},\
+    {"OBS_TIME_S", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T_OBS_TIME_S},\
+    {"TEMPLATE_ID", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T_TEMPLATE_ID},\
+    {"psamp_0_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_1_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_DLB_ID         0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_EGRESS_PORT    1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_EPOCH          2
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_INGRESS_PORT   3
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_SAMPLED_LENGTH 4
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_USER_META_DATA 5
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_VARIABLE_FLAG  6
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_FID_COUNT          7
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_FIELD_NAME_MAP_INIT \
+    {"DLB_ID", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_DLB_ID},\
+    {"EGRESS_PORT", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_EGRESS_PORT},\
+    {"EPOCH", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_EPOCH},\
+    {"INGRESS_PORT", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_INGRESS_PORT},\
+    {"SAMPLED_LENGTH", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_SAMPLED_LENGTH},\
+    {"USER_META_DATA", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_USER_META_DATA},\
+    {"VARIABLE_FLAG", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_VARIABLE_FLAG},\
+    {"psamp_1_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_MIRROR_ON_DROP_0_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT 0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT    1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH          2
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS     3
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S      4
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID       5
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID     6
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT          7
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT \
+    {"EGRESS_MOD_PORT", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT},\
+    {"INGRESS_PORT", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT},\
+    {"LENGTH", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH},\
+    {"OBS_TIME_NS", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS},\
+    {"OBS_TIME_S", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S},\
+    {"SWITCH_ID", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID},\
+    {"TEMPLATE_ID", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID},\
+    {"psamp_mirror_on_drop_0_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_MIRROR_ON_DROP_3_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_DROP_REASON             0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_MOD_STATE               1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_RESERVED_0              2
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SAMPLED_LENGTH          3
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_UC_COS__COLOR__PROB_IDX 4
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_USER_META_DATA          5
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_VAR_LEN_INDICATOR       6
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT          7
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FIELD_NAME_MAP_INIT \
+    {"DROP_REASON", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_DROP_REASON},\
+    {"MOD_STATE", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_MOD_STATE},\
+    {"RESERVED_0", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_RESERVED_0},\
+    {"SAMPLED_LENGTH", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SAMPLED_LENGTH},\
+    {"UC_COS__COLOR__PROB_IDX", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_UC_COS__COLOR__PROB_IDX},\
+    {"USER_META_DATA", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_USER_META_DATA},\
+    {"VAR_LEN_INDICATOR", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_VAR_LEN_INDICATOR},\
+    {"psamp_mirror_on_drop_3_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT}
+
+/*!
+ * \name RARP_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_HARDWARE_LEN  0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_HARDWARE_TYPE 1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_OPERATION     2
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_PROT_ADDR_LEN 3
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_PROTOCOL_TYPE 4
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_SENDER_HA     5
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_SENDER_IP     6
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_TARGET_HA     7
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_TARGET_IP     8
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_FID_COUNT          9
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT \
+    {"HARDWARE_LEN", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_HARDWARE_LEN},\
+    {"HARDWARE_TYPE", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_HARDWARE_TYPE},\
+    {"OPERATION", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_OPERATION},\
+    {"PROT_ADDR_LEN", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_PROT_ADDR_LEN},\
+    {"PROTOCOL_TYPE", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_PROTOCOL_TYPE},\
+    {"SENDER_HA", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_SENDER_HA},\
+    {"SENDER_IP", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_SENDER_IP},\
+    {"TARGET_HA", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_TARGET_HA},\
+    {"TARGET_IP", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_TARGET_IP},\
+    {"rarp_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_FID_COUNT}
+
+/*!
+ * \name ROUTING_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ROUTING_T_DATA          0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ROUTING_T_HDR_EXT_LEN   1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ROUTING_T_NEXT_HEADER   2
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ROUTING_T_ROUTING_TYPE  3
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ROUTING_T_SEGMENTS_LEFT 4
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ROUTING_T_FID_COUNT          5
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ROUTING_T_FIELD_NAME_MAP_INIT \
+    {"DATA", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ROUTING_T_DATA},\
+    {"HDR_EXT_LEN", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ROUTING_T_HDR_EXT_LEN},\
+    {"NEXT_HEADER", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ROUTING_T_NEXT_HEADER},\
+    {"ROUTING_TYPE", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ROUTING_T_ROUTING_TYPE},\
+    {"SEGMENTS_LEFT", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ROUTING_T_SEGMENTS_LEFT},\
+    {"routing_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ROUTING_T_FID_COUNT}
+
+/*!
+ * \name RSPAN_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RSPAN_T_TAG  0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RSPAN_T_TPID 1
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RSPAN_T_FID_COUNT          2
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RSPAN_T_FIELD_NAME_MAP_INIT \
+    {"TAG", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RSPAN_T_TAG},\
+    {"TPID", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RSPAN_T_TPID},\
+    {"rspan_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RSPAN_T_FID_COUNT}
+
+/*!
+ * \name SFLOW_SHIM_0_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_0_T_SYS_DESTINATION 0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_0_T_SYS_SOURCE      1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_0_T_VERSION         2
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT          3
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_0_T_FIELD_NAME_MAP_INIT \
+    {"SYS_DESTINATION", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_0_T_SYS_DESTINATION},\
+    {"SYS_SOURCE", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_0_T_SYS_SOURCE},\
+    {"VERSION", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_0_T_VERSION},\
+    {"sflow_shim_0_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT}
+
+/*!
+ * \name SFLOW_SHIM_1_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DEST_SAMPLE 0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DISCARDED   1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_FLEX_SAMPLE 2
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_MCAST       3
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_SRC_SAMPLE  4
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_TRUNCATED   5
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_RESERVED         6
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_SYS_OPCODE       7
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT          8
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_FIELD_NAME_MAP_INIT \
+    {"FLAG_DEST_SAMPLE", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DEST_SAMPLE},\
+    {"FLAG_DISCARDED", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DISCARDED},\
+    {"FLAG_FLEX_SAMPLE", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_FLEX_SAMPLE},\
+    {"FLAG_MCAST", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_MCAST},\
+    {"FLAG_SRC_SAMPLE", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_SRC_SAMPLE},\
+    {"FLAG_TRUNCATED", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_TRUNCATED},\
+    {"RESERVED", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_RESERVED},\
+    {"SYS_OPCODE", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_SYS_OPCODE},\
+    {"sflow_shim_1_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT}
+
+/*!
+ * \name SFLOW_SHIM_2_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_2_T_SEQUENCE_NUM   0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_2_T_USER_META_DATA 1
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT          2
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_2_T_FIELD_NAME_MAP_INIT \
+    {"SEQUENCE_NUM", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_2_T_SEQUENCE_NUM},\
+    {"USER_META_DATA", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_2_T_USER_META_DATA},\
+    {"sflow_shim_2_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT}
+
+/*!
+ * \name SNAP_LLC_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SNAP_LLC_T_LENGTH   0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SNAP_LLC_T_SNAP_LLC 1
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SNAP_LLC_T_FID_COUNT          2
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SNAP_LLC_T_FIELD_NAME_MAP_INIT \
+    {"LENGTH", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SNAP_LLC_T_LENGTH},\
+    {"SNAP_LLC", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SNAP_LLC_T_SNAP_LLC},\
+    {"snap_llc_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SNAP_LLC_T_FID_COUNT}
+
+/*!
+ * \name TCP_FIRST_4BYTES_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT 0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT 1
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT          2
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT \
+    {"DST_PORT", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT},\
+    {"SRC_PORT", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT},\
+    {"tcp_first_4bytes_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT}
+
+/*!
+ * \name TCP_LAST_16BYTES_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM           0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM          1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS 2
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM           3
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR        4
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE          5
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT          6
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT \
+    {"ACK_NUM", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM},\
+    {"CHECKSUM", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM},\
+    {"HDR_LEN_AND_FLAGS", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS},\
+    {"SEQ_NUM", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM},\
+    {"URGENT_PTR", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR},\
+    {"WIN_SIZE", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE},\
+    {"tcp_last_16bytes_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT}
+
+/*!
+ * \name UDP_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UDP_T_CHECKSUM   0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UDP_T_DST_PORT   1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UDP_T_SRC_PORT   2
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UDP_T_UDP_LENGTH 3
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UDP_T_FID_COUNT          4
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT \
+    {"CHECKSUM", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UDP_T_CHECKSUM},\
+    {"DST_PORT", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UDP_T_DST_PORT},\
+    {"SRC_PORT", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UDP_T_SRC_PORT},\
+    {"UDP_LENGTH", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UDP_T_UDP_LENGTH},\
+    {"udp_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UDP_T_FID_COUNT}
+
+/*!
+ * \name UNKNOWN_L3_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD 0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD  1
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT          2
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT \
+    {"FIRST_16BYTES_OF_L3_PAYLOAD", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD},\
+    {"NEXT_16BYTES_OF_L3_PAYLOAD", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD},\
+    {"unknown_l3_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT}
+
+/*!
+ * \name UNKNOWN_L4_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD 0
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT          1
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT \
+    {"FIRST_4BYTES_OF_L4_PAYLOAD", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD},\
+    {"unknown_l4_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT}
+
+/*!
+ * \name UNKNOWN_L5_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1 0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3 1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7 2
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT          3
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT \
+    {"L5_BYTES_0_1", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1},\
+    {"L5_BYTES_2_3", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3},\
+    {"L5_BYTES_4_7", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7},\
+    {"unknown_l5_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT}
+
+/*!
+ * \name VLAN_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VLAN_T_CFI  0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VLAN_T_PCP  1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VLAN_T_TPID 2
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VLAN_T_VID  3
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VLAN_T_FID_COUNT          4
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT \
+    {"CFI", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VLAN_T_CFI},\
+    {"PCP", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VLAN_T_PCP},\
+    {"TPID", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VLAN_T_TPID},\
+    {"VID", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VLAN_T_VID},\
+    {"vlan_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VLAN_T_FID_COUNT}
+
+/*!
+ * \name VNTAG_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VNTAG_T_TAG  0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VNTAG_T_TPID 1
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VNTAG_T_FID_COUNT          2
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VNTAG_T_FIELD_NAME_MAP_INIT \
+    {"TAG", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VNTAG_T_TAG},\
+    {"TPID", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VNTAG_T_TPID},\
+    {"vntag_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VNTAG_T_FID_COUNT}
+
+/*!
+ * \name VXLAN_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VXLAN_T_FLAGS_RESERVED_1 0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VXLAN_T_RESERVED2        1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VXLAN_T_VN_ID            2
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VXLAN_T_FID_COUNT          3
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT \
+    {"FLAGS_RESERVED_1", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VXLAN_T_FLAGS_RESERVED_1},\
+    {"RESERVED2", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VXLAN_T_RESERVED2},\
+    {"VN_ID", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VXLAN_T_VN_ID},\
+    {"vxlan_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VXLAN_T_FID_COUNT}
+
+/*!
+ * \name WESP_T field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_FLAGS       0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_HEADER_LEN  1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_NEXT_HEADER 2
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_SEQ_NUM     3
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_SPI         4
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_TRAILER_LEN 5
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_WESP_IV     6
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_FID_COUNT          7
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_FIELD_NAME_MAP_INIT \
+    {"FLAGS", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_FLAGS},\
+    {"HEADER_LEN", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_HEADER_LEN},\
+    {"NEXT_HEADER", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_NEXT_HEADER},\
+    {"SEQ_NUM", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_SEQ_NUM},\
+    {"SPI", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_SPI},\
+    {"TRAILER_LEN", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_TRAILER_LEN},\
+    {"WESP_IV", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_WESP_IV},\
+    {"wesp_t fid count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_FID_COUNT}
+
+
+#endif /* BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_FLEXHDR_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_bcmpkt_rxpmd_flex_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_bcmpkt_rxpmd_flex_data.h
new file mode 100644
index 000000000000..fc2a9c06291d
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_bcmpkt_rxpmd_flex_data.h
@@ -0,0 +1,165 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) map.yml.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_DATA_H
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_DATA_H
+
+/*!
+ * \name RX flex metadata field IDs.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_DLB_ECMP_DESTINATION_15_0                      0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0                                 1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_DVP_15_0                                       2
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_7_0                              3
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EM_FT_OPAQUE_OBJ_OR_IFP_OPAQUE_OBJ_15_0        4
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_HIGH_3_0                         5
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0                         6
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_0                        7
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32                       8
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0                              9
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_IFP_IOAM_GBP_ACTION_3_0                        10
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_IFP_TS_CONTROL_ACTION_3_0                      11
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_ING_PORT_GROUP_ID_3_0_3_0                      12
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_ING_PORT_GROUP_ID_7_4_3_0                      13
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_0                             14
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_INGRESS_PP_PORT_ITAG_PRESERVE_15_0             15
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0 16
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0                    17
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_INT_PRI_3_0                                    18
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_L2_IIF_10_0                                    19
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_L2_OIF_10_0                                    20
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_L3_IIF_13_0                                    21
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0                                  22
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0              23
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_15_0                              24
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0                            25
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0                            26
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_SVP_15_0                                       27
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0                   28
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0                        29
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0                              30
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_SYSTEM_SOURCE_15_0                             31
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_TIMESTAMP_CTRL_3_0                             32
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0                33
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_VFI_15_0                                       34
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_FID_COUNT                       35
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_COUNT                    42
+
+/*!
+ * \name Packet Flex Reason Types.
+ */
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE                         0
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS                               1
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED 2
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED  3
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP                                  4
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT                                   5
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP                                     6
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER                               7
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED      8
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT                                   9
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP                           10
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS                      11
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE                      12
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP                           13
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS                      14
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR                            15
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF                        16
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR                            17
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL                        18
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD                    19
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0                      20
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1                      21
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2                      22
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3                      23
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4                      24
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5                      25
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6                      26
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7                      27
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD            28
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED              29
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED                  30
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU                    31
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU                          32
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED              33
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT                            34
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_RESERVED_TRACE_BIT                      35
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP                                36
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD         37
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_SVP                                     38
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP                               39
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED                       40
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_VFP                                     41
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT \
+    {"CB_STATION_MOVE", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE},\
+    {"CML_FLAGS", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS},\
+    {"DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED},\
+    {"DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED},\
+    {"DST_FP", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP},\
+    {"EM_FT", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT},\
+    {"IFP", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP},\
+    {"IFP_METER", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER},\
+    {"IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED},\
+    {"IVXLT", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT},\
+    {"L2_DST_LOOKUP", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP},\
+    {"L2_DST_LOOKUP_MISS", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS},\
+    {"L2_SRC_STATIC_MOVE", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE},\
+    {"L3_DST_LOOKUP", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP},\
+    {"L3_DST_LOOKUP_MISS", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS},\
+    {"L3_HDR_ERROR", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR},\
+    {"L3_IIF_EQ_L3_OIF", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF},\
+    {"L3_TTL_ERROR", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR},\
+    {"LEARN_CACHE_FULL", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL},\
+    {"MACSA_MULTICAST_RSVD", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD},\
+    {"MATCHED_RULE_BIT_0", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0},\
+    {"MATCHED_RULE_BIT_1", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1},\
+    {"MATCHED_RULE_BIT_2", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2},\
+    {"MATCHED_RULE_BIT_3", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3},\
+    {"MATCHED_RULE_BIT_4", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4},\
+    {"MATCHED_RULE_BIT_5", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5},\
+    {"MATCHED_RULE_BIT_6", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6},\
+    {"MATCHED_RULE_BIT_7", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7},\
+    {"MEMBERSHIP_CHECK_FAILED_RSVD", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD},\
+    {"MIRROR_SAMPLER_EGR_SAMPLED", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED},\
+    {"MIRROR_SAMPLER_SAMPLED", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED},\
+    {"MPLS_CTRL_PKT_TO_CPU", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU},\
+    {"NO_COPY_TO_CPU", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU},\
+    {"PKT_INTEGRITY_CHECK_FAILED", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED},\
+    {"PROTOCOL_PKT", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT},\
+    {"RESERVED_TRACE_BIT", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_RESERVED_TRACE_BIT},\
+    {"SER_DROP", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP},\
+    {"SPANNING_TREE_CHECK_FAILED_RSVD", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD},\
+    {"SVP", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_SVP},\
+    {"TRACE_DOP", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP},\
+    {"URPF_CHECK_FAILED", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED},\
+    {"VFP", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_VFP},\
+    {"flex reason count", BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_COUNT}
+
+#endif /* BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_bcmpkt_rxpmd_match_id_defs.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_bcmpkt_rxpmd_match_id_defs.h
new file mode 100644
index 000000000000..486c0ae55440
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_bcmpkt_rxpmd_match_id_defs.h
@@ -0,0 +1,395 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) bcm56880_a0_hna_6_5_31_3_0_sf_match_id_info.yml
+ * for device bcm56880_a0 and variant hna_6_5_31_3_0.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H
+
+#include <bcmpkt/bcmpkt_rxpmd_match_id.h>
+
+/*!
+ * \brief Get the Match ID DataBase information.
+ *
+ * \retval bcmpkt_rxpmd_match_id_db_info_t Match ID DataBase information.
+*/
+extern bcmpkt_rxpmd_match_id_db_info_t *
+    bcm56880_a0_hna_6_5_31_3_0_rxpmd_match_id_db_info_get(void);
+
+/*!
+ * \brief Get the Match ID Mapping information.
+ *
+ * \retval bcmpkt_rxpmd_match_id_map_info_t Match ID Mapping information.
+*/
+extern bcmpkt_rxpmd_match_id_map_info_t *
+    bcm56880_a0_hna_6_5_31_3_0_rxpmd_match_id_map_info_get(void);
+
+/*!
+  \name RXPMD Match IDs
+*/
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ETAG  0
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG  1
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2  2
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE  3
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG  4
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC  5
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_VNTAG  6
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP  7
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1  8
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2  9
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD  10
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT  11
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE  12
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1  13
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2  14
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE  15
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE  16
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM  17
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY  18
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT  19
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ  20
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP  21
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA  22
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP  23
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4  24
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6  25
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0  26
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1  27
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2  28
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3  29
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4  30
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5  31
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6  32
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH  33
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW  34
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE  35
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588  36
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP  37
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES  38
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES  39
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP  40
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3  41
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4  42
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5  43
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN  44
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK  45
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE  46
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ETAG  47
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG  48
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2  49
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE  50
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG  51
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC  52
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_VNTAG  53
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP  54
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1  55
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2  56
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD  57
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT  58
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE  59
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1  60
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2  61
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE  62
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE  63
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM  64
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY  65
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT  66
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ  67
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP  68
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA  69
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP  70
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4  71
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6  72
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0  73
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1  74
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2  75
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3  76
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4  77
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5  78
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6  79
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH  80
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW  81
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE  82
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588  83
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP  84
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES  85
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES  86
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP  87
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3  88
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4  89
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5  90
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN  91
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ETAG  92
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG  93
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2  94
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE  95
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG  96
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC  97
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_VNTAG  98
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP  99
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1  100
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2  101
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD  102
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT  103
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE  104
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1  105
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2  106
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP  107
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA  108
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP  109
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4  110
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6  111
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE  112
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588  113
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP  114
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES  115
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES  116
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP  117
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3  118
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4  119
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5  120
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ETAG  121
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG  122
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2  123
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE  124
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG  125
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC  126
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_VNTAG  127
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP  128
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1  129
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2  130
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD  131
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT  132
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE  133
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1  134
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2  135
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE  136
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE  137
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM  138
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY  139
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT  140
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ  141
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP  142
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA  143
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP  144
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4  145
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6  146
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0  147
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1  148
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2  149
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3  150
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4  151
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5  152
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6  153
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH  154
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW  155
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE  156
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588  157
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP  158
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES  159
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES  160
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP  161
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3  162
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4  163
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5  164
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN  165
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK  166
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE  167
+#define BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_COUNT  168
+
+#define BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT \
+    {"EGRESS_PKT_FWD_L2_HDR_ETAG", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ETAG}, \
+    {"EGRESS_PKT_FWD_L2_HDR_ITAG", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG}, \
+    {"EGRESS_PKT_FWD_L2_HDR_L2", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2}, \
+    {"EGRESS_PKT_FWD_L2_HDR_NONE", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE}, \
+    {"EGRESS_PKT_FWD_L2_HDR_OTAG", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG}, \
+    {"EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC}, \
+    {"EGRESS_PKT_FWD_L2_HDR_VNTAG", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_VNTAG}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ARP", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_BFD", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GPE", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ICMP", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IGMP", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV4", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV6", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS0", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS1", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS2", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS3", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS4", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS5", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS6", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_NONE", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_P_1588", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_RARP", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UDP", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_VXLAN", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN}, \
+    {"EGRESS_PKT_SYS_HDR_LOOPBACK", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK}, \
+    {"EGRESS_PKT_SYS_HDR_NONE", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_ETAG", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ETAG}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_ITAG", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_L2", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_NONE", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_OTAG", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_VNTAG", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_VNTAG}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN}, \
+    {"INGRESS_PKT_INNER_L2_HDR_ETAG", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ETAG}, \
+    {"INGRESS_PKT_INNER_L2_HDR_ITAG", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG}, \
+    {"INGRESS_PKT_INNER_L2_HDR_L2", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2}, \
+    {"INGRESS_PKT_INNER_L2_HDR_NONE", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE}, \
+    {"INGRESS_PKT_INNER_L2_HDR_OTAG", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG}, \
+    {"INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC}, \
+    {"INGRESS_PKT_INNER_L2_HDR_VNTAG", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_VNTAG}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ARP", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_BFD", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ICMP", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_IGMP", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV4", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV6", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_NONE", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_P_1588", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_RARP", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UDP", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_ETAG", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ETAG}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_ITAG", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_L2", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_NONE", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_OTAG", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_VNTAG", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_VNTAG}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ARP", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_BFD", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GPE", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ICMP", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IGMP", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV4", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV6", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_NONE", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_P_1588", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_RARP", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UDP", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN}, \
+    {"INGRESS_PKT_SYS_HDR_LOOPBACK", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK}, \
+    {"INGRESS_PKT_SYS_HDR_NONE", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE}, \
+    {"rxpmd_match_id_count", BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_COUNT}
+
+#endif /*! BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_bcmpkt_flexhdr.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_bcmpkt_flexhdr.h
deleted file mode 100644
index 4b40b1429389..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_bcmpkt_flexhdr.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) header.yml.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_FLEXHDR_H
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_FLEXHDR_H
-
-#include <bcmpkt/bcmpkt_flexhdr_internal.h>
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ARP_T                      0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_AUTHEN_T                   1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T                      2
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T         3
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T         4
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_DEST_OPTION_T              5
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T        6
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_SUBHDR_5_T         7
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ESP_T                      8
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ETAG_T                     9
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ETHERTYPE_T                10
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_FRAG_T                     11
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T         12
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GPE_T                      13
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_CHKSUM_T               14
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_KEY_T                  15
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_ROUT_T                 16
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_SEQ_T                  17
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_T                      18
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_12BYTE_T               19
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_8BYTE_T                20
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_EXT_4BYTE_T            21
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_WITH_EXT_T             22
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_HOP_BY_HOP_T               23
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ICMP_T                     24
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IGMP_T                     25
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPFIX_T                    26
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV4_T                     27
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV6_T                     28
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_L2_T                       29
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MIRROR_ERSPAN_SN_T         30
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MIRROR_TRANSPORT_T         31
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_ACH_T                 32
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_BV_T                  33
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_CW_T                  34
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_T                     35
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_OPAQUETAG_T                36
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_P_1588_T                   37
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PROG_EXT_HDR_T             38
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_0_T                  39
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_1_T                  40
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T   41
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T   42
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RARP_T                     43
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ROUTING_T                  44
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RSPAN_T                    45
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_0_T             46
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T             47
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_2_T             48
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SNAP_LLC_T                 49
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_TCP_FIRST_4BYTES_T         50
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T         51
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UDP_T                      52
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L3_T               53
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L4_T               54
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L5_T               55
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VLAN_T                     56
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VNTAG_T                    57
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VXLAN_T                    58
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_WESP_T                     59
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_T               60
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_FLEXHDR_COUNT    61
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_FLEXHDR_NAME_MAP_INIT \
-    {"arp_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ARP_T},\
-    {"authen_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_AUTHEN_T},\
-    {"bfd_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T},\
-    {"cpu_composites_0_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T},\
-    {"cpu_composites_1_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T},\
-    {"dest_option_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_DEST_OPTION_T},\
-    {"erspan3_fixed_hdr_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T},\
-    {"erspan3_subhdr_5_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_SUBHDR_5_T},\
-    {"esp_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ESP_T},\
-    {"etag_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ETAG_T},\
-    {"ethertype_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ETHERTYPE_T},\
-    {"frag_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_FRAG_T},\
-    {"generic_loopback_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T},\
-    {"gpe_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GPE_T},\
-    {"gre_chksum_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_CHKSUM_T},\
-    {"gre_key_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_KEY_T},\
-    {"gre_rout_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_ROUT_T},\
-    {"gre_seq_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_SEQ_T},\
-    {"gre_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_T},\
-    {"gtp_12byte_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_12BYTE_T},\
-    {"gtp_8byte_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_8BYTE_T},\
-    {"gtp_ext_4byte_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_EXT_4BYTE_T},\
-    {"gtp_with_ext_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_WITH_EXT_T},\
-    {"hop_by_hop_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_HOP_BY_HOP_T},\
-    {"icmp_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ICMP_T},\
-    {"igmp_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IGMP_T},\
-    {"ipfix_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPFIX_T},\
-    {"ipv4_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV4_T},\
-    {"ipv6_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV6_T},\
-    {"l2_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_L2_T},\
-    {"mirror_erspan_sn_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MIRROR_ERSPAN_SN_T},\
-    {"mirror_transport_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MIRROR_TRANSPORT_T},\
-    {"mpls_ach_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_ACH_T},\
-    {"mpls_bv_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_BV_T},\
-    {"mpls_cw_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_CW_T},\
-    {"mpls_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_T},\
-    {"opaquetag_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_OPAQUETAG_T},\
-    {"p_1588_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_P_1588_T},\
-    {"prog_ext_hdr_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PROG_EXT_HDR_T},\
-    {"psamp_0_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_0_T},\
-    {"psamp_1_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_1_T},\
-    {"psamp_mirror_on_drop_0_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T},\
-    {"psamp_mirror_on_drop_1_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T},\
-    {"rarp_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RARP_T},\
-    {"routing_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ROUTING_T},\
-    {"rspan_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RSPAN_T},\
-    {"sflow_shim_0_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_0_T},\
-    {"sflow_shim_1_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T},\
-    {"sflow_shim_2_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_2_T},\
-    {"snap_llc_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SNAP_LLC_T},\
-    {"tcp_first_4bytes_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_TCP_FIRST_4BYTES_T},\
-    {"tcp_last_16bytes_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T},\
-    {"udp_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UDP_T},\
-    {"unknown_l3_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L3_T},\
-    {"unknown_l4_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L4_T},\
-    {"unknown_l5_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L5_T},\
-    {"vlan_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VLAN_T},\
-    {"vntag_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VNTAG_T},\
-    {"vxlan_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VXLAN_T},\
-    {"wesp_t", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_WESP_T},\
-    {"RXPMD_FLEX_T", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_T},\
-    {"flexhdr count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_FLEXHDR_COUNT}
-
-#endif /* BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_FLEXHDR_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_bcmpkt_flexhdr_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_bcmpkt_flexhdr_data.h
deleted file mode 100644
index 188725e0be5a..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_bcmpkt_flexhdr_data.h
+++ /dev/null
@@ -1,1152 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) header.yml.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_FLEXHDR_DATA_H
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_FLEXHDR_DATA_H
-
-/*!
- * \name ARP_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ARP_T_HARDWARE_LEN  0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ARP_T_HARDWARE_TYPE 1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ARP_T_OPERATION     2
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ARP_T_PROT_ADDR_LEN 3
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ARP_T_PROTOCOL_TYPE 4
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ARP_T_SENDER_HA     5
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ARP_T_SENDER_IP     6
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ARP_T_TARGET_HA     7
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ARP_T_TARGET_IP     8
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ARP_T_FID_COUNT          9
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT \
-    {"HARDWARE_LEN", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ARP_T_HARDWARE_LEN},\
-    {"HARDWARE_TYPE", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ARP_T_HARDWARE_TYPE},\
-    {"OPERATION", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ARP_T_OPERATION},\
-    {"PROT_ADDR_LEN", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ARP_T_PROT_ADDR_LEN},\
-    {"PROTOCOL_TYPE", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ARP_T_PROTOCOL_TYPE},\
-    {"SENDER_HA", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ARP_T_SENDER_HA},\
-    {"SENDER_IP", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ARP_T_SENDER_IP},\
-    {"TARGET_HA", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ARP_T_TARGET_HA},\
-    {"TARGET_IP", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ARP_T_TARGET_IP},\
-    {"arp_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ARP_T_FID_COUNT}
-
-/*!
- * \name AUTHEN_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_AUTHEN_T_DATA        0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_AUTHEN_T_NEXT_HEADER 1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_AUTHEN_T_PAYLOAD_LEN 2
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_AUTHEN_T_RESERVED    3
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_AUTHEN_T_SEQ_NUM     4
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_AUTHEN_T_SPI         5
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_AUTHEN_T_FID_COUNT          6
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_AUTHEN_T_FIELD_NAME_MAP_INIT \
-    {"DATA", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_AUTHEN_T_DATA},\
-    {"NEXT_HEADER", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_AUTHEN_T_NEXT_HEADER},\
-    {"PAYLOAD_LEN", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_AUTHEN_T_PAYLOAD_LEN},\
-    {"RESERVED", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_AUTHEN_T_RESERVED},\
-    {"SEQ_NUM", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_AUTHEN_T_SEQ_NUM},\
-    {"SPI", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_AUTHEN_T_SPI},\
-    {"authen_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_AUTHEN_T_FID_COUNT}
-
-/*!
- * \name BFD_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_AP            0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_BFD_LENGTH    1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_CPI           2
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_DEM           3
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_DESMINTXINTV  4
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_DETECTMULT    5
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_DIAG          6
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_FIN           7
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_MINECHORXINTV 8
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_MPT           9
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_MYDISCRIM     10
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_POLL          11
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_REQMINRXINTV  12
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_STA           13
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_URDISCRIM     14
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_VERSION       15
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_FID_COUNT          16
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_FIELD_NAME_MAP_INIT \
-    {"AP", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_AP},\
-    {"BFD_LENGTH", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_BFD_LENGTH},\
-    {"CPI", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_CPI},\
-    {"DEM", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_DEM},\
-    {"DESMINTXINTV", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_DESMINTXINTV},\
-    {"DETECTMULT", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_DETECTMULT},\
-    {"DIAG", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_DIAG},\
-    {"FIN", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_FIN},\
-    {"MINECHORXINTV", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_MINECHORXINTV},\
-    {"MPT", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_MPT},\
-    {"MYDISCRIM", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_MYDISCRIM},\
-    {"POLL", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_POLL},\
-    {"REQMINRXINTV", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_REQMINRXINTV},\
-    {"STA", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_STA},\
-    {"URDISCRIM", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_URDISCRIM},\
-    {"VERSION", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_VERSION},\
-    {"bfd_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_FID_COUNT}
-
-/*!
- * \name CPU_COMPOSITES_0_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0 0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1 1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2 2
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3 3
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4 4
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5 5
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6 6
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT          7
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT \
-    {"DMA_CONT0", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0},\
-    {"DMA_CONT1", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1},\
-    {"DMA_CONT2", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2},\
-    {"DMA_CONT3", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3},\
-    {"DMA_CONT4", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4},\
-    {"DMA_CONT5", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5},\
-    {"DMA_CONT6", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6},\
-    {"cpu_composites_0_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT}
-
-/*!
- * \name CPU_COMPOSITES_1_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10 0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11 1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12 2
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13 3
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14 4
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15 5
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16 6
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17 7
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7  8
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8  9
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9  10
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT          11
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT \
-    {"DMA_CONT10", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10},\
-    {"DMA_CONT11", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11},\
-    {"DMA_CONT12", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12},\
-    {"DMA_CONT13", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13},\
-    {"DMA_CONT14", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14},\
-    {"DMA_CONT15", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15},\
-    {"DMA_CONT16", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16},\
-    {"DMA_CONT17", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17},\
-    {"DMA_CONT7", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7},\
-    {"DMA_CONT8", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8},\
-    {"DMA_CONT9", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9},\
-    {"cpu_composites_1_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT}
-
-/*!
- * \name DEST_OPTION_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_DEST_OPTION_T_HDR_EXT_LEN 0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_DEST_OPTION_T_NEXT_HEADER 1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_DEST_OPTION_T_OPTION      2
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_DEST_OPTION_T_FID_COUNT          3
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_DEST_OPTION_T_FIELD_NAME_MAP_INIT \
-    {"HDR_EXT_LEN", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_DEST_OPTION_T_HDR_EXT_LEN},\
-    {"NEXT_HEADER", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_DEST_OPTION_T_NEXT_HEADER},\
-    {"OPTION", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_DEST_OPTION_T_OPTION},\
-    {"dest_option_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_DEST_OPTION_T_FID_COUNT}
-
-/*!
- * \name ERSPAN3_FIXED_HDR_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO               0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_COS               1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID           2
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O 3
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID        4
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_T                 5
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP         6
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_VER               7
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN              8
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT          9
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT \
-    {"BSO", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO},\
-    {"COS", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_COS},\
-    {"GBP_SID", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID},\
-    {"P_FT_HWID_D_GRA_O", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O},\
-    {"SESSION_ID", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID},\
-    {"T", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_T},\
-    {"TIMESTAMP", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP},\
-    {"VER", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_VER},\
-    {"VLAN", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN},\
-    {"erspan3_fixed_hdr_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT}
-
-/*!
- * \name ERSPAN3_SUBHDR_5_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID 0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID     1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID   2
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP   3
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT          4
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT \
-    {"PLATFORM_ID", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID},\
-    {"PORT_ID", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID},\
-    {"SWITCH_ID", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID},\
-    {"TIMESTAMP", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP},\
-    {"erspan3_subhdr_5_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT}
-
-/*!
- * \name ESP_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ESP_T_NEXT_HEADER 0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ESP_T_PAD         1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ESP_T_PAD_LEN     2
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ESP_T_SEQ_NUM     3
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ESP_T_SPI         4
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ESP_T_FID_COUNT          5
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ESP_T_FIELD_NAME_MAP_INIT \
-    {"NEXT_HEADER", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ESP_T_NEXT_HEADER},\
-    {"PAD", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ESP_T_PAD},\
-    {"PAD_LEN", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ESP_T_PAD_LEN},\
-    {"SEQ_NUM", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ESP_T_SEQ_NUM},\
-    {"SPI", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ESP_T_SPI},\
-    {"esp_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ESP_T_FID_COUNT}
-
-/*!
- * \name ETAG_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ETAG_T_PCP_DEI 0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ETAG_T_RSRVD0  1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ETAG_T_RSRVD1  2
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ETAG_T_SVID    3
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ETAG_T_TPID    4
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ETAG_T_VID     5
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ETAG_T_FID_COUNT          6
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ETAG_T_FIELD_NAME_MAP_INIT \
-    {"PCP_DEI", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ETAG_T_PCP_DEI},\
-    {"RSRVD0", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ETAG_T_RSRVD0},\
-    {"RSRVD1", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ETAG_T_RSRVD1},\
-    {"SVID", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ETAG_T_SVID},\
-    {"TPID", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ETAG_T_TPID},\
-    {"VID", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ETAG_T_VID},\
-    {"etag_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ETAG_T_FID_COUNT}
-
-/*!
- * \name ETHERTYPE_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ETHERTYPE_T_TYPE 0
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ETHERTYPE_T_FID_COUNT          1
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT \
-    {"TYPE", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ETHERTYPE_T_TYPE},\
-    {"ethertype_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ETHERTYPE_T_FID_COUNT}
-
-/*!
- * \name FRAG_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_FRAG_T_FRAG_INFO   0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_FRAG_T_ID          1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_FRAG_T_NEXT_HEADER 2
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_FRAG_T_RESERVED    3
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_FRAG_T_FID_COUNT          4
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_FRAG_T_FIELD_NAME_MAP_INIT \
-    {"FRAG_INFO", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_FRAG_T_FRAG_INFO},\
-    {"ID", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_FRAG_T_ID},\
-    {"NEXT_HEADER", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_FRAG_T_NEXT_HEADER},\
-    {"RESERVED", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_FRAG_T_RESERVED},\
-    {"frag_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_FRAG_T_FID_COUNT}
-
-/*!
- * \name GENERIC_LOOPBACK_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ    0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE   1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ        2
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_FLAGS              3
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE        4
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY     5
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL     6
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ      7
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0  8
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1  9
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ            10
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1         11
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_2         12
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT 13
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE         14
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT          15
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT \
-    {"DESTINATION_OBJ", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ},\
-    {"DESTINATION_TYPE", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE},\
-    {"ENTROPY_OBJ", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ},\
-    {"FLAGS", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_FLAGS},\
-    {"HEADER_TYPE", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE},\
-    {"INPUT_PRIORITY", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY},\
-    {"INTERFACE_CTRL", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL},\
-    {"INTERFACE_OBJ", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ},\
-    {"PROCESSING_CTRL_0", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0},\
-    {"PROCESSING_CTRL_1", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1},\
-    {"QOS_OBJ", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ},\
-    {"RESERVED_1", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1},\
-    {"RESERVED_2", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_2},\
-    {"SOURCE_SYSTEM_PORT", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT},\
-    {"START_BYTE", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE},\
-    {"generic_loopback_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT}
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NO_OP       0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2_OIF      1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED    2
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__VP          3
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP        4
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NHOP        5
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2MC_GROUP  6
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L3MC_GROUP  7
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED_1  8
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP_MEMBER 9
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__DEVICE_PORT 10
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_TYPE__TUNNEL  0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_TYPE__GENERIC 1
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__NOOP   0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__VFI    1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__L3_IIF 2
-
-/*!
- * \name GPE_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GPE_T_FLAGS         0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GPE_T_NEXT_PROTOCOL 1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GPE_T_RESERVED0     2
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GPE_T_RESERVED1     3
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GPE_T_VNI           4
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GPE_T_FID_COUNT          5
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GPE_T_FIELD_NAME_MAP_INIT \
-    {"FLAGS", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GPE_T_FLAGS},\
-    {"NEXT_PROTOCOL", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GPE_T_NEXT_PROTOCOL},\
-    {"RESERVED0", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GPE_T_RESERVED0},\
-    {"RESERVED1", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GPE_T_RESERVED1},\
-    {"VNI", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GPE_T_VNI},\
-    {"gpe_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GPE_T_FID_COUNT}
-
-/*!
- * \name GRE_CHKSUM_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_CHKSUM_T_CHECKSUM 0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_CHKSUM_T_OFFSET   1
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_CHKSUM_T_FID_COUNT          2
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_CHKSUM_T_FIELD_NAME_MAP_INIT \
-    {"CHECKSUM", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_CHKSUM_T_CHECKSUM},\
-    {"OFFSET", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_CHKSUM_T_OFFSET},\
-    {"gre_chksum_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_CHKSUM_T_FID_COUNT}
-
-/*!
- * \name GRE_KEY_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_KEY_T_VN_ID_LOWER_ENTROPY 0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_KEY_T_VN_ID_UPPER         1
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_KEY_T_FID_COUNT          2
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_KEY_T_FIELD_NAME_MAP_INIT \
-    {"VN_ID_LOWER_ENTROPY", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_KEY_T_VN_ID_LOWER_ENTROPY},\
-    {"VN_ID_UPPER", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_KEY_T_VN_ID_UPPER},\
-    {"gre_key_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_KEY_T_FID_COUNT}
-
-/*!
- * \name GRE_ROUT_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_ROUT_T_ROUTING 0
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_ROUT_T_FID_COUNT          1
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_ROUT_T_FIELD_NAME_MAP_INIT \
-    {"ROUTING", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_ROUT_T_ROUTING},\
-    {"gre_rout_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_ROUT_T_FID_COUNT}
-
-/*!
- * \name GRE_SEQ_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_SEQ_T_SEQUENCE 0
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_SEQ_T_FID_COUNT          1
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_SEQ_T_FIELD_NAME_MAP_INIT \
-    {"SEQUENCE", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_SEQ_T_SEQUENCE},\
-    {"gre_seq_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_SEQ_T_FID_COUNT}
-
-/*!
- * \name GRE_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_T_C_R_K_S  0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_T_PROTOCOL 1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_T_RESERVED 2
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_T_VERSION  3
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_T_FID_COUNT          4
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_T_FIELD_NAME_MAP_INIT \
-    {"C_R_K_S", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_T_C_R_K_S},\
-    {"PROTOCOL", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_T_PROTOCOL},\
-    {"RESERVED", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_T_RESERVED},\
-    {"VERSION", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_T_VERSION},\
-    {"gre_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_T_FID_COUNT}
-
-/*!
- * \name GTP_12BYTE_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_12BYTE_T_BYTES_11_8 0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_12BYTE_T_BYTES_3_0  1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_12BYTE_T_BYTES_7_4  2
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_12BYTE_T_FID_COUNT          3
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_12BYTE_T_FIELD_NAME_MAP_INIT \
-    {"BYTES_11_8", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_12BYTE_T_BYTES_11_8},\
-    {"BYTES_3_0", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_12BYTE_T_BYTES_3_0},\
-    {"BYTES_7_4", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_12BYTE_T_BYTES_7_4},\
-    {"gtp_12byte_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_12BYTE_T_FID_COUNT}
-
-/*!
- * \name GTP_8BYTE_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_8BYTE_T_BYTES_3_0 0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_8BYTE_T_BYTES_7_4 1
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_8BYTE_T_FID_COUNT          2
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_8BYTE_T_FIELD_NAME_MAP_INIT \
-    {"BYTES_3_0", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_8BYTE_T_BYTES_3_0},\
-    {"BYTES_7_4", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_8BYTE_T_BYTES_7_4},\
-    {"gtp_8byte_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_8BYTE_T_FID_COUNT}
-
-/*!
- * \name GTP_EXT_4BYTE_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_EXT_4BYTE_T_EXT_HDR 0
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_EXT_4BYTE_T_FID_COUNT          1
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_EXT_4BYTE_T_FIELD_NAME_MAP_INIT \
-    {"EXT_HDR", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_EXT_4BYTE_T_EXT_HDR},\
-    {"gtp_ext_4byte_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_EXT_4BYTE_T_FID_COUNT}
-
-/*!
- * \name GTP_WITH_EXT_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_WITH_EXT_T_BYTES_11_8 0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_WITH_EXT_T_BYTES_3_0  1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_WITH_EXT_T_BYTES_7_4  2
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_WITH_EXT_T_FID_COUNT          3
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_WITH_EXT_T_FIELD_NAME_MAP_INIT \
-    {"BYTES_11_8", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_WITH_EXT_T_BYTES_11_8},\
-    {"BYTES_3_0", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_WITH_EXT_T_BYTES_3_0},\
-    {"BYTES_7_4", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_WITH_EXT_T_BYTES_7_4},\
-    {"gtp_with_ext_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_WITH_EXT_T_FID_COUNT}
-
-/*!
- * \name HOP_BY_HOP_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_HOP_BY_HOP_T_HDR_EXT_LEN 0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_HOP_BY_HOP_T_NEXT_HEADER 1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_HOP_BY_HOP_T_OPTION      2
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_HOP_BY_HOP_T_FID_COUNT          3
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_HOP_BY_HOP_T_FIELD_NAME_MAP_INIT \
-    {"HDR_EXT_LEN", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_HOP_BY_HOP_T_HDR_EXT_LEN},\
-    {"NEXT_HEADER", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_HOP_BY_HOP_T_NEXT_HEADER},\
-    {"OPTION", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_HOP_BY_HOP_T_OPTION},\
-    {"hop_by_hop_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_HOP_BY_HOP_T_FID_COUNT}
-
-/*!
- * \name ICMP_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ICMP_T_CHECKSUM  0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ICMP_T_CODE      1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ICMP_T_ICMP_TYPE 2
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ICMP_T_FID_COUNT          3
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT \
-    {"CHECKSUM", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ICMP_T_CHECKSUM},\
-    {"CODE", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ICMP_T_CODE},\
-    {"ICMP_TYPE", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ICMP_T_ICMP_TYPE},\
-    {"icmp_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ICMP_T_FID_COUNT}
-
-/*!
- * \name IGMP_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IGMP_T_CHECKSUM      0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IGMP_T_GROUP_ADDRESS 1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IGMP_T_IGMP_TYPE     2
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IGMP_T_MAX_RESP_TIME 3
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IGMP_T_FID_COUNT          4
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IGMP_T_FIELD_NAME_MAP_INIT \
-    {"CHECKSUM", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IGMP_T_CHECKSUM},\
-    {"GROUP_ADDRESS", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IGMP_T_GROUP_ADDRESS},\
-    {"IGMP_TYPE", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IGMP_T_IGMP_TYPE},\
-    {"MAX_RESP_TIME", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IGMP_T_MAX_RESP_TIME},\
-    {"igmp_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IGMP_T_FID_COUNT}
-
-/*!
- * \name IPFIX_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPFIX_T_EXPORT_TIME   0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPFIX_T_LENGTH        1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPFIX_T_OBS_DOMAIN_ID 2
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPFIX_T_SEQUENCE_NUM  3
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPFIX_T_VERSION       4
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPFIX_T_FID_COUNT          5
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT \
-    {"EXPORT_TIME", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPFIX_T_EXPORT_TIME},\
-    {"LENGTH", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPFIX_T_LENGTH},\
-    {"OBS_DOMAIN_ID", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPFIX_T_OBS_DOMAIN_ID},\
-    {"SEQUENCE_NUM", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPFIX_T_SEQUENCE_NUM},\
-    {"VERSION", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPFIX_T_VERSION},\
-    {"ipfix_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPFIX_T_FID_COUNT}
-
-/*!
- * \name IPV4_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV4_T_DA                0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET 1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV4_T_HDR_CHECKSUM      2
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV4_T_ID                3
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV4_T_OPTION            4
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV4_T_PROTOCOL          5
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV4_T_SA                6
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV4_T_TOS               7
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV4_T_TOTAL_LENGTH      8
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV4_T_TTL               9
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV4_T_VERSION_HDR_LEN   10
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV4_T_FID_COUNT          11
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT \
-    {"DA", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV4_T_DA},\
-    {"FLAGS_FRAG_OFFSET", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET},\
-    {"HDR_CHECKSUM", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV4_T_HDR_CHECKSUM},\
-    {"ID", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV4_T_ID},\
-    {"OPTION", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV4_T_OPTION},\
-    {"PROTOCOL", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV4_T_PROTOCOL},\
-    {"SA", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV4_T_SA},\
-    {"TOS", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV4_T_TOS},\
-    {"TOTAL_LENGTH", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV4_T_TOTAL_LENGTH},\
-    {"TTL", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV4_T_TTL},\
-    {"VERSION_HDR_LEN", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV4_T_VERSION_HDR_LEN},\
-    {"ipv4_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV4_T_FID_COUNT}
-
-/*!
- * \name IPV6_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV6_T_DA             0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV6_T_FLOW_LABEL     1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV6_T_HOP_LIMIT      2
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV6_T_NEXT_HEADER    3
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV6_T_PAYLOAD_LENGTH 4
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV6_T_SA             5
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV6_T_TRAFFIC_CLASS  6
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV6_T_VERSION        7
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV6_T_FID_COUNT          8
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT \
-    {"DA", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV6_T_DA},\
-    {"FLOW_LABEL", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV6_T_FLOW_LABEL},\
-    {"HOP_LIMIT", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV6_T_HOP_LIMIT},\
-    {"NEXT_HEADER", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV6_T_NEXT_HEADER},\
-    {"PAYLOAD_LENGTH", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV6_T_PAYLOAD_LENGTH},\
-    {"SA", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV6_T_SA},\
-    {"TRAFFIC_CLASS", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV6_T_TRAFFIC_CLASS},\
-    {"VERSION", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV6_T_VERSION},\
-    {"ipv6_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV6_T_FID_COUNT}
-
-/*!
- * \name L2_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_L2_T_MACDA 0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_L2_T_MACSA 1
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_L2_T_FID_COUNT          2
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_L2_T_FIELD_NAME_MAP_INIT \
-    {"MACDA", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_L2_T_MACDA},\
-    {"MACSA", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_L2_T_MACSA},\
-    {"l2_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_L2_T_FID_COUNT}
-
-/*!
- * \name MIRROR_ERSPAN_SN_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM 0
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT          1
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT \
-    {"SEQ_NUM", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM},\
-    {"mirror_erspan_sn_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT}
-
-/*!
- * \name MIRROR_TRANSPORT_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MIRROR_TRANSPORT_T_DATA 0
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT          1
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT \
-    {"DATA", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MIRROR_TRANSPORT_T_DATA},\
-    {"mirror_transport_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT}
-
-/*!
- * \name MPLS_ACH_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_ACH_T_CHANNEL_TYPE 0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_ACH_T_CW_TYPE      1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_ACH_T_RESERVED     2
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_ACH_T_VERSION      3
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_ACH_T_FID_COUNT          4
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_ACH_T_FIELD_NAME_MAP_INIT \
-    {"CHANNEL_TYPE", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_ACH_T_CHANNEL_TYPE},\
-    {"CW_TYPE", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_ACH_T_CW_TYPE},\
-    {"RESERVED", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_ACH_T_RESERVED},\
-    {"VERSION", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_ACH_T_VERSION},\
-    {"mpls_ach_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_ACH_T_FID_COUNT}
-
-/*!
- * \name MPLS_BV_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_BV_T_VALUE 0
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_BV_T_FID_COUNT          1
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_BV_T_FIELD_NAME_MAP_INIT \
-    {"VALUE", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_BV_T_VALUE},\
-    {"mpls_bv_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_BV_T_FID_COUNT}
-
-/*!
- * \name MPLS_CW_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_CW_T_CW_TYPE    0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_CW_T_RESERVED   1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_CW_T_SEQ_NUMBER 2
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_CW_T_FID_COUNT          3
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_CW_T_FIELD_NAME_MAP_INIT \
-    {"CW_TYPE", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_CW_T_CW_TYPE},\
-    {"RESERVED", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_CW_T_RESERVED},\
-    {"SEQ_NUMBER", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_CW_T_SEQ_NUMBER},\
-    {"mpls_cw_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_CW_T_FID_COUNT}
-
-/*!
- * \name MPLS_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_T_BOS   0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_T_EXP   1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_T_LABEL 2
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_T_TTL   3
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_T_FID_COUNT          4
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_T_FIELD_NAME_MAP_INIT \
-    {"BOS", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_T_BOS},\
-    {"EXP", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_T_EXP},\
-    {"LABEL", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_T_LABEL},\
-    {"TTL", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_T_TTL},\
-    {"mpls_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_T_FID_COUNT}
-
-/*!
- * \name OPAQUETAG_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_OPAQUETAG_T_TPID     0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_OPAQUETAG_T_VLAN_TAG 1
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_OPAQUETAG_T_FID_COUNT          2
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_OPAQUETAG_T_FIELD_NAME_MAP_INIT \
-    {"TPID", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_OPAQUETAG_T_TPID},\
-    {"VLAN_TAG", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_OPAQUETAG_T_VLAN_TAG},\
-    {"opaquetag_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_OPAQUETAG_T_FID_COUNT}
-
-/*!
- * \name P_1588_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_P_1588_T_CNTRL          0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_P_1588_T_CORRECTION     1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_P_1588_T_DOMAIN_NB      2
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_P_1588_T_FLAGS          3
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_P_1588_T_LOGMSGINTERVAL 4
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_P_1588_T_MSG_LENGTH     5
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_P_1588_T_MSG_TYPE       6
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_P_1588_T_RESERVED1      7
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_P_1588_T_RESERVED2      8
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_P_1588_T_RESERVED3      9
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_P_1588_T_SEQ_ID         10
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_P_1588_T_SRCPORTID      11
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_P_1588_T_TRANSPORTSPEC  12
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_P_1588_T_VERSION        13
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_P_1588_T_FID_COUNT          14
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_P_1588_T_FIELD_NAME_MAP_INIT \
-    {"CNTRL", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_P_1588_T_CNTRL},\
-    {"CORRECTION", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_P_1588_T_CORRECTION},\
-    {"DOMAIN_NB", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_P_1588_T_DOMAIN_NB},\
-    {"FLAGS", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_P_1588_T_FLAGS},\
-    {"LOGMSGINTERVAL", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_P_1588_T_LOGMSGINTERVAL},\
-    {"MSG_LENGTH", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_P_1588_T_MSG_LENGTH},\
-    {"MSG_TYPE", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_P_1588_T_MSG_TYPE},\
-    {"RESERVED1", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_P_1588_T_RESERVED1},\
-    {"RESERVED2", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_P_1588_T_RESERVED2},\
-    {"RESERVED3", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_P_1588_T_RESERVED3},\
-    {"SEQ_ID", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_P_1588_T_SEQ_ID},\
-    {"SRCPORTID", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_P_1588_T_SRCPORTID},\
-    {"TRANSPORTSPEC", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_P_1588_T_TRANSPORTSPEC},\
-    {"VERSION", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_P_1588_T_VERSION},\
-    {"p_1588_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_P_1588_T_FID_COUNT}
-
-/*!
- * \name PROG_EXT_HDR_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PROG_EXT_HDR_T_HDR_EXT_LEN 0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PROG_EXT_HDR_T_NEXT_HEADER 1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PROG_EXT_HDR_T_OPTION      2
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PROG_EXT_HDR_T_FID_COUNT          3
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PROG_EXT_HDR_T_FIELD_NAME_MAP_INIT \
-    {"HDR_EXT_LEN", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PROG_EXT_HDR_T_HDR_EXT_LEN},\
-    {"NEXT_HEADER", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PROG_EXT_HDR_T_NEXT_HEADER},\
-    {"OPTION", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PROG_EXT_HDR_T_OPTION},\
-    {"prog_ext_hdr_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PROG_EXT_HDR_T_FID_COUNT}
-
-/*!
- * \name PSAMP_0_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_0_T_FLOWSET        0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_0_T_LENGTH         1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_0_T_NEXT_HOP_INDEX 2
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_0_T_OBS_TIME_NS    3
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_0_T_OBS_TIME_S     4
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_0_T_TEMPLATE_ID    5
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_0_T_FID_COUNT          6
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_0_T_FIELD_NAME_MAP_INIT \
-    {"FLOWSET", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_0_T_FLOWSET},\
-    {"LENGTH", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_0_T_LENGTH},\
-    {"NEXT_HOP_INDEX", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_0_T_NEXT_HOP_INDEX},\
-    {"OBS_TIME_NS", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_0_T_OBS_TIME_NS},\
-    {"OBS_TIME_S", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_0_T_OBS_TIME_S},\
-    {"TEMPLATE_ID", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_0_T_TEMPLATE_ID},\
-    {"psamp_0_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_0_T_FID_COUNT}
-
-/*!
- * \name PSAMP_1_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_1_T_DLB_ID         0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_1_T_EGRESS_PORT    1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_1_T_EPOCH          2
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_1_T_INGRESS_PORT   3
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_1_T_SAMPLED_LENGTH 4
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_1_T_USER_META_DATA 5
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_1_T_VARIABLE_FLAG  6
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_1_T_FID_COUNT          7
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_1_T_FIELD_NAME_MAP_INIT \
-    {"DLB_ID", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_1_T_DLB_ID},\
-    {"EGRESS_PORT", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_1_T_EGRESS_PORT},\
-    {"EPOCH", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_1_T_EPOCH},\
-    {"INGRESS_PORT", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_1_T_INGRESS_PORT},\
-    {"SAMPLED_LENGTH", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_1_T_SAMPLED_LENGTH},\
-    {"USER_META_DATA", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_1_T_USER_META_DATA},\
-    {"VARIABLE_FLAG", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_1_T_VARIABLE_FLAG},\
-    {"psamp_1_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_1_T_FID_COUNT}
-
-/*!
- * \name PSAMP_MIRROR_ON_DROP_0_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT 0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT    1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH          2
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS     3
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S      4
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID       5
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID     6
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT          7
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT \
-    {"EGRESS_MOD_PORT", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT},\
-    {"INGRESS_PORT", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT},\
-    {"LENGTH", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH},\
-    {"OBS_TIME_NS", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS},\
-    {"OBS_TIME_S", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S},\
-    {"SWITCH_ID", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID},\
-    {"TEMPLATE_ID", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID},\
-    {"psamp_mirror_on_drop_0_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT}
-
-/*!
- * \name PSAMP_MIRROR_ON_DROP_1_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_ING_DROP_REASON    0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_MIRROR_ON_DROP_OBJ 1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_MMU_DROP_CTRL      2
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_SAMPLED_LENGTH     3
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_USER_META_DATA     4
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_VAR_LEN_INDICATOR  5
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FID_COUNT          6
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FIELD_NAME_MAP_INIT \
-    {"ING_DROP_REASON", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_ING_DROP_REASON},\
-    {"MIRROR_ON_DROP_OBJ", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_MIRROR_ON_DROP_OBJ},\
-    {"MMU_DROP_CTRL", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_MMU_DROP_CTRL},\
-    {"SAMPLED_LENGTH", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_SAMPLED_LENGTH},\
-    {"USER_META_DATA", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_USER_META_DATA},\
-    {"VAR_LEN_INDICATOR", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_VAR_LEN_INDICATOR},\
-    {"psamp_mirror_on_drop_1_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FID_COUNT}
-
-/*!
- * \name RARP_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RARP_T_HARDWARE_LEN  0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RARP_T_HARDWARE_TYPE 1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RARP_T_OPERATION     2
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RARP_T_PROT_ADDR_LEN 3
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RARP_T_PROTOCOL_TYPE 4
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RARP_T_SENDER_HA     5
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RARP_T_SENDER_IP     6
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RARP_T_TARGET_HA     7
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RARP_T_TARGET_IP     8
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RARP_T_FID_COUNT          9
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT \
-    {"HARDWARE_LEN", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RARP_T_HARDWARE_LEN},\
-    {"HARDWARE_TYPE", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RARP_T_HARDWARE_TYPE},\
-    {"OPERATION", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RARP_T_OPERATION},\
-    {"PROT_ADDR_LEN", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RARP_T_PROT_ADDR_LEN},\
-    {"PROTOCOL_TYPE", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RARP_T_PROTOCOL_TYPE},\
-    {"SENDER_HA", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RARP_T_SENDER_HA},\
-    {"SENDER_IP", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RARP_T_SENDER_IP},\
-    {"TARGET_HA", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RARP_T_TARGET_HA},\
-    {"TARGET_IP", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RARP_T_TARGET_IP},\
-    {"rarp_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RARP_T_FID_COUNT}
-
-/*!
- * \name ROUTING_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ROUTING_T_DATA          0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ROUTING_T_HDR_EXT_LEN   1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ROUTING_T_NEXT_HEADER   2
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ROUTING_T_ROUTING_TYPE  3
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ROUTING_T_SEGMENTS_LEFT 4
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ROUTING_T_FID_COUNT          5
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ROUTING_T_FIELD_NAME_MAP_INIT \
-    {"DATA", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ROUTING_T_DATA},\
-    {"HDR_EXT_LEN", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ROUTING_T_HDR_EXT_LEN},\
-    {"NEXT_HEADER", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ROUTING_T_NEXT_HEADER},\
-    {"ROUTING_TYPE", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ROUTING_T_ROUTING_TYPE},\
-    {"SEGMENTS_LEFT", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ROUTING_T_SEGMENTS_LEFT},\
-    {"routing_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ROUTING_T_FID_COUNT}
-
-/*!
- * \name RSPAN_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RSPAN_T_TAG  0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RSPAN_T_TPID 1
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RSPAN_T_FID_COUNT          2
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RSPAN_T_FIELD_NAME_MAP_INIT \
-    {"TAG", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RSPAN_T_TAG},\
-    {"TPID", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RSPAN_T_TPID},\
-    {"rspan_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RSPAN_T_FID_COUNT}
-
-/*!
- * \name SFLOW_SHIM_0_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_0_T_SYS_DESTINATION 0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_0_T_SYS_SOURCE      1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_0_T_VERSION         2
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT          3
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_0_T_FIELD_NAME_MAP_INIT \
-    {"SYS_DESTINATION", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_0_T_SYS_DESTINATION},\
-    {"SYS_SOURCE", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_0_T_SYS_SOURCE},\
-    {"VERSION", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_0_T_VERSION},\
-    {"sflow_shim_0_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT}
-
-/*!
- * \name SFLOW_SHIM_1_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_DEST_SAMPLE 0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_DISCARDED   1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_FLEX_SAMPLE 2
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_MCAST       3
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_SRC_SAMPLE  4
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_TRUNCATED   5
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_RESERVED         6
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_SYS_OPCODE       7
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT          8
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_FIELD_NAME_MAP_INIT \
-    {"FLAG_DEST_SAMPLE", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_DEST_SAMPLE},\
-    {"FLAG_DISCARDED", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_DISCARDED},\
-    {"FLAG_FLEX_SAMPLE", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_FLEX_SAMPLE},\
-    {"FLAG_MCAST", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_MCAST},\
-    {"FLAG_SRC_SAMPLE", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_SRC_SAMPLE},\
-    {"FLAG_TRUNCATED", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_TRUNCATED},\
-    {"RESERVED", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_RESERVED},\
-    {"SYS_OPCODE", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_SYS_OPCODE},\
-    {"sflow_shim_1_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT}
-
-/*!
- * \name SFLOW_SHIM_2_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_2_T_SEQUENCE_NUM   0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_2_T_USER_META_DATA 1
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT          2
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_2_T_FIELD_NAME_MAP_INIT \
-    {"SEQUENCE_NUM", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_2_T_SEQUENCE_NUM},\
-    {"USER_META_DATA", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_2_T_USER_META_DATA},\
-    {"sflow_shim_2_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT}
-
-/*!
- * \name SNAP_LLC_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SNAP_LLC_T_LENGTH   0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SNAP_LLC_T_SNAP_LLC 1
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SNAP_LLC_T_FID_COUNT          2
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SNAP_LLC_T_FIELD_NAME_MAP_INIT \
-    {"LENGTH", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SNAP_LLC_T_LENGTH},\
-    {"SNAP_LLC", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SNAP_LLC_T_SNAP_LLC},\
-    {"snap_llc_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SNAP_LLC_T_FID_COUNT}
-
-/*!
- * \name TCP_FIRST_4BYTES_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT 0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT 1
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT          2
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT \
-    {"DST_PORT", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT},\
-    {"SRC_PORT", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT},\
-    {"tcp_first_4bytes_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT}
-
-/*!
- * \name TCP_LAST_16BYTES_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM           0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM          1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS 2
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM           3
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR        4
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE          5
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT          6
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT \
-    {"ACK_NUM", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM},\
-    {"CHECKSUM", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM},\
-    {"HDR_LEN_AND_FLAGS", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS},\
-    {"SEQ_NUM", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM},\
-    {"URGENT_PTR", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR},\
-    {"WIN_SIZE", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE},\
-    {"tcp_last_16bytes_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT}
-
-/*!
- * \name UDP_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UDP_T_CHECKSUM   0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UDP_T_DST_PORT   1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UDP_T_SRC_PORT   2
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UDP_T_UDP_LENGTH 3
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UDP_T_FID_COUNT          4
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT \
-    {"CHECKSUM", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UDP_T_CHECKSUM},\
-    {"DST_PORT", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UDP_T_DST_PORT},\
-    {"SRC_PORT", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UDP_T_SRC_PORT},\
-    {"UDP_LENGTH", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UDP_T_UDP_LENGTH},\
-    {"udp_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UDP_T_FID_COUNT}
-
-/*!
- * \name UNKNOWN_L3_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD 0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD  1
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L3_T_FID_COUNT          2
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT \
-    {"FIRST_16BYTES_OF_L3_PAYLOAD", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD},\
-    {"NEXT_16BYTES_OF_L3_PAYLOAD", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD},\
-    {"unknown_l3_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L3_T_FID_COUNT}
-
-/*!
- * \name UNKNOWN_L4_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD 0
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L4_T_FID_COUNT          1
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT \
-    {"FIRST_4BYTES_OF_L4_PAYLOAD", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD},\
-    {"unknown_l4_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L4_T_FID_COUNT}
-
-/*!
- * \name UNKNOWN_L5_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1 0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3 1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7 2
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L5_T_FID_COUNT          3
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT \
-    {"L5_BYTES_0_1", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1},\
-    {"L5_BYTES_2_3", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3},\
-    {"L5_BYTES_4_7", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7},\
-    {"unknown_l5_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L5_T_FID_COUNT}
-
-/*!
- * \name VLAN_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VLAN_T_CFI  0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VLAN_T_PCP  1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VLAN_T_TPID 2
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VLAN_T_VID  3
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VLAN_T_FID_COUNT          4
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT \
-    {"CFI", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VLAN_T_CFI},\
-    {"PCP", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VLAN_T_PCP},\
-    {"TPID", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VLAN_T_TPID},\
-    {"VID", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VLAN_T_VID},\
-    {"vlan_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VLAN_T_FID_COUNT}
-
-/*!
- * \name VNTAG_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VNTAG_T_TAG  0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VNTAG_T_TPID 1
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VNTAG_T_FID_COUNT          2
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VNTAG_T_FIELD_NAME_MAP_INIT \
-    {"TAG", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VNTAG_T_TAG},\
-    {"TPID", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VNTAG_T_TPID},\
-    {"vntag_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VNTAG_T_FID_COUNT}
-
-/*!
- * \name VXLAN_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VXLAN_T_FLAGS_RESERVED_1      0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VXLAN_T_VN_ID_LOWER_RESERVED2 1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VXLAN_T_VN_ID_UPPER           2
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VXLAN_T_FID_COUNT          3
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT \
-    {"FLAGS_RESERVED_1", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VXLAN_T_FLAGS_RESERVED_1},\
-    {"VN_ID_LOWER_RESERVED2", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VXLAN_T_VN_ID_LOWER_RESERVED2},\
-    {"VN_ID_UPPER", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VXLAN_T_VN_ID_UPPER},\
-    {"vxlan_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VXLAN_T_FID_COUNT}
-
-/*!
- * \name WESP_T field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_WESP_T_FLAGS       0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_WESP_T_HEADER_LEN  1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_WESP_T_NEXT_HEADER 2
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_WESP_T_SEQ_NUM     3
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_WESP_T_SPI         4
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_WESP_T_TRAILER_LEN 5
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_WESP_T_WESP_IV     6
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_WESP_T_FID_COUNT          7
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_WESP_T_FIELD_NAME_MAP_INIT \
-    {"FLAGS", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_WESP_T_FLAGS},\
-    {"HEADER_LEN", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_WESP_T_HEADER_LEN},\
-    {"NEXT_HEADER", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_WESP_T_NEXT_HEADER},\
-    {"SEQ_NUM", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_WESP_T_SEQ_NUM},\
-    {"SPI", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_WESP_T_SPI},\
-    {"TRAILER_LEN", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_WESP_T_TRAILER_LEN},\
-    {"WESP_IV", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_WESP_T_WESP_IV},\
-    {"wesp_t fid count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_WESP_T_FID_COUNT}
-
-
-#endif /* BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_FLEXHDR_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_bcmpkt_rxpmd_flex_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_bcmpkt_rxpmd_flex_data.h
deleted file mode 100644
index 04a86764bd0d..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_bcmpkt_rxpmd_flex_data.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) map.yml.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_DATA_H
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_DATA_H
-
-/*!
- * \name RX flex metadata field IDs.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_DLB_ECMP_DESTINATION_15_0                      0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0                                 1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_DVP_15_0                                       2
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_7_0                              3
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0                         4
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_0                        5
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32                       6
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0                              7
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_IFP_TS_CONTROL_ACTION_3_0                      8
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_ING_ETAG_ACTION_3_0                            9
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_ING_ETAG_PCP_DEI_3_0                           10
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_ING_ETAG_VID_16_15_0                           11
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_0                             12
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_INGRESS_PP_PORT_7_0                            13
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0 14
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0                    15
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_INT_PRI_3_0                                    16
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_L2_IIF_10_0                                    17
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_L2_OIF_10_0                                    18
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_L3_IIF_13_0                                    19
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0                                  20
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_MPLS_LABEL_DECAP_COUNT_3_0                     21
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0              22
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_15_0                              23
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0                            24
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0                            25
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_SVP_15_0                                       26
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0                   27
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0                        28
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0                              29
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_T_VLAN_TAG_VALUE_15_0                          30
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_TIMESTAMP_CTRL_3_0                             31
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0                32
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_VFI_15_0                                       33
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_VLAN_TAG_PRESERVE_CTRL_SVP_MIRROR_ENABLE_3_0   34
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_FID_COUNT                       35
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_COUNT                    46
-
-/*!
- * \name Packet Flex Reason Types.
- */
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS                               0
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED 1
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED  2
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_DST_FP                                  3
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_EM_FT                                   4
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_IFP                                     5
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_IFP_METER                               6
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED      7
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_IVXLT                                   8
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP                           9
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS                      10
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_DISCARD                          11
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE                      12
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP                           13
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS                      14
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR                            15
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF                        16
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR                            17
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL                        18
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD                    19
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0                      20
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1                      21
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2                      22
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3                      23
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4                      24
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5                      25
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6                      26
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7                      27
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED                 28
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED              29
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED                  30
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU                    31
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU                          32
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_PE_RPF                                  33
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_PE_VID_FWD_MISS                         34
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_PE_VID_RPF_MISS                         35
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_PKT_ETAG_EXPECTED                       36
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_PKT_ETAG_UNEXPECTED                     37
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED              38
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT                            39
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_SER_DROP                                40
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD         41
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_SVP                                     42
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP                               43
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED                       44
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_VFP                                     45
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT \
-    {"CML_FLAGS", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS},\
-    {"DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED},\
-    {"DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED},\
-    {"DST_FP", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_DST_FP},\
-    {"EM_FT", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_EM_FT},\
-    {"IFP", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_IFP},\
-    {"IFP_METER", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_IFP_METER},\
-    {"IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED},\
-    {"IVXLT", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_IVXLT},\
-    {"L2_DST_LOOKUP", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP},\
-    {"L2_DST_LOOKUP_MISS", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS},\
-    {"L2_SRC_DISCARD", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_DISCARD},\
-    {"L2_SRC_STATIC_MOVE", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE},\
-    {"L3_DST_LOOKUP", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP},\
-    {"L3_DST_LOOKUP_MISS", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS},\
-    {"L3_HDR_ERROR", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR},\
-    {"L3_IIF_EQ_L3_OIF", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF},\
-    {"L3_TTL_ERROR", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR},\
-    {"LEARN_CACHE_FULL", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL},\
-    {"MACSA_MULTICAST_RSVD", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD},\
-    {"MATCHED_RULE_BIT_0", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0},\
-    {"MATCHED_RULE_BIT_1", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1},\
-    {"MATCHED_RULE_BIT_2", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2},\
-    {"MATCHED_RULE_BIT_3", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3},\
-    {"MATCHED_RULE_BIT_4", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4},\
-    {"MATCHED_RULE_BIT_5", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5},\
-    {"MATCHED_RULE_BIT_6", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6},\
-    {"MATCHED_RULE_BIT_7", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7},\
-    {"MEMBERSHIP_CHECK_FAILED", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED},\
-    {"MIRROR_SAMPLER_EGR_SAMPLED", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED},\
-    {"MIRROR_SAMPLER_SAMPLED", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED},\
-    {"MPLS_CTRL_PKT_TO_CPU", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU},\
-    {"NO_COPY_TO_CPU", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU},\
-    {"PE_RPF", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_PE_RPF},\
-    {"PE_VID_FWD_MISS", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_PE_VID_FWD_MISS},\
-    {"PE_VID_RPF_MISS", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_PE_VID_RPF_MISS},\
-    {"PKT_ETAG_EXPECTED", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_PKT_ETAG_EXPECTED},\
-    {"PKT_ETAG_UNEXPECTED", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_PKT_ETAG_UNEXPECTED},\
-    {"PKT_INTEGRITY_CHECK_FAILED", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED},\
-    {"PROTOCOL_PKT", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT},\
-    {"SER_DROP", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_SER_DROP},\
-    {"SPANNING_TREE_CHECK_FAILED_RSVD", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD},\
-    {"SVP", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_SVP},\
-    {"TRACE_DOP", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP},\
-    {"URPF_CHECK_FAILED", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED},\
-    {"VFP", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_VFP},\
-    {"flex reason count", BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_COUNT}
-
-#endif /* BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_bcmpkt_rxpmd_match_id_defs.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_bcmpkt_rxpmd_match_id_defs.h
deleted file mode 100644
index fc064a40e539..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_bcmpkt_rxpmd_match_id_defs.h
+++ /dev/null
@@ -1,427 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) bcm56880_a0_nfa_6_5_30_1_1_sf_match_id_info.yml
- * for device bcm56880_a0 and variant nfa_6_5_30_1_1.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_MATCH_ID_DEFS_H
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_MATCH_ID_DEFS_H
-
-#include <bcmpkt/bcmpkt_rxpmd_match_id.h>
-
-/*!
- * \brief Get the Match ID DataBase information.
- *
- * \retval bcmpkt_rxpmd_match_id_db_info_t Match ID DataBase information.
-*/
-extern bcmpkt_rxpmd_match_id_db_info_t *
-    bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db_info_get(void);
-
-/*!
- * \brief Get the Match ID Mapping information.
- *
- * \retval bcmpkt_rxpmd_match_id_map_info_t Match ID Mapping information.
-*/
-extern bcmpkt_rxpmd_match_id_map_info_t *
-    bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_map_info_get(void);
-
-/*!
-  \name RXPMD Match IDs
-*/
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ETAG  0
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG  1
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2  2
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE  3
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OPAQUETAG  4
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG  5
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_RSPAN  6
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC  7
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_VNTAG  8
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP  9
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1  10
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2  11
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD  12
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT  13
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE  14
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1  15
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2  16
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE  17
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE  18
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM  19
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY  20
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT  21
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ  22
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GTP_12BYTE  23
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GTP_8BYTE  24
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GTP_EXT_4BYTE  25
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GTP_WITH_EXT  26
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP  27
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP  28
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4  29
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6  30
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0  31
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1  32
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2  33
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3  34
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4  35
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5  36
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6  37
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH  38
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW  39
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE  40
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588  41
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP  42
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES  43
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES  44
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP  45
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3  46
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4  47
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5  48
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN  49
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK  50
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE  51
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ETAG  52
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG  53
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2  54
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE  55
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OPAQUETAG  56
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG  57
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_RSPAN  58
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC  59
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_VNTAG  60
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP  61
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1  62
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2  63
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD  64
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT  65
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE  66
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1  67
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2  68
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE  69
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE  70
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM  71
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY  72
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT  73
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ  74
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GTP_12BYTE  75
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GTP_8BYTE  76
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GTP_EXT_4BYTE  77
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GTP_WITH_EXT  78
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP  79
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP  80
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4  81
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6  82
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0  83
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1  84
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2  85
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3  86
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4  87
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5  88
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6  89
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH  90
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW  91
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE  92
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588  93
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP  94
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES  95
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES  96
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP  97
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3  98
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4  99
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5  100
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN  101
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ETAG  102
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG  103
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2  104
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE  105
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OPAQUETAG  106
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG  107
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_RSPAN  108
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC  109
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_VNTAG  110
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP  111
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1  112
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2  113
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD  114
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT  115
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE  116
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1  117
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2  118
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP  119
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP  120
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4  121
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6  122
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE  123
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588  124
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP  125
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES  126
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES  127
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP  128
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3  129
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4  130
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5  131
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ETAG  132
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG  133
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2  134
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE  135
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OPAQUETAG  136
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG  137
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_RSPAN  138
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC  139
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_VNTAG  140
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP  141
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1  142
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2  143
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD  144
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT  145
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE  146
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1  147
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2  148
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE  149
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE  150
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM  151
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY  152
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT  153
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ  154
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GTP_12BYTE  155
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GTP_8BYTE  156
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GTP_EXT_4BYTE  157
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GTP_WITH_EXT  158
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP  159
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP  160
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4  161
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6  162
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0  163
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1  164
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2  165
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3  166
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4  167
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5  168
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6  169
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH  170
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW  171
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE  172
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588  173
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP  174
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES  175
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES  176
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP  177
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3  178
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4  179
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5  180
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN  181
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK  182
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE  183
-#define BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_COUNT  184
-
-#define BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT \
-    {"EGRESS_PKT_FWD_L2_HDR_ETAG", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ETAG}, \
-    {"EGRESS_PKT_FWD_L2_HDR_ITAG", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG}, \
-    {"EGRESS_PKT_FWD_L2_HDR_L2", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2}, \
-    {"EGRESS_PKT_FWD_L2_HDR_NONE", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE}, \
-    {"EGRESS_PKT_FWD_L2_HDR_OPAQUETAG", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OPAQUETAG}, \
-    {"EGRESS_PKT_FWD_L2_HDR_OTAG", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG}, \
-    {"EGRESS_PKT_FWD_L2_HDR_RSPAN", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_RSPAN}, \
-    {"EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC}, \
-    {"EGRESS_PKT_FWD_L2_HDR_VNTAG", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_VNTAG}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ARP", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_BFD", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GPE", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GTP_12BYTE", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GTP_12BYTE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GTP_8BYTE", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GTP_8BYTE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GTP_EXT_4BYTE", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GTP_EXT_4BYTE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GTP_WITH_EXT", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GTP_WITH_EXT}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ICMP", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IGMP", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV4", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV6", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS0", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS1", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS2", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS3", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS4", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS5", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS6", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_NONE", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_P_1588", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_RARP", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UDP", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_VXLAN", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN}, \
-    {"EGRESS_PKT_SYS_HDR_LOOPBACK", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK}, \
-    {"EGRESS_PKT_SYS_HDR_NONE", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_ETAG", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ETAG}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_ITAG", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_L2", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_NONE", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_OPAQUETAG", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OPAQUETAG}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_OTAG", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_RSPAN", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_RSPAN}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_VNTAG", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_VNTAG}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GTP_12BYTE", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GTP_12BYTE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GTP_8BYTE", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GTP_8BYTE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GTP_EXT_4BYTE", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GTP_EXT_4BYTE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GTP_WITH_EXT", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GTP_WITH_EXT}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN}, \
-    {"INGRESS_PKT_INNER_L2_HDR_ETAG", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ETAG}, \
-    {"INGRESS_PKT_INNER_L2_HDR_ITAG", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG}, \
-    {"INGRESS_PKT_INNER_L2_HDR_L2", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2}, \
-    {"INGRESS_PKT_INNER_L2_HDR_NONE", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE}, \
-    {"INGRESS_PKT_INNER_L2_HDR_OPAQUETAG", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OPAQUETAG}, \
-    {"INGRESS_PKT_INNER_L2_HDR_OTAG", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG}, \
-    {"INGRESS_PKT_INNER_L2_HDR_RSPAN", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_RSPAN}, \
-    {"INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC}, \
-    {"INGRESS_PKT_INNER_L2_HDR_VNTAG", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_VNTAG}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ARP", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_BFD", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ICMP", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_IGMP", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV4", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV6", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_NONE", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_P_1588", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_RARP", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UDP", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_ETAG", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ETAG}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_ITAG", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_L2", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_NONE", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_OPAQUETAG", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OPAQUETAG}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_OTAG", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_RSPAN", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_RSPAN}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_VNTAG", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_VNTAG}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ARP", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_BFD", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GPE", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GTP_12BYTE", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GTP_12BYTE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GTP_8BYTE", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GTP_8BYTE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GTP_EXT_4BYTE", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GTP_EXT_4BYTE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GTP_WITH_EXT", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GTP_WITH_EXT}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ICMP", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IGMP", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV4", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV6", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_NONE", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_P_1588", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_RARP", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UDP", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN}, \
-    {"INGRESS_PKT_SYS_HDR_LOOPBACK", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK}, \
-    {"INGRESS_PKT_SYS_HDR_NONE", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE}, \
-    {"rxpmd_match_id_count", BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_COUNT}
-
-#endif /*! BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_MATCH_ID_DEFS_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_bcmpkt_flexhdr.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_bcmpkt_flexhdr.h
new file mode 100644
index 000000000000..b7a030bb1abc
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_bcmpkt_flexhdr.h
@@ -0,0 +1,162 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) header.yml.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_FLEXHDR_H
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_FLEXHDR_H
+
+#include <bcmpkt/bcmpkt_flexhdr_internal.h>
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ARP_T                      0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_AUTHEN_T                   1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T                      2
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_0_T         3
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_1_T         4
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_DEST_OPTION_T              5
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T        6
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_SUBHDR_5_T         7
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ESP_T                      8
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ETAG_T                     9
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ETHERTYPE_T                10
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_FRAG_T                     11
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T         12
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GPE_T                      13
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_CHKSUM_T               14
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_KEY_T                  15
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_ROUT_T                 16
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_SEQ_T                  17
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_T                      18
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_12BYTE_T               19
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_8BYTE_T                20
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_EXT_4BYTE_T            21
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_WITH_EXT_T             22
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_HOP_BY_HOP_T               23
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ICMP_T                     24
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IGMP_T                     25
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPFIX_T                    26
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV4_T                     27
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV6_T                     28
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_L2_T                       29
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MIRROR_ERSPAN_SN_T         30
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MIRROR_TRANSPORT_T         31
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_ACH_T                 32
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_BV_T                  33
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_CW_T                  34
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_T                     35
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_OPAQUETAG_T                36
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_P_1588_T                   37
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PROG_EXT_HDR_T             38
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_0_T                  39
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_1_T                  40
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T   41
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T   42
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RARP_T                     43
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ROUTING_T                  44
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RSPAN_T                    45
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_0_T             46
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_1_T             47
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_2_T             48
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SNAP_LLC_T                 49
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_TCP_FIRST_4BYTES_T         50
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_TCP_LAST_16BYTES_T         51
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UDP_T                      52
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L3_T               53
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L4_T               54
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L5_T               55
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VLAN_T                     56
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VNTAG_T                    57
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VXLAN_T                    58
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_WESP_T                     59
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_T               60
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_FLEXHDR_COUNT    61
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_FLEXHDR_NAME_MAP_INIT \
+    {"arp_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ARP_T},\
+    {"authen_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_AUTHEN_T},\
+    {"bfd_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T},\
+    {"cpu_composites_0_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_0_T},\
+    {"cpu_composites_1_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_1_T},\
+    {"dest_option_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_DEST_OPTION_T},\
+    {"erspan3_fixed_hdr_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T},\
+    {"erspan3_subhdr_5_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_SUBHDR_5_T},\
+    {"esp_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ESP_T},\
+    {"etag_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ETAG_T},\
+    {"ethertype_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ETHERTYPE_T},\
+    {"frag_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_FRAG_T},\
+    {"generic_loopback_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T},\
+    {"gpe_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GPE_T},\
+    {"gre_chksum_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_CHKSUM_T},\
+    {"gre_key_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_KEY_T},\
+    {"gre_rout_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_ROUT_T},\
+    {"gre_seq_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_SEQ_T},\
+    {"gre_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_T},\
+    {"gtp_12byte_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_12BYTE_T},\
+    {"gtp_8byte_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_8BYTE_T},\
+    {"gtp_ext_4byte_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_EXT_4BYTE_T},\
+    {"gtp_with_ext_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_WITH_EXT_T},\
+    {"hop_by_hop_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_HOP_BY_HOP_T},\
+    {"icmp_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ICMP_T},\
+    {"igmp_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IGMP_T},\
+    {"ipfix_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPFIX_T},\
+    {"ipv4_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV4_T},\
+    {"ipv6_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV6_T},\
+    {"l2_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_L2_T},\
+    {"mirror_erspan_sn_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MIRROR_ERSPAN_SN_T},\
+    {"mirror_transport_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MIRROR_TRANSPORT_T},\
+    {"mpls_ach_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_ACH_T},\
+    {"mpls_bv_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_BV_T},\
+    {"mpls_cw_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_CW_T},\
+    {"mpls_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_T},\
+    {"opaquetag_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_OPAQUETAG_T},\
+    {"p_1588_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_P_1588_T},\
+    {"prog_ext_hdr_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PROG_EXT_HDR_T},\
+    {"psamp_0_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_0_T},\
+    {"psamp_1_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_1_T},\
+    {"psamp_mirror_on_drop_0_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T},\
+    {"psamp_mirror_on_drop_1_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T},\
+    {"rarp_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RARP_T},\
+    {"routing_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ROUTING_T},\
+    {"rspan_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RSPAN_T},\
+    {"sflow_shim_0_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_0_T},\
+    {"sflow_shim_1_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_1_T},\
+    {"sflow_shim_2_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_2_T},\
+    {"snap_llc_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SNAP_LLC_T},\
+    {"tcp_first_4bytes_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_TCP_FIRST_4BYTES_T},\
+    {"tcp_last_16bytes_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_TCP_LAST_16BYTES_T},\
+    {"udp_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UDP_T},\
+    {"unknown_l3_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L3_T},\
+    {"unknown_l4_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L4_T},\
+    {"unknown_l5_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L5_T},\
+    {"vlan_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VLAN_T},\
+    {"vntag_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VNTAG_T},\
+    {"vxlan_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VXLAN_T},\
+    {"wesp_t", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_WESP_T},\
+    {"RXPMD_FLEX_T", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_T},\
+    {"flexhdr count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_FLEXHDR_COUNT}
+
+#endif /* BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_FLEXHDR_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_bcmpkt_flexhdr_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_bcmpkt_flexhdr_data.h
new file mode 100644
index 000000000000..33148f9bae2f
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_bcmpkt_flexhdr_data.h
@@ -0,0 +1,1152 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) header.yml.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_FLEXHDR_DATA_H
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_FLEXHDR_DATA_H
+
+/*!
+ * \name ARP_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ARP_T_HARDWARE_LEN  0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ARP_T_HARDWARE_TYPE 1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ARP_T_OPERATION     2
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ARP_T_PROT_ADDR_LEN 3
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ARP_T_PROTOCOL_TYPE 4
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ARP_T_SENDER_HA     5
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ARP_T_SENDER_IP     6
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ARP_T_TARGET_HA     7
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ARP_T_TARGET_IP     8
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ARP_T_FID_COUNT          9
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT \
+    {"HARDWARE_LEN", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ARP_T_HARDWARE_LEN},\
+    {"HARDWARE_TYPE", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ARP_T_HARDWARE_TYPE},\
+    {"OPERATION", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ARP_T_OPERATION},\
+    {"PROT_ADDR_LEN", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ARP_T_PROT_ADDR_LEN},\
+    {"PROTOCOL_TYPE", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ARP_T_PROTOCOL_TYPE},\
+    {"SENDER_HA", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ARP_T_SENDER_HA},\
+    {"SENDER_IP", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ARP_T_SENDER_IP},\
+    {"TARGET_HA", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ARP_T_TARGET_HA},\
+    {"TARGET_IP", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ARP_T_TARGET_IP},\
+    {"arp_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ARP_T_FID_COUNT}
+
+/*!
+ * \name AUTHEN_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_AUTHEN_T_DATA        0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_AUTHEN_T_NEXT_HEADER 1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_AUTHEN_T_PAYLOAD_LEN 2
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_AUTHEN_T_RESERVED    3
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_AUTHEN_T_SEQ_NUM     4
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_AUTHEN_T_SPI         5
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_AUTHEN_T_FID_COUNT          6
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_AUTHEN_T_FIELD_NAME_MAP_INIT \
+    {"DATA", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_AUTHEN_T_DATA},\
+    {"NEXT_HEADER", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_AUTHEN_T_NEXT_HEADER},\
+    {"PAYLOAD_LEN", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_AUTHEN_T_PAYLOAD_LEN},\
+    {"RESERVED", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_AUTHEN_T_RESERVED},\
+    {"SEQ_NUM", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_AUTHEN_T_SEQ_NUM},\
+    {"SPI", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_AUTHEN_T_SPI},\
+    {"authen_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_AUTHEN_T_FID_COUNT}
+
+/*!
+ * \name BFD_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_AP            0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_BFD_LENGTH    1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_CPI           2
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_DEM           3
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_DESMINTXINTV  4
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_DETECTMULT    5
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_DIAG          6
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_FIN           7
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_MINECHORXINTV 8
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_MPT           9
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_MYDISCRIM     10
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_POLL          11
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_REQMINRXINTV  12
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_STA           13
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_URDISCRIM     14
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_VERSION       15
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_FID_COUNT          16
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_FIELD_NAME_MAP_INIT \
+    {"AP", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_AP},\
+    {"BFD_LENGTH", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_BFD_LENGTH},\
+    {"CPI", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_CPI},\
+    {"DEM", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_DEM},\
+    {"DESMINTXINTV", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_DESMINTXINTV},\
+    {"DETECTMULT", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_DETECTMULT},\
+    {"DIAG", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_DIAG},\
+    {"FIN", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_FIN},\
+    {"MINECHORXINTV", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_MINECHORXINTV},\
+    {"MPT", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_MPT},\
+    {"MYDISCRIM", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_MYDISCRIM},\
+    {"POLL", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_POLL},\
+    {"REQMINRXINTV", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_REQMINRXINTV},\
+    {"STA", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_STA},\
+    {"URDISCRIM", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_URDISCRIM},\
+    {"VERSION", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_VERSION},\
+    {"bfd_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_FID_COUNT}
+
+/*!
+ * \name CPU_COMPOSITES_0_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0 0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1 1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2 2
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3 3
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4 4
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5 5
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6 6
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT          7
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT \
+    {"DMA_CONT0", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0},\
+    {"DMA_CONT1", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1},\
+    {"DMA_CONT2", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2},\
+    {"DMA_CONT3", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3},\
+    {"DMA_CONT4", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4},\
+    {"DMA_CONT5", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5},\
+    {"DMA_CONT6", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6},\
+    {"cpu_composites_0_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT}
+
+/*!
+ * \name CPU_COMPOSITES_1_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10 0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11 1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12 2
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13 3
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14 4
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15 5
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16 6
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17 7
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7  8
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8  9
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9  10
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT          11
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT \
+    {"DMA_CONT10", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10},\
+    {"DMA_CONT11", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11},\
+    {"DMA_CONT12", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12},\
+    {"DMA_CONT13", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13},\
+    {"DMA_CONT14", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14},\
+    {"DMA_CONT15", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15},\
+    {"DMA_CONT16", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16},\
+    {"DMA_CONT17", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17},\
+    {"DMA_CONT7", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7},\
+    {"DMA_CONT8", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8},\
+    {"DMA_CONT9", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9},\
+    {"cpu_composites_1_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT}
+
+/*!
+ * \name DEST_OPTION_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_DEST_OPTION_T_HDR_EXT_LEN 0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_DEST_OPTION_T_NEXT_HEADER 1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_DEST_OPTION_T_OPTION      2
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_DEST_OPTION_T_FID_COUNT          3
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_DEST_OPTION_T_FIELD_NAME_MAP_INIT \
+    {"HDR_EXT_LEN", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_DEST_OPTION_T_HDR_EXT_LEN},\
+    {"NEXT_HEADER", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_DEST_OPTION_T_NEXT_HEADER},\
+    {"OPTION", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_DEST_OPTION_T_OPTION},\
+    {"dest_option_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_DEST_OPTION_T_FID_COUNT}
+
+/*!
+ * \name ERSPAN3_FIXED_HDR_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO               0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_COS               1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID           2
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O 3
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID        4
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_T                 5
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP         6
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_VER               7
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN              8
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT          9
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT \
+    {"BSO", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO},\
+    {"COS", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_COS},\
+    {"GBP_SID", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID},\
+    {"P_FT_HWID_D_GRA_O", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O},\
+    {"SESSION_ID", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID},\
+    {"T", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_T},\
+    {"TIMESTAMP", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP},\
+    {"VER", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_VER},\
+    {"VLAN", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN},\
+    {"erspan3_fixed_hdr_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT}
+
+/*!
+ * \name ERSPAN3_SUBHDR_5_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID 0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID     1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID   2
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP   3
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT          4
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT \
+    {"PLATFORM_ID", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID},\
+    {"PORT_ID", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID},\
+    {"SWITCH_ID", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID},\
+    {"TIMESTAMP", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP},\
+    {"erspan3_subhdr_5_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT}
+
+/*!
+ * \name ESP_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ESP_T_NEXT_HEADER 0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ESP_T_PAD         1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ESP_T_PAD_LEN     2
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ESP_T_SEQ_NUM     3
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ESP_T_SPI         4
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ESP_T_FID_COUNT          5
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ESP_T_FIELD_NAME_MAP_INIT \
+    {"NEXT_HEADER", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ESP_T_NEXT_HEADER},\
+    {"PAD", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ESP_T_PAD},\
+    {"PAD_LEN", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ESP_T_PAD_LEN},\
+    {"SEQ_NUM", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ESP_T_SEQ_NUM},\
+    {"SPI", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ESP_T_SPI},\
+    {"esp_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ESP_T_FID_COUNT}
+
+/*!
+ * \name ETAG_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ETAG_T_PCP_DEI 0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ETAG_T_RSRVD0  1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ETAG_T_RSRVD1  2
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ETAG_T_SVID    3
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ETAG_T_TPID    4
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ETAG_T_VID     5
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ETAG_T_FID_COUNT          6
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ETAG_T_FIELD_NAME_MAP_INIT \
+    {"PCP_DEI", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ETAG_T_PCP_DEI},\
+    {"RSRVD0", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ETAG_T_RSRVD0},\
+    {"RSRVD1", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ETAG_T_RSRVD1},\
+    {"SVID", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ETAG_T_SVID},\
+    {"TPID", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ETAG_T_TPID},\
+    {"VID", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ETAG_T_VID},\
+    {"etag_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ETAG_T_FID_COUNT}
+
+/*!
+ * \name ETHERTYPE_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ETHERTYPE_T_TYPE 0
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ETHERTYPE_T_FID_COUNT          1
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT \
+    {"TYPE", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ETHERTYPE_T_TYPE},\
+    {"ethertype_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ETHERTYPE_T_FID_COUNT}
+
+/*!
+ * \name FRAG_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_FRAG_T_FRAG_INFO   0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_FRAG_T_ID          1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_FRAG_T_NEXT_HEADER 2
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_FRAG_T_RESERVED    3
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_FRAG_T_FID_COUNT          4
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_FRAG_T_FIELD_NAME_MAP_INIT \
+    {"FRAG_INFO", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_FRAG_T_FRAG_INFO},\
+    {"ID", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_FRAG_T_ID},\
+    {"NEXT_HEADER", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_FRAG_T_NEXT_HEADER},\
+    {"RESERVED", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_FRAG_T_RESERVED},\
+    {"frag_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_FRAG_T_FID_COUNT}
+
+/*!
+ * \name GENERIC_LOOPBACK_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ    0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE   1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ        2
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_FLAGS              3
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE        4
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY     5
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL     6
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ      7
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0  8
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1  9
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ            10
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1         11
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_2         12
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT 13
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE         14
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT          15
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT \
+    {"DESTINATION_OBJ", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ},\
+    {"DESTINATION_TYPE", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE},\
+    {"ENTROPY_OBJ", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ},\
+    {"FLAGS", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_FLAGS},\
+    {"HEADER_TYPE", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE},\
+    {"INPUT_PRIORITY", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY},\
+    {"INTERFACE_CTRL", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL},\
+    {"INTERFACE_OBJ", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ},\
+    {"PROCESSING_CTRL_0", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0},\
+    {"PROCESSING_CTRL_1", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1},\
+    {"QOS_OBJ", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ},\
+    {"RESERVED_1", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1},\
+    {"RESERVED_2", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_2},\
+    {"SOURCE_SYSTEM_PORT", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT},\
+    {"START_BYTE", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE},\
+    {"generic_loopback_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT}
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NO_OP       0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2_OIF      1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED    2
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__VP          3
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP        4
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NHOP        5
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2MC_GROUP  6
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L3MC_GROUP  7
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED_1  8
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP_MEMBER 9
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__DEVICE_PORT 10
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_TYPE__TUNNEL  0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_TYPE__GENERIC 1
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__NOOP   0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__VFI    1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__L3_IIF 2
+
+/*!
+ * \name GPE_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GPE_T_FLAGS         0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GPE_T_NEXT_PROTOCOL 1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GPE_T_RESERVED0     2
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GPE_T_RESERVED1     3
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GPE_T_VNI           4
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GPE_T_FID_COUNT          5
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GPE_T_FIELD_NAME_MAP_INIT \
+    {"FLAGS", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GPE_T_FLAGS},\
+    {"NEXT_PROTOCOL", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GPE_T_NEXT_PROTOCOL},\
+    {"RESERVED0", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GPE_T_RESERVED0},\
+    {"RESERVED1", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GPE_T_RESERVED1},\
+    {"VNI", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GPE_T_VNI},\
+    {"gpe_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GPE_T_FID_COUNT}
+
+/*!
+ * \name GRE_CHKSUM_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_CHKSUM_T_CHECKSUM 0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_CHKSUM_T_OFFSET   1
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_CHKSUM_T_FID_COUNT          2
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_CHKSUM_T_FIELD_NAME_MAP_INIT \
+    {"CHECKSUM", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_CHKSUM_T_CHECKSUM},\
+    {"OFFSET", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_CHKSUM_T_OFFSET},\
+    {"gre_chksum_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_CHKSUM_T_FID_COUNT}
+
+/*!
+ * \name GRE_KEY_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_KEY_T_VN_ID_LOWER_ENTROPY 0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_KEY_T_VN_ID_UPPER         1
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_KEY_T_FID_COUNT          2
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_KEY_T_FIELD_NAME_MAP_INIT \
+    {"VN_ID_LOWER_ENTROPY", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_KEY_T_VN_ID_LOWER_ENTROPY},\
+    {"VN_ID_UPPER", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_KEY_T_VN_ID_UPPER},\
+    {"gre_key_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_KEY_T_FID_COUNT}
+
+/*!
+ * \name GRE_ROUT_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_ROUT_T_ROUTING 0
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_ROUT_T_FID_COUNT          1
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_ROUT_T_FIELD_NAME_MAP_INIT \
+    {"ROUTING", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_ROUT_T_ROUTING},\
+    {"gre_rout_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_ROUT_T_FID_COUNT}
+
+/*!
+ * \name GRE_SEQ_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_SEQ_T_SEQUENCE 0
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_SEQ_T_FID_COUNT          1
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_SEQ_T_FIELD_NAME_MAP_INIT \
+    {"SEQUENCE", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_SEQ_T_SEQUENCE},\
+    {"gre_seq_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_SEQ_T_FID_COUNT}
+
+/*!
+ * \name GRE_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_T_C_R_K_S  0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_T_PROTOCOL 1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_T_RESERVED 2
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_T_VERSION  3
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_T_FID_COUNT          4
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_T_FIELD_NAME_MAP_INIT \
+    {"C_R_K_S", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_T_C_R_K_S},\
+    {"PROTOCOL", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_T_PROTOCOL},\
+    {"RESERVED", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_T_RESERVED},\
+    {"VERSION", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_T_VERSION},\
+    {"gre_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_T_FID_COUNT}
+
+/*!
+ * \name GTP_12BYTE_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_12BYTE_T_BYTES_11_8 0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_12BYTE_T_BYTES_3_0  1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_12BYTE_T_BYTES_7_4  2
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_12BYTE_T_FID_COUNT          3
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_12BYTE_T_FIELD_NAME_MAP_INIT \
+    {"BYTES_11_8", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_12BYTE_T_BYTES_11_8},\
+    {"BYTES_3_0", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_12BYTE_T_BYTES_3_0},\
+    {"BYTES_7_4", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_12BYTE_T_BYTES_7_4},\
+    {"gtp_12byte_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_12BYTE_T_FID_COUNT}
+
+/*!
+ * \name GTP_8BYTE_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_8BYTE_T_BYTES_3_0 0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_8BYTE_T_BYTES_7_4 1
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_8BYTE_T_FID_COUNT          2
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_8BYTE_T_FIELD_NAME_MAP_INIT \
+    {"BYTES_3_0", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_8BYTE_T_BYTES_3_0},\
+    {"BYTES_7_4", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_8BYTE_T_BYTES_7_4},\
+    {"gtp_8byte_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_8BYTE_T_FID_COUNT}
+
+/*!
+ * \name GTP_EXT_4BYTE_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_EXT_4BYTE_T_EXT_HDR 0
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_EXT_4BYTE_T_FID_COUNT          1
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_EXT_4BYTE_T_FIELD_NAME_MAP_INIT \
+    {"EXT_HDR", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_EXT_4BYTE_T_EXT_HDR},\
+    {"gtp_ext_4byte_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_EXT_4BYTE_T_FID_COUNT}
+
+/*!
+ * \name GTP_WITH_EXT_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_WITH_EXT_T_BYTES_11_8 0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_WITH_EXT_T_BYTES_3_0  1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_WITH_EXT_T_BYTES_7_4  2
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_WITH_EXT_T_FID_COUNT          3
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_WITH_EXT_T_FIELD_NAME_MAP_INIT \
+    {"BYTES_11_8", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_WITH_EXT_T_BYTES_11_8},\
+    {"BYTES_3_0", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_WITH_EXT_T_BYTES_3_0},\
+    {"BYTES_7_4", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_WITH_EXT_T_BYTES_7_4},\
+    {"gtp_with_ext_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_WITH_EXT_T_FID_COUNT}
+
+/*!
+ * \name HOP_BY_HOP_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_HOP_BY_HOP_T_HDR_EXT_LEN 0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_HOP_BY_HOP_T_NEXT_HEADER 1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_HOP_BY_HOP_T_OPTION      2
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_HOP_BY_HOP_T_FID_COUNT          3
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_HOP_BY_HOP_T_FIELD_NAME_MAP_INIT \
+    {"HDR_EXT_LEN", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_HOP_BY_HOP_T_HDR_EXT_LEN},\
+    {"NEXT_HEADER", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_HOP_BY_HOP_T_NEXT_HEADER},\
+    {"OPTION", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_HOP_BY_HOP_T_OPTION},\
+    {"hop_by_hop_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_HOP_BY_HOP_T_FID_COUNT}
+
+/*!
+ * \name ICMP_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ICMP_T_CHECKSUM  0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ICMP_T_CODE      1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ICMP_T_ICMP_TYPE 2
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ICMP_T_FID_COUNT          3
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT \
+    {"CHECKSUM", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ICMP_T_CHECKSUM},\
+    {"CODE", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ICMP_T_CODE},\
+    {"ICMP_TYPE", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ICMP_T_ICMP_TYPE},\
+    {"icmp_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ICMP_T_FID_COUNT}
+
+/*!
+ * \name IGMP_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IGMP_T_CHECKSUM      0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IGMP_T_GROUP_ADDRESS 1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IGMP_T_IGMP_TYPE     2
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IGMP_T_MAX_RESP_TIME 3
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IGMP_T_FID_COUNT          4
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IGMP_T_FIELD_NAME_MAP_INIT \
+    {"CHECKSUM", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IGMP_T_CHECKSUM},\
+    {"GROUP_ADDRESS", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IGMP_T_GROUP_ADDRESS},\
+    {"IGMP_TYPE", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IGMP_T_IGMP_TYPE},\
+    {"MAX_RESP_TIME", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IGMP_T_MAX_RESP_TIME},\
+    {"igmp_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IGMP_T_FID_COUNT}
+
+/*!
+ * \name IPFIX_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPFIX_T_EXPORT_TIME   0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPFIX_T_LENGTH        1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPFIX_T_OBS_DOMAIN_ID 2
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPFIX_T_SEQUENCE_NUM  3
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPFIX_T_VERSION       4
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPFIX_T_FID_COUNT          5
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT \
+    {"EXPORT_TIME", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPFIX_T_EXPORT_TIME},\
+    {"LENGTH", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPFIX_T_LENGTH},\
+    {"OBS_DOMAIN_ID", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPFIX_T_OBS_DOMAIN_ID},\
+    {"SEQUENCE_NUM", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPFIX_T_SEQUENCE_NUM},\
+    {"VERSION", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPFIX_T_VERSION},\
+    {"ipfix_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPFIX_T_FID_COUNT}
+
+/*!
+ * \name IPV4_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV4_T_DA                0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET 1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV4_T_HDR_CHECKSUM      2
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV4_T_ID                3
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV4_T_OPTION            4
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV4_T_PROTOCOL          5
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV4_T_SA                6
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV4_T_TOS               7
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV4_T_TOTAL_LENGTH      8
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV4_T_TTL               9
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV4_T_VERSION_HDR_LEN   10
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV4_T_FID_COUNT          11
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT \
+    {"DA", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV4_T_DA},\
+    {"FLAGS_FRAG_OFFSET", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET},\
+    {"HDR_CHECKSUM", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV4_T_HDR_CHECKSUM},\
+    {"ID", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV4_T_ID},\
+    {"OPTION", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV4_T_OPTION},\
+    {"PROTOCOL", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV4_T_PROTOCOL},\
+    {"SA", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV4_T_SA},\
+    {"TOS", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV4_T_TOS},\
+    {"TOTAL_LENGTH", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV4_T_TOTAL_LENGTH},\
+    {"TTL", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV4_T_TTL},\
+    {"VERSION_HDR_LEN", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV4_T_VERSION_HDR_LEN},\
+    {"ipv4_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV4_T_FID_COUNT}
+
+/*!
+ * \name IPV6_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV6_T_DA             0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV6_T_FLOW_LABEL     1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV6_T_HOP_LIMIT      2
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV6_T_NEXT_HEADER    3
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV6_T_PAYLOAD_LENGTH 4
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV6_T_SA             5
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV6_T_TRAFFIC_CLASS  6
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV6_T_VERSION        7
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV6_T_FID_COUNT          8
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT \
+    {"DA", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV6_T_DA},\
+    {"FLOW_LABEL", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV6_T_FLOW_LABEL},\
+    {"HOP_LIMIT", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV6_T_HOP_LIMIT},\
+    {"NEXT_HEADER", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV6_T_NEXT_HEADER},\
+    {"PAYLOAD_LENGTH", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV6_T_PAYLOAD_LENGTH},\
+    {"SA", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV6_T_SA},\
+    {"TRAFFIC_CLASS", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV6_T_TRAFFIC_CLASS},\
+    {"VERSION", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV6_T_VERSION},\
+    {"ipv6_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV6_T_FID_COUNT}
+
+/*!
+ * \name L2_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_L2_T_MACDA 0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_L2_T_MACSA 1
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_L2_T_FID_COUNT          2
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_L2_T_FIELD_NAME_MAP_INIT \
+    {"MACDA", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_L2_T_MACDA},\
+    {"MACSA", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_L2_T_MACSA},\
+    {"l2_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_L2_T_FID_COUNT}
+
+/*!
+ * \name MIRROR_ERSPAN_SN_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM 0
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT          1
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT \
+    {"SEQ_NUM", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM},\
+    {"mirror_erspan_sn_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT}
+
+/*!
+ * \name MIRROR_TRANSPORT_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MIRROR_TRANSPORT_T_DATA 0
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT          1
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT \
+    {"DATA", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MIRROR_TRANSPORT_T_DATA},\
+    {"mirror_transport_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT}
+
+/*!
+ * \name MPLS_ACH_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_ACH_T_CHANNEL_TYPE 0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_ACH_T_CW_TYPE      1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_ACH_T_RESERVED     2
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_ACH_T_VERSION      3
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_ACH_T_FID_COUNT          4
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_ACH_T_FIELD_NAME_MAP_INIT \
+    {"CHANNEL_TYPE", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_ACH_T_CHANNEL_TYPE},\
+    {"CW_TYPE", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_ACH_T_CW_TYPE},\
+    {"RESERVED", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_ACH_T_RESERVED},\
+    {"VERSION", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_ACH_T_VERSION},\
+    {"mpls_ach_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_ACH_T_FID_COUNT}
+
+/*!
+ * \name MPLS_BV_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_BV_T_VALUE 0
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_BV_T_FID_COUNT          1
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_BV_T_FIELD_NAME_MAP_INIT \
+    {"VALUE", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_BV_T_VALUE},\
+    {"mpls_bv_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_BV_T_FID_COUNT}
+
+/*!
+ * \name MPLS_CW_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_CW_T_CW_TYPE    0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_CW_T_RESERVED   1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_CW_T_SEQ_NUMBER 2
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_CW_T_FID_COUNT          3
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_CW_T_FIELD_NAME_MAP_INIT \
+    {"CW_TYPE", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_CW_T_CW_TYPE},\
+    {"RESERVED", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_CW_T_RESERVED},\
+    {"SEQ_NUMBER", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_CW_T_SEQ_NUMBER},\
+    {"mpls_cw_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_CW_T_FID_COUNT}
+
+/*!
+ * \name MPLS_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_T_BOS   0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_T_EXP   1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_T_LABEL 2
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_T_TTL   3
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_T_FID_COUNT          4
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_T_FIELD_NAME_MAP_INIT \
+    {"BOS", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_T_BOS},\
+    {"EXP", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_T_EXP},\
+    {"LABEL", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_T_LABEL},\
+    {"TTL", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_T_TTL},\
+    {"mpls_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_T_FID_COUNT}
+
+/*!
+ * \name OPAQUETAG_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_OPAQUETAG_T_TPID     0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_OPAQUETAG_T_VLAN_TAG 1
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_OPAQUETAG_T_FID_COUNT          2
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_OPAQUETAG_T_FIELD_NAME_MAP_INIT \
+    {"TPID", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_OPAQUETAG_T_TPID},\
+    {"VLAN_TAG", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_OPAQUETAG_T_VLAN_TAG},\
+    {"opaquetag_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_OPAQUETAG_T_FID_COUNT}
+
+/*!
+ * \name P_1588_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_P_1588_T_CNTRL          0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_P_1588_T_CORRECTION     1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_P_1588_T_DOMAIN_NB      2
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_P_1588_T_FLAGS          3
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_P_1588_T_LOGMSGINTERVAL 4
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_P_1588_T_MSG_LENGTH     5
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_P_1588_T_MSG_TYPE       6
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_P_1588_T_RESERVED1      7
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_P_1588_T_RESERVED2      8
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_P_1588_T_RESERVED3      9
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_P_1588_T_SEQ_ID         10
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_P_1588_T_SRCPORTID      11
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_P_1588_T_TRANSPORTSPEC  12
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_P_1588_T_VERSION        13
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_P_1588_T_FID_COUNT          14
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_P_1588_T_FIELD_NAME_MAP_INIT \
+    {"CNTRL", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_P_1588_T_CNTRL},\
+    {"CORRECTION", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_P_1588_T_CORRECTION},\
+    {"DOMAIN_NB", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_P_1588_T_DOMAIN_NB},\
+    {"FLAGS", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_P_1588_T_FLAGS},\
+    {"LOGMSGINTERVAL", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_P_1588_T_LOGMSGINTERVAL},\
+    {"MSG_LENGTH", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_P_1588_T_MSG_LENGTH},\
+    {"MSG_TYPE", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_P_1588_T_MSG_TYPE},\
+    {"RESERVED1", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_P_1588_T_RESERVED1},\
+    {"RESERVED2", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_P_1588_T_RESERVED2},\
+    {"RESERVED3", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_P_1588_T_RESERVED3},\
+    {"SEQ_ID", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_P_1588_T_SEQ_ID},\
+    {"SRCPORTID", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_P_1588_T_SRCPORTID},\
+    {"TRANSPORTSPEC", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_P_1588_T_TRANSPORTSPEC},\
+    {"VERSION", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_P_1588_T_VERSION},\
+    {"p_1588_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_P_1588_T_FID_COUNT}
+
+/*!
+ * \name PROG_EXT_HDR_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PROG_EXT_HDR_T_HDR_EXT_LEN 0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PROG_EXT_HDR_T_NEXT_HEADER 1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PROG_EXT_HDR_T_OPTION      2
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PROG_EXT_HDR_T_FID_COUNT          3
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PROG_EXT_HDR_T_FIELD_NAME_MAP_INIT \
+    {"HDR_EXT_LEN", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PROG_EXT_HDR_T_HDR_EXT_LEN},\
+    {"NEXT_HEADER", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PROG_EXT_HDR_T_NEXT_HEADER},\
+    {"OPTION", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PROG_EXT_HDR_T_OPTION},\
+    {"prog_ext_hdr_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PROG_EXT_HDR_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_0_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_0_T_FLOWSET        0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_0_T_LENGTH         1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_0_T_NEXT_HOP_INDEX 2
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_0_T_OBS_TIME_NS    3
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_0_T_OBS_TIME_S     4
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_0_T_TEMPLATE_ID    5
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_0_T_FID_COUNT          6
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_0_T_FIELD_NAME_MAP_INIT \
+    {"FLOWSET", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_0_T_FLOWSET},\
+    {"LENGTH", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_0_T_LENGTH},\
+    {"NEXT_HOP_INDEX", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_0_T_NEXT_HOP_INDEX},\
+    {"OBS_TIME_NS", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_0_T_OBS_TIME_NS},\
+    {"OBS_TIME_S", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_0_T_OBS_TIME_S},\
+    {"TEMPLATE_ID", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_0_T_TEMPLATE_ID},\
+    {"psamp_0_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_0_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_1_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_1_T_DLB_ID         0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_1_T_EGRESS_PORT    1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_1_T_EPOCH          2
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_1_T_INGRESS_PORT   3
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_1_T_SAMPLED_LENGTH 4
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_1_T_USER_META_DATA 5
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_1_T_VARIABLE_FLAG  6
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_1_T_FID_COUNT          7
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_1_T_FIELD_NAME_MAP_INIT \
+    {"DLB_ID", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_1_T_DLB_ID},\
+    {"EGRESS_PORT", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_1_T_EGRESS_PORT},\
+    {"EPOCH", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_1_T_EPOCH},\
+    {"INGRESS_PORT", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_1_T_INGRESS_PORT},\
+    {"SAMPLED_LENGTH", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_1_T_SAMPLED_LENGTH},\
+    {"USER_META_DATA", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_1_T_USER_META_DATA},\
+    {"VARIABLE_FLAG", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_1_T_VARIABLE_FLAG},\
+    {"psamp_1_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_1_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_MIRROR_ON_DROP_0_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT 0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT    1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH          2
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS     3
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S      4
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID       5
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID     6
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT          7
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT \
+    {"EGRESS_MOD_PORT", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT},\
+    {"INGRESS_PORT", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT},\
+    {"LENGTH", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH},\
+    {"OBS_TIME_NS", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS},\
+    {"OBS_TIME_S", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S},\
+    {"SWITCH_ID", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID},\
+    {"TEMPLATE_ID", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID},\
+    {"psamp_mirror_on_drop_0_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_MIRROR_ON_DROP_1_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_ING_DROP_REASON    0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_MIRROR_ON_DROP_OBJ 1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_MMU_DROP_CTRL      2
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_SAMPLED_LENGTH     3
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_USER_META_DATA     4
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_VAR_LEN_INDICATOR  5
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FID_COUNT          6
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FIELD_NAME_MAP_INIT \
+    {"ING_DROP_REASON", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_ING_DROP_REASON},\
+    {"MIRROR_ON_DROP_OBJ", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_MIRROR_ON_DROP_OBJ},\
+    {"MMU_DROP_CTRL", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_MMU_DROP_CTRL},\
+    {"SAMPLED_LENGTH", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_SAMPLED_LENGTH},\
+    {"USER_META_DATA", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_USER_META_DATA},\
+    {"VAR_LEN_INDICATOR", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_VAR_LEN_INDICATOR},\
+    {"psamp_mirror_on_drop_1_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FID_COUNT}
+
+/*!
+ * \name RARP_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RARP_T_HARDWARE_LEN  0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RARP_T_HARDWARE_TYPE 1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RARP_T_OPERATION     2
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RARP_T_PROT_ADDR_LEN 3
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RARP_T_PROTOCOL_TYPE 4
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RARP_T_SENDER_HA     5
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RARP_T_SENDER_IP     6
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RARP_T_TARGET_HA     7
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RARP_T_TARGET_IP     8
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RARP_T_FID_COUNT          9
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT \
+    {"HARDWARE_LEN", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RARP_T_HARDWARE_LEN},\
+    {"HARDWARE_TYPE", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RARP_T_HARDWARE_TYPE},\
+    {"OPERATION", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RARP_T_OPERATION},\
+    {"PROT_ADDR_LEN", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RARP_T_PROT_ADDR_LEN},\
+    {"PROTOCOL_TYPE", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RARP_T_PROTOCOL_TYPE},\
+    {"SENDER_HA", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RARP_T_SENDER_HA},\
+    {"SENDER_IP", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RARP_T_SENDER_IP},\
+    {"TARGET_HA", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RARP_T_TARGET_HA},\
+    {"TARGET_IP", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RARP_T_TARGET_IP},\
+    {"rarp_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RARP_T_FID_COUNT}
+
+/*!
+ * \name ROUTING_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ROUTING_T_DATA          0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ROUTING_T_HDR_EXT_LEN   1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ROUTING_T_NEXT_HEADER   2
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ROUTING_T_ROUTING_TYPE  3
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ROUTING_T_SEGMENTS_LEFT 4
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ROUTING_T_FID_COUNT          5
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ROUTING_T_FIELD_NAME_MAP_INIT \
+    {"DATA", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ROUTING_T_DATA},\
+    {"HDR_EXT_LEN", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ROUTING_T_HDR_EXT_LEN},\
+    {"NEXT_HEADER", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ROUTING_T_NEXT_HEADER},\
+    {"ROUTING_TYPE", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ROUTING_T_ROUTING_TYPE},\
+    {"SEGMENTS_LEFT", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ROUTING_T_SEGMENTS_LEFT},\
+    {"routing_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ROUTING_T_FID_COUNT}
+
+/*!
+ * \name RSPAN_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RSPAN_T_TAG  0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RSPAN_T_TPID 1
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RSPAN_T_FID_COUNT          2
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RSPAN_T_FIELD_NAME_MAP_INIT \
+    {"TAG", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RSPAN_T_TAG},\
+    {"TPID", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RSPAN_T_TPID},\
+    {"rspan_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RSPAN_T_FID_COUNT}
+
+/*!
+ * \name SFLOW_SHIM_0_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_0_T_SYS_DESTINATION 0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_0_T_SYS_SOURCE      1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_0_T_VERSION         2
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT          3
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_0_T_FIELD_NAME_MAP_INIT \
+    {"SYS_DESTINATION", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_0_T_SYS_DESTINATION},\
+    {"SYS_SOURCE", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_0_T_SYS_SOURCE},\
+    {"VERSION", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_0_T_VERSION},\
+    {"sflow_shim_0_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT}
+
+/*!
+ * \name SFLOW_SHIM_1_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_DEST_SAMPLE 0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_DISCARDED   1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_FLEX_SAMPLE 2
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_MCAST       3
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_SRC_SAMPLE  4
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_TRUNCATED   5
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_1_T_RESERVED         6
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_1_T_SYS_OPCODE       7
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT          8
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_1_T_FIELD_NAME_MAP_INIT \
+    {"FLAG_DEST_SAMPLE", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_DEST_SAMPLE},\
+    {"FLAG_DISCARDED", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_DISCARDED},\
+    {"FLAG_FLEX_SAMPLE", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_FLEX_SAMPLE},\
+    {"FLAG_MCAST", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_MCAST},\
+    {"FLAG_SRC_SAMPLE", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_SRC_SAMPLE},\
+    {"FLAG_TRUNCATED", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_TRUNCATED},\
+    {"RESERVED", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_1_T_RESERVED},\
+    {"SYS_OPCODE", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_1_T_SYS_OPCODE},\
+    {"sflow_shim_1_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT}
+
+/*!
+ * \name SFLOW_SHIM_2_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_2_T_SEQUENCE_NUM   0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_2_T_USER_META_DATA 1
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT          2
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_2_T_FIELD_NAME_MAP_INIT \
+    {"SEQUENCE_NUM", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_2_T_SEQUENCE_NUM},\
+    {"USER_META_DATA", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_2_T_USER_META_DATA},\
+    {"sflow_shim_2_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT}
+
+/*!
+ * \name SNAP_LLC_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SNAP_LLC_T_LENGTH   0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SNAP_LLC_T_SNAP_LLC 1
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SNAP_LLC_T_FID_COUNT          2
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SNAP_LLC_T_FIELD_NAME_MAP_INIT \
+    {"LENGTH", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SNAP_LLC_T_LENGTH},\
+    {"SNAP_LLC", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SNAP_LLC_T_SNAP_LLC},\
+    {"snap_llc_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SNAP_LLC_T_FID_COUNT}
+
+/*!
+ * \name TCP_FIRST_4BYTES_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT 0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT 1
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT          2
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT \
+    {"DST_PORT", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT},\
+    {"SRC_PORT", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT},\
+    {"tcp_first_4bytes_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT}
+
+/*!
+ * \name TCP_LAST_16BYTES_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM           0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM          1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS 2
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM           3
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR        4
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE          5
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT          6
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT \
+    {"ACK_NUM", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM},\
+    {"CHECKSUM", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM},\
+    {"HDR_LEN_AND_FLAGS", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS},\
+    {"SEQ_NUM", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM},\
+    {"URGENT_PTR", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR},\
+    {"WIN_SIZE", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE},\
+    {"tcp_last_16bytes_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT}
+
+/*!
+ * \name UDP_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UDP_T_CHECKSUM   0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UDP_T_DST_PORT   1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UDP_T_SRC_PORT   2
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UDP_T_UDP_LENGTH 3
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UDP_T_FID_COUNT          4
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT \
+    {"CHECKSUM", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UDP_T_CHECKSUM},\
+    {"DST_PORT", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UDP_T_DST_PORT},\
+    {"SRC_PORT", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UDP_T_SRC_PORT},\
+    {"UDP_LENGTH", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UDP_T_UDP_LENGTH},\
+    {"udp_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UDP_T_FID_COUNT}
+
+/*!
+ * \name UNKNOWN_L3_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD 0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD  1
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L3_T_FID_COUNT          2
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT \
+    {"FIRST_16BYTES_OF_L3_PAYLOAD", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD},\
+    {"NEXT_16BYTES_OF_L3_PAYLOAD", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD},\
+    {"unknown_l3_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L3_T_FID_COUNT}
+
+/*!
+ * \name UNKNOWN_L4_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD 0
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L4_T_FID_COUNT          1
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT \
+    {"FIRST_4BYTES_OF_L4_PAYLOAD", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD},\
+    {"unknown_l4_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L4_T_FID_COUNT}
+
+/*!
+ * \name UNKNOWN_L5_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1 0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3 1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7 2
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L5_T_FID_COUNT          3
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT \
+    {"L5_BYTES_0_1", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1},\
+    {"L5_BYTES_2_3", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3},\
+    {"L5_BYTES_4_7", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7},\
+    {"unknown_l5_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L5_T_FID_COUNT}
+
+/*!
+ * \name VLAN_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VLAN_T_CFI  0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VLAN_T_PCP  1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VLAN_T_TPID 2
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VLAN_T_VID  3
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VLAN_T_FID_COUNT          4
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT \
+    {"CFI", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VLAN_T_CFI},\
+    {"PCP", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VLAN_T_PCP},\
+    {"TPID", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VLAN_T_TPID},\
+    {"VID", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VLAN_T_VID},\
+    {"vlan_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VLAN_T_FID_COUNT}
+
+/*!
+ * \name VNTAG_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VNTAG_T_TAG  0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VNTAG_T_TPID 1
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VNTAG_T_FID_COUNT          2
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VNTAG_T_FIELD_NAME_MAP_INIT \
+    {"TAG", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VNTAG_T_TAG},\
+    {"TPID", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VNTAG_T_TPID},\
+    {"vntag_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VNTAG_T_FID_COUNT}
+
+/*!
+ * \name VXLAN_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VXLAN_T_FLAGS_RESERVED_1      0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VXLAN_T_VN_ID_LOWER_RESERVED2 1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VXLAN_T_VN_ID_UPPER           2
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VXLAN_T_FID_COUNT          3
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT \
+    {"FLAGS_RESERVED_1", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VXLAN_T_FLAGS_RESERVED_1},\
+    {"VN_ID_LOWER_RESERVED2", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VXLAN_T_VN_ID_LOWER_RESERVED2},\
+    {"VN_ID_UPPER", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VXLAN_T_VN_ID_UPPER},\
+    {"vxlan_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VXLAN_T_FID_COUNT}
+
+/*!
+ * \name WESP_T field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_WESP_T_FLAGS       0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_WESP_T_HEADER_LEN  1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_WESP_T_NEXT_HEADER 2
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_WESP_T_SEQ_NUM     3
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_WESP_T_SPI         4
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_WESP_T_TRAILER_LEN 5
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_WESP_T_WESP_IV     6
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_WESP_T_FID_COUNT          7
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_WESP_T_FIELD_NAME_MAP_INIT \
+    {"FLAGS", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_WESP_T_FLAGS},\
+    {"HEADER_LEN", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_WESP_T_HEADER_LEN},\
+    {"NEXT_HEADER", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_WESP_T_NEXT_HEADER},\
+    {"SEQ_NUM", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_WESP_T_SEQ_NUM},\
+    {"SPI", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_WESP_T_SPI},\
+    {"TRAILER_LEN", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_WESP_T_TRAILER_LEN},\
+    {"WESP_IV", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_WESP_T_WESP_IV},\
+    {"wesp_t fid count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_WESP_T_FID_COUNT}
+
+
+#endif /* BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_FLEXHDR_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_bcmpkt_rxpmd_flex_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_bcmpkt_rxpmd_flex_data.h
new file mode 100644
index 000000000000..fadbff5d32be
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_bcmpkt_rxpmd_flex_data.h
@@ -0,0 +1,173 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) map.yml.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_DATA_H
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_DATA_H
+
+/*!
+ * \name RX flex metadata field IDs.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_DLB_ECMP_DESTINATION_15_0                      0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0                                 1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_DVP_15_0                                       2
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_7_0                              3
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0                         4
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_0                        5
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32                       6
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0                              7
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_IFP_TS_CONTROL_ACTION_3_0                      8
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_ING_ETAG_ACTION_3_0                            9
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_ING_ETAG_PCP_DEI_3_0                           10
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_ING_ETAG_VID_16_15_0                           11
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_0                             12
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_INGRESS_PP_PORT_7_0                            13
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0 14
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0                    15
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_INT_PRI_3_0                                    16
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_L2_IIF_10_0                                    17
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_L2_OIF_10_0                                    18
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_L3_IIF_13_0                                    19
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0                                  20
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_MPLS_LABEL_DECAP_COUNT_3_0                     21
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0              22
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_15_0                              23
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0                            24
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0                            25
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_SVP_15_0                                       26
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0                   27
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0                        28
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0                              29
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_T_VLAN_TAG_VALUE_15_0                          30
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_TIMESTAMP_CTRL_3_0                             31
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0                32
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_VFI_15_0                                       33
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_VLAN_TAG_PRESERVE_CTRL_SVP_MIRROR_ENABLE_3_0   34
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_FID_COUNT                       35
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_COUNT                    46
+
+/*!
+ * \name Packet Flex Reason Types.
+ */
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS                               0
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED 1
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED  2
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_DST_FP                                  3
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_EM_FT                                   4
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_IFP                                     5
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_IFP_METER                               6
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED      7
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_IVXLT                                   8
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP                           9
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS                      10
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_DISCARD                          11
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE                      12
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP                           13
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS                      14
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR                            15
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF                        16
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR                            17
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL                        18
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD                    19
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0                      20
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1                      21
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2                      22
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3                      23
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4                      24
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5                      25
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6                      26
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7                      27
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED                 28
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED              29
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED                  30
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU                    31
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU                          32
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_PE_RPF                                  33
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_PE_VID_FWD_MISS                         34
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_PE_VID_RPF_MISS                         35
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_PKT_ETAG_EXPECTED                       36
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_PKT_ETAG_UNEXPECTED                     37
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED              38
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT                            39
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_SER_DROP                                40
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD         41
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_SVP                                     42
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP                               43
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED                       44
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_VFP                                     45
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT \
+    {"CML_FLAGS", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS},\
+    {"DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED},\
+    {"DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED},\
+    {"DST_FP", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_DST_FP},\
+    {"EM_FT", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_EM_FT},\
+    {"IFP", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_IFP},\
+    {"IFP_METER", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_IFP_METER},\
+    {"IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED},\
+    {"IVXLT", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_IVXLT},\
+    {"L2_DST_LOOKUP", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP},\
+    {"L2_DST_LOOKUP_MISS", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS},\
+    {"L2_SRC_DISCARD", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_DISCARD},\
+    {"L2_SRC_STATIC_MOVE", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE},\
+    {"L3_DST_LOOKUP", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP},\
+    {"L3_DST_LOOKUP_MISS", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS},\
+    {"L3_HDR_ERROR", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR},\
+    {"L3_IIF_EQ_L3_OIF", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF},\
+    {"L3_TTL_ERROR", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR},\
+    {"LEARN_CACHE_FULL", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL},\
+    {"MACSA_MULTICAST_RSVD", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD},\
+    {"MATCHED_RULE_BIT_0", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0},\
+    {"MATCHED_RULE_BIT_1", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1},\
+    {"MATCHED_RULE_BIT_2", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2},\
+    {"MATCHED_RULE_BIT_3", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3},\
+    {"MATCHED_RULE_BIT_4", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4},\
+    {"MATCHED_RULE_BIT_5", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5},\
+    {"MATCHED_RULE_BIT_6", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6},\
+    {"MATCHED_RULE_BIT_7", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7},\
+    {"MEMBERSHIP_CHECK_FAILED", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED},\
+    {"MIRROR_SAMPLER_EGR_SAMPLED", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED},\
+    {"MIRROR_SAMPLER_SAMPLED", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED},\
+    {"MPLS_CTRL_PKT_TO_CPU", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU},\
+    {"NO_COPY_TO_CPU", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU},\
+    {"PE_RPF", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_PE_RPF},\
+    {"PE_VID_FWD_MISS", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_PE_VID_FWD_MISS},\
+    {"PE_VID_RPF_MISS", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_PE_VID_RPF_MISS},\
+    {"PKT_ETAG_EXPECTED", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_PKT_ETAG_EXPECTED},\
+    {"PKT_ETAG_UNEXPECTED", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_PKT_ETAG_UNEXPECTED},\
+    {"PKT_INTEGRITY_CHECK_FAILED", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED},\
+    {"PROTOCOL_PKT", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT},\
+    {"SER_DROP", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_SER_DROP},\
+    {"SPANNING_TREE_CHECK_FAILED_RSVD", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD},\
+    {"SVP", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_SVP},\
+    {"TRACE_DOP", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP},\
+    {"URPF_CHECK_FAILED", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED},\
+    {"VFP", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_VFP},\
+    {"flex reason count", BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_COUNT}
+
+#endif /* BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_bcmpkt_rxpmd_match_id_defs.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_bcmpkt_rxpmd_match_id_defs.h
new file mode 100644
index 000000000000..1a40cb84fbcb
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_bcmpkt_rxpmd_match_id_defs.h
@@ -0,0 +1,427 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) bcm56880_a0_nfa_6_5_31_3_1_sf_match_id_info.yml
+ * for device bcm56880_a0 and variant nfa_6_5_31_3_1.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_MATCH_ID_DEFS_H
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_MATCH_ID_DEFS_H
+
+#include <bcmpkt/bcmpkt_rxpmd_match_id.h>
+
+/*!
+ * \brief Get the Match ID DataBase information.
+ *
+ * \retval bcmpkt_rxpmd_match_id_db_info_t Match ID DataBase information.
+*/
+extern bcmpkt_rxpmd_match_id_db_info_t *
+    bcm56880_a0_nfa_6_5_31_3_1_rxpmd_match_id_db_info_get(void);
+
+/*!
+ * \brief Get the Match ID Mapping information.
+ *
+ * \retval bcmpkt_rxpmd_match_id_map_info_t Match ID Mapping information.
+*/
+extern bcmpkt_rxpmd_match_id_map_info_t *
+    bcm56880_a0_nfa_6_5_31_3_1_rxpmd_match_id_map_info_get(void);
+
+/*!
+  \name RXPMD Match IDs
+*/
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ETAG  0
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG  1
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2  2
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE  3
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OPAQUETAG  4
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG  5
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_RSPAN  6
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC  7
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_VNTAG  8
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP  9
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1  10
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2  11
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD  12
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT  13
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE  14
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1  15
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2  16
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE  17
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE  18
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM  19
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY  20
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT  21
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ  22
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GTP_12BYTE  23
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GTP_8BYTE  24
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GTP_EXT_4BYTE  25
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GTP_WITH_EXT  26
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP  27
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP  28
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4  29
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6  30
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0  31
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1  32
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2  33
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3  34
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4  35
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5  36
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6  37
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH  38
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW  39
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE  40
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588  41
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP  42
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES  43
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES  44
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP  45
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3  46
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4  47
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5  48
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN  49
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK  50
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE  51
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ETAG  52
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG  53
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2  54
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE  55
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OPAQUETAG  56
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG  57
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_RSPAN  58
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC  59
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_VNTAG  60
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP  61
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1  62
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2  63
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD  64
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT  65
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE  66
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1  67
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2  68
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE  69
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE  70
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM  71
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY  72
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT  73
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ  74
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GTP_12BYTE  75
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GTP_8BYTE  76
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GTP_EXT_4BYTE  77
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GTP_WITH_EXT  78
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP  79
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP  80
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4  81
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6  82
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0  83
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1  84
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2  85
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3  86
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4  87
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5  88
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6  89
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH  90
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW  91
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE  92
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588  93
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP  94
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES  95
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES  96
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP  97
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3  98
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4  99
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5  100
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN  101
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ETAG  102
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG  103
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2  104
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE  105
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OPAQUETAG  106
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG  107
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_RSPAN  108
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC  109
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_VNTAG  110
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP  111
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1  112
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2  113
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD  114
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT  115
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE  116
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1  117
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2  118
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP  119
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP  120
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4  121
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6  122
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE  123
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588  124
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP  125
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES  126
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES  127
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP  128
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3  129
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4  130
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5  131
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ETAG  132
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG  133
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2  134
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE  135
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OPAQUETAG  136
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG  137
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_RSPAN  138
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC  139
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_VNTAG  140
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP  141
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1  142
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2  143
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD  144
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT  145
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE  146
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1  147
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2  148
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE  149
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE  150
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM  151
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY  152
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT  153
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ  154
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GTP_12BYTE  155
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GTP_8BYTE  156
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GTP_EXT_4BYTE  157
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GTP_WITH_EXT  158
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP  159
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP  160
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4  161
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6  162
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0  163
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1  164
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2  165
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3  166
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4  167
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5  168
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6  169
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH  170
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW  171
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE  172
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588  173
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP  174
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES  175
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES  176
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP  177
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3  178
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4  179
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5  180
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN  181
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK  182
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE  183
+#define BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_COUNT  184
+
+#define BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT \
+    {"EGRESS_PKT_FWD_L2_HDR_ETAG", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ETAG}, \
+    {"EGRESS_PKT_FWD_L2_HDR_ITAG", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG}, \
+    {"EGRESS_PKT_FWD_L2_HDR_L2", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2}, \
+    {"EGRESS_PKT_FWD_L2_HDR_NONE", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE}, \
+    {"EGRESS_PKT_FWD_L2_HDR_OPAQUETAG", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OPAQUETAG}, \
+    {"EGRESS_PKT_FWD_L2_HDR_OTAG", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG}, \
+    {"EGRESS_PKT_FWD_L2_HDR_RSPAN", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_RSPAN}, \
+    {"EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC}, \
+    {"EGRESS_PKT_FWD_L2_HDR_VNTAG", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_VNTAG}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ARP", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_BFD", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GPE", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GTP_12BYTE", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GTP_12BYTE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GTP_8BYTE", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GTP_8BYTE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GTP_EXT_4BYTE", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GTP_EXT_4BYTE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GTP_WITH_EXT", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GTP_WITH_EXT}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ICMP", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IGMP", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV4", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV6", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS0", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS1", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS2", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS3", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS4", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS5", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS6", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_NONE", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_P_1588", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_RARP", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UDP", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_VXLAN", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN}, \
+    {"EGRESS_PKT_SYS_HDR_LOOPBACK", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK}, \
+    {"EGRESS_PKT_SYS_HDR_NONE", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_ETAG", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ETAG}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_ITAG", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_L2", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_NONE", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_OPAQUETAG", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OPAQUETAG}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_OTAG", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_RSPAN", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_RSPAN}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_VNTAG", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_VNTAG}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GTP_12BYTE", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GTP_12BYTE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GTP_8BYTE", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GTP_8BYTE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GTP_EXT_4BYTE", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GTP_EXT_4BYTE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GTP_WITH_EXT", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GTP_WITH_EXT}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN}, \
+    {"INGRESS_PKT_INNER_L2_HDR_ETAG", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ETAG}, \
+    {"INGRESS_PKT_INNER_L2_HDR_ITAG", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG}, \
+    {"INGRESS_PKT_INNER_L2_HDR_L2", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2}, \
+    {"INGRESS_PKT_INNER_L2_HDR_NONE", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE}, \
+    {"INGRESS_PKT_INNER_L2_HDR_OPAQUETAG", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OPAQUETAG}, \
+    {"INGRESS_PKT_INNER_L2_HDR_OTAG", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG}, \
+    {"INGRESS_PKT_INNER_L2_HDR_RSPAN", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_RSPAN}, \
+    {"INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC}, \
+    {"INGRESS_PKT_INNER_L2_HDR_VNTAG", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_VNTAG}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ARP", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_BFD", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ICMP", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_IGMP", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV4", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV6", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_NONE", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_P_1588", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_RARP", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UDP", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_ETAG", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ETAG}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_ITAG", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_L2", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_NONE", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_OPAQUETAG", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OPAQUETAG}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_OTAG", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_RSPAN", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_RSPAN}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_VNTAG", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_VNTAG}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ARP", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_BFD", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GPE", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GTP_12BYTE", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GTP_12BYTE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GTP_8BYTE", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GTP_8BYTE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GTP_EXT_4BYTE", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GTP_EXT_4BYTE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GTP_WITH_EXT", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GTP_WITH_EXT}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ICMP", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IGMP", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV4", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV6", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_NONE", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_P_1588", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_RARP", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UDP", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN}, \
+    {"INGRESS_PKT_SYS_HDR_LOOPBACK", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK}, \
+    {"INGRESS_PKT_SYS_HDR_NONE", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE}, \
+    {"rxpmd_match_id_count", BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_COUNT}
+
+#endif /*! BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_MATCH_ID_DEFS_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_bcmpkt_flexhdr.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_bcmpkt_flexhdr.h
deleted file mode 100644
index 5a0497165ae7..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_bcmpkt_flexhdr.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) header.yml.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_FLEXHDR_H
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_FLEXHDR_H
-
-#include <bcmpkt/bcmpkt_flexhdr_internal.h>
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T                      0
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T         1
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T         2
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T            3
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T        4
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T         5
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ETHERTYPE_T                6
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T         7
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ICMP_T                     8
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPFIX_T                    9
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T                     10
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T                     11
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_L2_T                       12
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_ERSPAN_SN_T         13
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_TRANSPORT_T         14
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T   15
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T   16
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T   17
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T                     18
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T         19
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T         20
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UDP_T                      21
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T               22
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L4_T               23
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T               24
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_VLAN_T                     25
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_VXLAN_T                    26
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_T               27
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_FLEXHDR_COUNT    28
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_FLEXHDR_NAME_MAP_INIT \
-    {"arp_t", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T},\
-    {"cpu_composites_0_t", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T},\
-    {"cpu_composites_1_t", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T},\
-    {"ep_nih_header_t", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T},\
-    {"erspan3_fixed_hdr_t", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T},\
-    {"erspan3_subhdr_5_t", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T},\
-    {"ethertype_t", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ETHERTYPE_T},\
-    {"generic_loopback_t", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T},\
-    {"icmp_t", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ICMP_T},\
-    {"ipfix_t", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPFIX_T},\
-    {"ipv4_t", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T},\
-    {"ipv6_t", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T},\
-    {"l2_t", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_L2_T},\
-    {"mirror_erspan_sn_t", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_ERSPAN_SN_T},\
-    {"mirror_transport_t", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_TRANSPORT_T},\
-    {"psamp_mirror_on_drop_0_t", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T},\
-    {"psamp_mirror_on_drop_1_t", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T},\
-    {"psamp_mirror_on_drop_2_t", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T},\
-    {"rarp_t", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T},\
-    {"tcp_first_4bytes_t", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T},\
-    {"tcp_last_16bytes_t", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T},\
-    {"udp_t", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UDP_T},\
-    {"unknown_l3_t", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T},\
-    {"unknown_l4_t", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L4_T},\
-    {"unknown_l5_t", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T},\
-    {"vlan_t", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_VLAN_T},\
-    {"vxlan_t", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_VXLAN_T},\
-    {"RXPMD_FLEX_T", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_T},\
-    {"flexhdr count", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_FLEXHDR_COUNT}
-
-#endif /* BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_FLEXHDR_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_bcmpkt_flexhdr_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_bcmpkt_flexhdr_data.h
deleted file mode 100644
index b7c0fb4f3492..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_bcmpkt_flexhdr_data.h
+++ /dev/null
@@ -1,592 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) header.yml.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_FLEXHDR_DATA_H
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_FLEXHDR_DATA_H
-
-/*!
- * \name ARP_T field IDs.
- */
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_HARDWARE_LEN  0
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_HARDWARE_TYPE 1
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_OPERATION     2
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_PROT_ADDR_LEN 3
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_PROTOCOL_TYPE 4
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_SENDER_HA     5
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_SENDER_IP     6
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_TARGET_HA     7
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_TARGET_IP     8
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_FID_COUNT          9
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT \
-    {"HARDWARE_LEN", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_HARDWARE_LEN},\
-    {"HARDWARE_TYPE", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_HARDWARE_TYPE},\
-    {"OPERATION", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_OPERATION},\
-    {"PROT_ADDR_LEN", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_PROT_ADDR_LEN},\
-    {"PROTOCOL_TYPE", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_PROTOCOL_TYPE},\
-    {"SENDER_HA", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_SENDER_HA},\
-    {"SENDER_IP", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_SENDER_IP},\
-    {"TARGET_HA", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_TARGET_HA},\
-    {"TARGET_IP", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_TARGET_IP},\
-    {"arp_t fid count", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_FID_COUNT}
-
-/*!
- * \name CPU_COMPOSITES_0_T field IDs.
- */
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0 0
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1 1
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2 2
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3 3
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4 4
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5 5
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6 6
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT          7
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT \
-    {"DMA_CONT0", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0},\
-    {"DMA_CONT1", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1},\
-    {"DMA_CONT2", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2},\
-    {"DMA_CONT3", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3},\
-    {"DMA_CONT4", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4},\
-    {"DMA_CONT5", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5},\
-    {"DMA_CONT6", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6},\
-    {"cpu_composites_0_t fid count", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT}
-
-/*!
- * \name CPU_COMPOSITES_1_T field IDs.
- */
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10 0
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11 1
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12 2
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13 3
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14 4
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15 5
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16 6
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17 7
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7  8
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8  9
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9  10
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT          11
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT \
-    {"DMA_CONT10", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10},\
-    {"DMA_CONT11", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11},\
-    {"DMA_CONT12", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12},\
-    {"DMA_CONT13", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13},\
-    {"DMA_CONT14", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14},\
-    {"DMA_CONT15", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15},\
-    {"DMA_CONT16", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16},\
-    {"DMA_CONT17", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17},\
-    {"DMA_CONT7", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7},\
-    {"DMA_CONT8", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8},\
-    {"DMA_CONT9", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9},\
-    {"cpu_composites_1_t fid count", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT}
-
-/*!
- * \name EP_NIH_HEADER_T field IDs.
- */
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_HEADER_SUBTYPE       0
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_HEADER_TYPE          1
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_A        2
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_B        3
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_C        4
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_A      5
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_B      6
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_C      7
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_RECIRC_PROFILE_INDEX 8
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_RESERVED_0           9
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_START                10
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_TIMESTAMP            11
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT          12
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_FIELD_NAME_MAP_INIT \
-    {"HEADER_SUBTYPE", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_HEADER_SUBTYPE},\
-    {"HEADER_TYPE", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_HEADER_TYPE},\
-    {"OPAQUE_CTRL_A", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_A},\
-    {"OPAQUE_CTRL_B", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_B},\
-    {"OPAQUE_CTRL_C", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_C},\
-    {"OPAQUE_OBJECT_A", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_A},\
-    {"OPAQUE_OBJECT_B", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_B},\
-    {"OPAQUE_OBJECT_C", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_C},\
-    {"RECIRC_PROFILE_INDEX", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_RECIRC_PROFILE_INDEX},\
-    {"RESERVED_0", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_RESERVED_0},\
-    {"START", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_START},\
-    {"TIMESTAMP", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_TIMESTAMP},\
-    {"ep_nih_header_t fid count", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT}
-
-/*!
- * \name ERSPAN3_FIXED_HDR_T field IDs.
- */
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO               0
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_COS               1
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID           2
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O 3
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID        4
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_T                 5
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP         6
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VER               7
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN              8
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT          9
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT \
-    {"BSO", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO},\
-    {"COS", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_COS},\
-    {"GBP_SID", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID},\
-    {"P_FT_HWID_D_GRA_O", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O},\
-    {"SESSION_ID", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID},\
-    {"T", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_T},\
-    {"TIMESTAMP", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP},\
-    {"VER", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VER},\
-    {"VLAN", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN},\
-    {"erspan3_fixed_hdr_t fid count", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT}
-
-/*!
- * \name ERSPAN3_SUBHDR_5_T field IDs.
- */
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID 0
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID     1
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID   2
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP   3
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT          4
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT \
-    {"PLATFORM_ID", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID},\
-    {"PORT_ID", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID},\
-    {"SWITCH_ID", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID},\
-    {"TIMESTAMP", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP},\
-    {"erspan3_subhdr_5_t fid count", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT}
-
-/*!
- * \name ETHERTYPE_T field IDs.
- */
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ETHERTYPE_T_TYPE 0
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ETHERTYPE_T_FID_COUNT          1
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT \
-    {"TYPE", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ETHERTYPE_T_TYPE},\
-    {"ethertype_t fid count", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ETHERTYPE_T_FID_COUNT}
-
-/*!
- * \name GENERIC_LOOPBACK_T field IDs.
- */
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ    0
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE   1
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ        2
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_FLAGS              3
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE        4
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY     5
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL     6
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ      7
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0  8
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1  9
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ            10
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1         11
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_2         12
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT 13
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE         14
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT          15
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT \
-    {"DESTINATION_OBJ", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ},\
-    {"DESTINATION_TYPE", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE},\
-    {"ENTROPY_OBJ", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ},\
-    {"FLAGS", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_FLAGS},\
-    {"HEADER_TYPE", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE},\
-    {"INPUT_PRIORITY", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY},\
-    {"INTERFACE_CTRL", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL},\
-    {"INTERFACE_OBJ", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ},\
-    {"PROCESSING_CTRL_0", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0},\
-    {"PROCESSING_CTRL_1", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1},\
-    {"QOS_OBJ", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ},\
-    {"RESERVED_1", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1},\
-    {"RESERVED_2", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_2},\
-    {"SOURCE_SYSTEM_PORT", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT},\
-    {"START_BYTE", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE},\
-    {"generic_loopback_t fid count", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT}
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NO_OP       0
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2_OIF      1
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED    2
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__VP          3
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP        4
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NHOP        5
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2MC_GROUP  6
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L3MC_GROUP  7
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED_1  8
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP_MEMBER 9
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__DEVICE_PORT 10
-
-/*!
- * \name ICMP_T field IDs.
- */
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ICMP_T_CHECKSUM  0
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ICMP_T_CODE      1
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ICMP_T_ICMP_TYPE 2
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ICMP_T_FID_COUNT          3
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT \
-    {"CHECKSUM", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ICMP_T_CHECKSUM},\
-    {"CODE", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ICMP_T_CODE},\
-    {"ICMP_TYPE", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ICMP_T_ICMP_TYPE},\
-    {"icmp_t fid count", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ICMP_T_FID_COUNT}
-
-/*!
- * \name IPFIX_T field IDs.
- */
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPFIX_T_EXPORT_TIME   0
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPFIX_T_LENGTH        1
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPFIX_T_OBS_DOMAIN_ID 2
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPFIX_T_SEQUENCE_NUM  3
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPFIX_T_VERSION       4
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPFIX_T_FID_COUNT          5
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT \
-    {"EXPORT_TIME", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPFIX_T_EXPORT_TIME},\
-    {"LENGTH", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPFIX_T_LENGTH},\
-    {"OBS_DOMAIN_ID", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPFIX_T_OBS_DOMAIN_ID},\
-    {"SEQUENCE_NUM", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPFIX_T_SEQUENCE_NUM},\
-    {"VERSION", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPFIX_T_VERSION},\
-    {"ipfix_t fid count", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPFIX_T_FID_COUNT}
-
-/*!
- * \name IPV4_T field IDs.
- */
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_DA                0
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET 1
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_HDR_CHECKSUM      2
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_ID                3
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_OPTION            4
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_PROTOCOL          5
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_SA                6
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_TOS               7
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_TOTAL_LENGTH      8
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_TTL               9
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_VERSION_HDR_LEN   10
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_FID_COUNT          11
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT \
-    {"DA", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_DA},\
-    {"FLAGS_FRAG_OFFSET", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET},\
-    {"HDR_CHECKSUM", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_HDR_CHECKSUM},\
-    {"ID", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_ID},\
-    {"OPTION", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_OPTION},\
-    {"PROTOCOL", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_PROTOCOL},\
-    {"SA", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_SA},\
-    {"TOS", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_TOS},\
-    {"TOTAL_LENGTH", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_TOTAL_LENGTH},\
-    {"TTL", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_TTL},\
-    {"VERSION_HDR_LEN", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_VERSION_HDR_LEN},\
-    {"ipv4_t fid count", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_FID_COUNT}
-
-/*!
- * \name IPV6_T field IDs.
- */
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_DA             0
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_FLOW_LABEL     1
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_HOP_LIMIT      2
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_NEXT_HEADER    3
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_PAYLOAD_LENGTH 4
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_SA             5
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_TRAFFIC_CLASS  6
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_VERSION        7
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_FID_COUNT          8
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT \
-    {"DA", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_DA},\
-    {"FLOW_LABEL", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_FLOW_LABEL},\
-    {"HOP_LIMIT", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_HOP_LIMIT},\
-    {"NEXT_HEADER", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_NEXT_HEADER},\
-    {"PAYLOAD_LENGTH", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_PAYLOAD_LENGTH},\
-    {"SA", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_SA},\
-    {"TRAFFIC_CLASS", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_TRAFFIC_CLASS},\
-    {"VERSION", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_VERSION},\
-    {"ipv6_t fid count", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_FID_COUNT}
-
-/*!
- * \name L2_T field IDs.
- */
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_L2_T_MACDA 0
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_L2_T_MACSA 1
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_L2_T_FID_COUNT          2
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_L2_T_FIELD_NAME_MAP_INIT \
-    {"MACDA", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_L2_T_MACDA},\
-    {"MACSA", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_L2_T_MACSA},\
-    {"l2_t fid count", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_L2_T_FID_COUNT}
-
-/*!
- * \name MIRROR_ERSPAN_SN_T field IDs.
- */
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM 0
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT          1
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT \
-    {"SEQ_NUM", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM},\
-    {"mirror_erspan_sn_t fid count", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT}
-
-/*!
- * \name MIRROR_TRANSPORT_T field IDs.
- */
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_TRANSPORT_T_DATA 0
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT          1
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT \
-    {"DATA", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_TRANSPORT_T_DATA},\
-    {"mirror_transport_t fid count", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT}
-
-/*!
- * \name PSAMP_MIRROR_ON_DROP_0_T field IDs.
- */
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT 0
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT    1
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH          2
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS     3
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S      4
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID       5
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID     6
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT          7
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT \
-    {"EGRESS_MOD_PORT", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT},\
-    {"INGRESS_PORT", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT},\
-    {"LENGTH", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH},\
-    {"OBS_TIME_NS", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS},\
-    {"OBS_TIME_S", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S},\
-    {"SWITCH_ID", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID},\
-    {"TEMPLATE_ID", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID},\
-    {"psamp_mirror_on_drop_0_t fid count", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT}
-
-/*!
- * \name PSAMP_MIRROR_ON_DROP_1_T field IDs.
- */
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_ING_DROP_REASON    0
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_MIRROR_ON_DROP_OBJ 1
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_MMU_DROP_CTRL      2
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_SAMPLED_LENGTH     3
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_USER_META_DATA     4
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_VAR_LEN_INDICATOR  5
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FID_COUNT          6
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FIELD_NAME_MAP_INIT \
-    {"ING_DROP_REASON", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_ING_DROP_REASON},\
-    {"MIRROR_ON_DROP_OBJ", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_MIRROR_ON_DROP_OBJ},\
-    {"MMU_DROP_CTRL", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_MMU_DROP_CTRL},\
-    {"SAMPLED_LENGTH", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_SAMPLED_LENGTH},\
-    {"USER_META_DATA", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_USER_META_DATA},\
-    {"VAR_LEN_INDICATOR", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_VAR_LEN_INDICATOR},\
-    {"psamp_mirror_on_drop_1_t fid count", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FID_COUNT}
-
-/*!
- * \name PSAMP_MIRROR_ON_DROP_2_T field IDs.
- */
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_EGR_DROP_REASON       0
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_EP_COPY_SESSION_INDEX 1
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_RESERVED_0            2
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_SAMPLED_LENGTH        3
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_USER_META_DATA        4
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_VAR_LEN_INDICATOR     5
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_FID_COUNT          6
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_FIELD_NAME_MAP_INIT \
-    {"EGR_DROP_REASON", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_EGR_DROP_REASON},\
-    {"EP_COPY_SESSION_INDEX", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_EP_COPY_SESSION_INDEX},\
-    {"RESERVED_0", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_RESERVED_0},\
-    {"SAMPLED_LENGTH", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_SAMPLED_LENGTH},\
-    {"USER_META_DATA", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_USER_META_DATA},\
-    {"VAR_LEN_INDICATOR", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_VAR_LEN_INDICATOR},\
-    {"psamp_mirror_on_drop_2_t fid count", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_FID_COUNT}
-
-/*!
- * \name RARP_T field IDs.
- */
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_HARDWARE_LEN  0
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_HARDWARE_TYPE 1
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_OPERATION     2
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_PROT_ADDR_LEN 3
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_PROTOCOL_TYPE 4
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_SENDER_HA     5
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_SENDER_IP     6
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_TARGET_HA     7
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_TARGET_IP     8
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_FID_COUNT          9
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT \
-    {"HARDWARE_LEN", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_HARDWARE_LEN},\
-    {"HARDWARE_TYPE", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_HARDWARE_TYPE},\
-    {"OPERATION", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_OPERATION},\
-    {"PROT_ADDR_LEN", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_PROT_ADDR_LEN},\
-    {"PROTOCOL_TYPE", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_PROTOCOL_TYPE},\
-    {"SENDER_HA", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_SENDER_HA},\
-    {"SENDER_IP", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_SENDER_IP},\
-    {"TARGET_HA", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_TARGET_HA},\
-    {"TARGET_IP", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_TARGET_IP},\
-    {"rarp_t fid count", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_FID_COUNT}
-
-/*!
- * \name TCP_FIRST_4BYTES_T field IDs.
- */
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT 0
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT 1
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT          2
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT \
-    {"DST_PORT", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT},\
-    {"SRC_PORT", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT},\
-    {"tcp_first_4bytes_t fid count", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT}
-
-/*!
- * \name TCP_LAST_16BYTES_T field IDs.
- */
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM           0
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM          1
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS 2
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM           3
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR        4
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE          5
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT          6
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT \
-    {"ACK_NUM", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM},\
-    {"CHECKSUM", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM},\
-    {"HDR_LEN_AND_FLAGS", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS},\
-    {"SEQ_NUM", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM},\
-    {"URGENT_PTR", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR},\
-    {"WIN_SIZE", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE},\
-    {"tcp_last_16bytes_t fid count", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT}
-
-/*!
- * \name UDP_T field IDs.
- */
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UDP_T_CHECKSUM   0
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UDP_T_DST_PORT   1
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UDP_T_SRC_PORT   2
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UDP_T_UDP_LENGTH 3
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UDP_T_FID_COUNT          4
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT \
-    {"CHECKSUM", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UDP_T_CHECKSUM},\
-    {"DST_PORT", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UDP_T_DST_PORT},\
-    {"SRC_PORT", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UDP_T_SRC_PORT},\
-    {"UDP_LENGTH", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UDP_T_UDP_LENGTH},\
-    {"udp_t fid count", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UDP_T_FID_COUNT}
-
-/*!
- * \name UNKNOWN_L3_T field IDs.
- */
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD 0
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD  1
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT          2
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT \
-    {"FIRST_16BYTES_OF_L3_PAYLOAD", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD},\
-    {"NEXT_16BYTES_OF_L3_PAYLOAD", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD},\
-    {"unknown_l3_t fid count", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT}
-
-/*!
- * \name UNKNOWN_L4_T field IDs.
- */
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD 0
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT          1
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT \
-    {"FIRST_4BYTES_OF_L4_PAYLOAD", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD},\
-    {"unknown_l4_t fid count", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT}
-
-/*!
- * \name UNKNOWN_L5_T field IDs.
- */
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1 0
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3 1
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7 2
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT          3
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT \
-    {"L5_BYTES_0_1", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1},\
-    {"L5_BYTES_2_3", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3},\
-    {"L5_BYTES_4_7", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7},\
-    {"unknown_l5_t fid count", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT}
-
-/*!
- * \name VLAN_T field IDs.
- */
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_VLAN_T_CFI  0
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_VLAN_T_PCP  1
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_VLAN_T_TPID 2
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_VLAN_T_VID  3
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_VLAN_T_FID_COUNT          4
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT \
-    {"CFI", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_VLAN_T_CFI},\
-    {"PCP", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_VLAN_T_PCP},\
-    {"TPID", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_VLAN_T_TPID},\
-    {"VID", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_VLAN_T_VID},\
-    {"vlan_t fid count", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_VLAN_T_FID_COUNT}
-
-/*!
- * \name VXLAN_T field IDs.
- */
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_VXLAN_T_FLAGS_RESERVED_1 0
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_VXLAN_T_RESERVED2        1
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_VXLAN_T_VN_ID            2
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_VXLAN_T_FID_COUNT          3
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT \
-    {"FLAGS_RESERVED_1", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_VXLAN_T_FLAGS_RESERVED_1},\
-    {"RESERVED2", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_VXLAN_T_RESERVED2},\
-    {"VN_ID", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_VXLAN_T_VN_ID},\
-    {"vxlan_t fid count", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_VXLAN_T_FID_COUNT}
-
-
-#endif /* BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_FLEXHDR_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_bcmpkt_rxpmd_flex_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_bcmpkt_rxpmd_flex_data.h
deleted file mode 100644
index e4fd6a6ccec8..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_bcmpkt_rxpmd_flex_data.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) map.yml.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_DATA_H
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_DATA_H
-
-/*!
- * \name RX flex metadata field IDs.
- */
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0                                 0
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_DVP_15_0                                       1
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_7_0                              2
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_HIGH_3_0                         3
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0                         4
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_DROP_CODE_15_0                      5
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_RECIRC_CODE_3_0                     6
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_15_0                      7
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_31_16                     8
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_ERSPAN3_GBP_SID_15_0                           9
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_15_0                        10
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_16                       11
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32                       12
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0                              13
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_15_0                             14
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_16                            15
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_INGRESS_PP_PORT_8_0                            16
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0 17
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0                    18
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_INT_PRI_3_0                                    19
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_L2_IIF_10_0                                    20
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_L2_OIF_10_0                                    21
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_L2_TUNNEL_SVP_15_0                             22
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_L3_IIF_13_0                                    23
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0                                  24
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_14_0              25
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_14_0                              26
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0                            27
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0                            28
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0                   29
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0                        30
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0                              31
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_SYSTEM_SOURCE_15_0                             32
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_TAG_ACTION_CTRL_1_0                            33
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0                34
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_VFI_15_0                                       35
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_FID_COUNT                       36
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_COUNT                    21
-
-/*!
- * \name Packet Flex Reason Types.
- */
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS                  0
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IFP                        1
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER                  2
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT                      3
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP              4
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS         5
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_DISCARD             6
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE         7
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP              8
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS         9
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR               10
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR               11
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL           12
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST            13
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED    14
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU             15
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED 16
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT               17
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED 18
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP                  19
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_VFP                        20
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT \
-    {"CML_FLAGS", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS},\
-    {"IFP", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IFP},\
-    {"IFP_METER", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER},\
-    {"IVXLT", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT},\
-    {"L2_DST_LOOKUP", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP},\
-    {"L2_DST_LOOKUP_MISS", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS},\
-    {"L2_SRC_DISCARD", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_DISCARD},\
-    {"L2_SRC_STATIC_MOVE", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE},\
-    {"L3_DST_LOOKUP", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP},\
-    {"L3_DST_LOOKUP_MISS", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS},\
-    {"L3_HDR_ERROR", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR},\
-    {"L3_TTL_ERROR", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR},\
-    {"LEARN_CACHE_FULL", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL},\
-    {"MACSA_MULTICAST", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST},\
-    {"MEMBERSHIP_CHECK_FAILED", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED},\
-    {"NO_COPY_TO_CPU", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU},\
-    {"PKT_INTEGRITY_CHECK_FAILED", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED},\
-    {"PROTOCOL_PKT", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT},\
-    {"SPANNING_TREE_CHECK_FAILED", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED},\
-    {"TRACE_DOP", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP},\
-    {"VFP", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_VFP},\
-    {"flex reason count", BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_COUNT}
-
-#endif /* BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_bcmpkt_rxpmd_match_id_defs.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_bcmpkt_rxpmd_match_id_defs.h
deleted file mode 100644
index 6d34bc8283a2..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_bcmpkt_rxpmd_match_id_defs.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) bcm56890_a0_cna_6_5_30_2_0_sf_match_id_info.yml
- * for device bcm56890_a0 and variant cna_6_5_30_2_0.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H
-
-#include <bcmpkt/bcmpkt_rxpmd_match_id.h>
-
-/*!
- * \brief Get the Match ID DataBase information.
- *
- * \retval bcmpkt_rxpmd_match_id_db_info_t Match ID DataBase information.
-*/
-extern bcmpkt_rxpmd_match_id_db_info_t *
-    bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db_info_get(void);
-
-/*!
- * \brief Get the Match ID Mapping information.
- *
- * \retval bcmpkt_rxpmd_match_id_map_info_t Match ID Mapping information.
-*/
-extern bcmpkt_rxpmd_match_id_map_info_t *
-    bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_map_info_get(void);
-
-/*!
-  \name RXPMD Match IDs
-*/
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG  0
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2  1
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE  2
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG  3
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP  4
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE  5
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP  6
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4  7
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6  8
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE  9
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP  10
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES  11
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES  12
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP  13
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3  14
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4  15
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5  16
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN  17
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH  18
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK  19
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE  20
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG  21
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2  22
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE  23
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG  24
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP  25
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE  26
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP  27
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4  28
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6  29
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE  30
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP  31
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES  32
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES  33
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP  34
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3  35
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4  36
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5  37
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN  38
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG  39
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2  40
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE  41
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG  42
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP  43
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE  44
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP  45
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4  46
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6  47
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE  48
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP  49
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES  50
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES  51
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP  52
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3  53
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4  54
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5  55
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG  56
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2  57
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE  58
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG  59
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP  60
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE  61
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP  62
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4  63
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6  64
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE  65
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP  66
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES  67
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES  68
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP  69
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3  70
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4  71
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5  72
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN  73
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH  74
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK  75
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE  76
-#define BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_COUNT  77
-
-#define BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT \
-    {"EGRESS_PKT_FWD_L2_HDR_ITAG", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG}, \
-    {"EGRESS_PKT_FWD_L2_HDR_L2", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2}, \
-    {"EGRESS_PKT_FWD_L2_HDR_NONE", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE}, \
-    {"EGRESS_PKT_FWD_L2_HDR_OTAG", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ARP", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ICMP", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV4", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV6", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_NONE", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_RARP", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UDP", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_VXLAN", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN}, \
-    {"EGRESS_PKT_SYS_HDR_EP_NIH", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH}, \
-    {"EGRESS_PKT_SYS_HDR_LOOPBACK", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK}, \
-    {"EGRESS_PKT_SYS_HDR_NONE", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_ITAG", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_L2", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_NONE", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_OTAG", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN}, \
-    {"INGRESS_PKT_INNER_L2_HDR_ITAG", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG}, \
-    {"INGRESS_PKT_INNER_L2_HDR_L2", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2}, \
-    {"INGRESS_PKT_INNER_L2_HDR_NONE", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE}, \
-    {"INGRESS_PKT_INNER_L2_HDR_OTAG", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ARP", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ICMP", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV4", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV6", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_NONE", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_RARP", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UDP", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_ITAG", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_L2", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_NONE", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_OTAG", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ARP", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ICMP", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV4", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV6", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_NONE", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_RARP", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UDP", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN}, \
-    {"INGRESS_PKT_SYS_HDR_EP_NIH", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH}, \
-    {"INGRESS_PKT_SYS_HDR_LOOPBACK", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK}, \
-    {"INGRESS_PKT_SYS_HDR_NONE", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE}, \
-    {"rxpmd_match_id_count", BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_COUNT}
-
-#endif /*! BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_bcmpkt_flexhdr.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_bcmpkt_flexhdr.h
new file mode 100644
index 000000000000..f40b0e50cd65
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_bcmpkt_flexhdr.h
@@ -0,0 +1,96 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) header.yml.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_FLEXHDR_H
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_FLEXHDR_H
+
+#include <bcmpkt/bcmpkt_flexhdr_internal.h>
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T                      0
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T         1
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T         2
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T            3
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T        4
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T         5
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T                6
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T         7
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ICMP_T                     8
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPFIX_T                    9
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T                     10
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T                     11
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_L2_T                       12
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T         13
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T         14
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T   15
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T   16
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T   17
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T                     18
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T         19
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T         20
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UDP_T                      21
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T               22
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T               23
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T               24
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_VLAN_T                     25
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_VXLAN_T                    26
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_T               27
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_FLEXHDR_COUNT    28
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_FLEXHDR_NAME_MAP_INIT \
+    {"arp_t", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T},\
+    {"cpu_composites_0_t", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T},\
+    {"cpu_composites_1_t", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T},\
+    {"ep_nih_header_t", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T},\
+    {"erspan3_fixed_hdr_t", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T},\
+    {"erspan3_subhdr_5_t", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T},\
+    {"ethertype_t", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T},\
+    {"generic_loopback_t", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T},\
+    {"icmp_t", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ICMP_T},\
+    {"ipfix_t", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPFIX_T},\
+    {"ipv4_t", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T},\
+    {"ipv6_t", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T},\
+    {"l2_t", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_L2_T},\
+    {"mirror_erspan_sn_t", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T},\
+    {"mirror_transport_t", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T},\
+    {"psamp_mirror_on_drop_0_t", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T},\
+    {"psamp_mirror_on_drop_1_t", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T},\
+    {"psamp_mirror_on_drop_2_t", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T},\
+    {"rarp_t", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T},\
+    {"tcp_first_4bytes_t", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T},\
+    {"tcp_last_16bytes_t", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T},\
+    {"udp_t", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UDP_T},\
+    {"unknown_l3_t", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T},\
+    {"unknown_l4_t", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T},\
+    {"unknown_l5_t", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T},\
+    {"vlan_t", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_VLAN_T},\
+    {"vxlan_t", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_VXLAN_T},\
+    {"RXPMD_FLEX_T", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_T},\
+    {"flexhdr count", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_FLEXHDR_COUNT}
+
+#endif /* BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_FLEXHDR_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_bcmpkt_flexhdr_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_bcmpkt_flexhdr_data.h
new file mode 100644
index 000000000000..430a15cafe98
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_bcmpkt_flexhdr_data.h
@@ -0,0 +1,592 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) header.yml.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_FLEXHDR_DATA_H
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_FLEXHDR_DATA_H
+
+/*!
+ * \name ARP_T field IDs.
+ */
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_HARDWARE_LEN  0
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_HARDWARE_TYPE 1
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_OPERATION     2
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_PROT_ADDR_LEN 3
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_PROTOCOL_TYPE 4
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_SENDER_HA     5
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_SENDER_IP     6
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_TARGET_HA     7
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_TARGET_IP     8
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_FID_COUNT          9
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT \
+    {"HARDWARE_LEN", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_HARDWARE_LEN},\
+    {"HARDWARE_TYPE", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_HARDWARE_TYPE},\
+    {"OPERATION", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_OPERATION},\
+    {"PROT_ADDR_LEN", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_PROT_ADDR_LEN},\
+    {"PROTOCOL_TYPE", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_PROTOCOL_TYPE},\
+    {"SENDER_HA", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_SENDER_HA},\
+    {"SENDER_IP", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_SENDER_IP},\
+    {"TARGET_HA", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_TARGET_HA},\
+    {"TARGET_IP", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_TARGET_IP},\
+    {"arp_t fid count", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_FID_COUNT}
+
+/*!
+ * \name CPU_COMPOSITES_0_T field IDs.
+ */
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0 0
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1 1
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2 2
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3 3
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4 4
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5 5
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6 6
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT          7
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT \
+    {"DMA_CONT0", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0},\
+    {"DMA_CONT1", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1},\
+    {"DMA_CONT2", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2},\
+    {"DMA_CONT3", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3},\
+    {"DMA_CONT4", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4},\
+    {"DMA_CONT5", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5},\
+    {"DMA_CONT6", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6},\
+    {"cpu_composites_0_t fid count", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT}
+
+/*!
+ * \name CPU_COMPOSITES_1_T field IDs.
+ */
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10 0
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11 1
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12 2
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13 3
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14 4
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15 5
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16 6
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17 7
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7  8
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8  9
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9  10
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT          11
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT \
+    {"DMA_CONT10", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10},\
+    {"DMA_CONT11", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11},\
+    {"DMA_CONT12", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12},\
+    {"DMA_CONT13", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13},\
+    {"DMA_CONT14", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14},\
+    {"DMA_CONT15", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15},\
+    {"DMA_CONT16", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16},\
+    {"DMA_CONT17", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17},\
+    {"DMA_CONT7", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7},\
+    {"DMA_CONT8", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8},\
+    {"DMA_CONT9", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9},\
+    {"cpu_composites_1_t fid count", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT}
+
+/*!
+ * \name EP_NIH_HEADER_T field IDs.
+ */
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_HEADER_SUBTYPE       0
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_HEADER_TYPE          1
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_A        2
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_B        3
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_C        4
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_A      5
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_B      6
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_C      7
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_RECIRC_PROFILE_INDEX 8
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_RESERVED_0           9
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_START                10
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_TIMESTAMP            11
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT          12
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_FIELD_NAME_MAP_INIT \
+    {"HEADER_SUBTYPE", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_HEADER_SUBTYPE},\
+    {"HEADER_TYPE", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_HEADER_TYPE},\
+    {"OPAQUE_CTRL_A", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_A},\
+    {"OPAQUE_CTRL_B", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_B},\
+    {"OPAQUE_CTRL_C", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_C},\
+    {"OPAQUE_OBJECT_A", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_A},\
+    {"OPAQUE_OBJECT_B", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_B},\
+    {"OPAQUE_OBJECT_C", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_C},\
+    {"RECIRC_PROFILE_INDEX", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_RECIRC_PROFILE_INDEX},\
+    {"RESERVED_0", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_RESERVED_0},\
+    {"START", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_START},\
+    {"TIMESTAMP", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_TIMESTAMP},\
+    {"ep_nih_header_t fid count", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT}
+
+/*!
+ * \name ERSPAN3_FIXED_HDR_T field IDs.
+ */
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO               0
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_COS               1
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID           2
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O 3
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID        4
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_T                 5
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP         6
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VER               7
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN              8
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT          9
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT \
+    {"BSO", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO},\
+    {"COS", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_COS},\
+    {"GBP_SID", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID},\
+    {"P_FT_HWID_D_GRA_O", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O},\
+    {"SESSION_ID", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID},\
+    {"T", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_T},\
+    {"TIMESTAMP", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP},\
+    {"VER", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VER},\
+    {"VLAN", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN},\
+    {"erspan3_fixed_hdr_t fid count", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT}
+
+/*!
+ * \name ERSPAN3_SUBHDR_5_T field IDs.
+ */
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID 0
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID     1
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID   2
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP   3
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT          4
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT \
+    {"PLATFORM_ID", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID},\
+    {"PORT_ID", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID},\
+    {"SWITCH_ID", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID},\
+    {"TIMESTAMP", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP},\
+    {"erspan3_subhdr_5_t fid count", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT}
+
+/*!
+ * \name ETHERTYPE_T field IDs.
+ */
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T_TYPE 0
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T_FID_COUNT          1
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT \
+    {"TYPE", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T_TYPE},\
+    {"ethertype_t fid count", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T_FID_COUNT}
+
+/*!
+ * \name GENERIC_LOOPBACK_T field IDs.
+ */
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ    0
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE   1
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ        2
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_FLAGS              3
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE        4
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY     5
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL     6
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ      7
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0  8
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1  9
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ            10
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1         11
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_2         12
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT 13
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE         14
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT          15
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT \
+    {"DESTINATION_OBJ", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ},\
+    {"DESTINATION_TYPE", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE},\
+    {"ENTROPY_OBJ", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ},\
+    {"FLAGS", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_FLAGS},\
+    {"HEADER_TYPE", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE},\
+    {"INPUT_PRIORITY", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY},\
+    {"INTERFACE_CTRL", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL},\
+    {"INTERFACE_OBJ", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ},\
+    {"PROCESSING_CTRL_0", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0},\
+    {"PROCESSING_CTRL_1", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1},\
+    {"QOS_OBJ", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ},\
+    {"RESERVED_1", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1},\
+    {"RESERVED_2", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_2},\
+    {"SOURCE_SYSTEM_PORT", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT},\
+    {"START_BYTE", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE},\
+    {"generic_loopback_t fid count", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT}
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NO_OP       0
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2_OIF      1
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED    2
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__VP          3
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP        4
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NHOP        5
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2MC_GROUP  6
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L3MC_GROUP  7
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED_1  8
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP_MEMBER 9
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__DEVICE_PORT 10
+
+/*!
+ * \name ICMP_T field IDs.
+ */
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ICMP_T_CHECKSUM  0
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ICMP_T_CODE      1
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ICMP_T_ICMP_TYPE 2
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ICMP_T_FID_COUNT          3
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT \
+    {"CHECKSUM", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ICMP_T_CHECKSUM},\
+    {"CODE", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ICMP_T_CODE},\
+    {"ICMP_TYPE", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ICMP_T_ICMP_TYPE},\
+    {"icmp_t fid count", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ICMP_T_FID_COUNT}
+
+/*!
+ * \name IPFIX_T field IDs.
+ */
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPFIX_T_EXPORT_TIME   0
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPFIX_T_LENGTH        1
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPFIX_T_OBS_DOMAIN_ID 2
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPFIX_T_SEQUENCE_NUM  3
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPFIX_T_VERSION       4
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPFIX_T_FID_COUNT          5
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT \
+    {"EXPORT_TIME", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPFIX_T_EXPORT_TIME},\
+    {"LENGTH", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPFIX_T_LENGTH},\
+    {"OBS_DOMAIN_ID", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPFIX_T_OBS_DOMAIN_ID},\
+    {"SEQUENCE_NUM", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPFIX_T_SEQUENCE_NUM},\
+    {"VERSION", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPFIX_T_VERSION},\
+    {"ipfix_t fid count", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPFIX_T_FID_COUNT}
+
+/*!
+ * \name IPV4_T field IDs.
+ */
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_DA                0
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET 1
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_HDR_CHECKSUM      2
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_ID                3
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_OPTION            4
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_PROTOCOL          5
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_SA                6
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_TOS               7
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_TOTAL_LENGTH      8
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_TTL               9
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_VERSION_HDR_LEN   10
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_FID_COUNT          11
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT \
+    {"DA", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_DA},\
+    {"FLAGS_FRAG_OFFSET", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET},\
+    {"HDR_CHECKSUM", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_HDR_CHECKSUM},\
+    {"ID", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_ID},\
+    {"OPTION", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_OPTION},\
+    {"PROTOCOL", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_PROTOCOL},\
+    {"SA", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_SA},\
+    {"TOS", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_TOS},\
+    {"TOTAL_LENGTH", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_TOTAL_LENGTH},\
+    {"TTL", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_TTL},\
+    {"VERSION_HDR_LEN", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_VERSION_HDR_LEN},\
+    {"ipv4_t fid count", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_FID_COUNT}
+
+/*!
+ * \name IPV6_T field IDs.
+ */
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_DA             0
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_FLOW_LABEL     1
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_HOP_LIMIT      2
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_NEXT_HEADER    3
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_PAYLOAD_LENGTH 4
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_SA             5
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_TRAFFIC_CLASS  6
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_VERSION        7
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_FID_COUNT          8
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT \
+    {"DA", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_DA},\
+    {"FLOW_LABEL", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_FLOW_LABEL},\
+    {"HOP_LIMIT", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_HOP_LIMIT},\
+    {"NEXT_HEADER", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_NEXT_HEADER},\
+    {"PAYLOAD_LENGTH", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_PAYLOAD_LENGTH},\
+    {"SA", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_SA},\
+    {"TRAFFIC_CLASS", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_TRAFFIC_CLASS},\
+    {"VERSION", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_VERSION},\
+    {"ipv6_t fid count", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_FID_COUNT}
+
+/*!
+ * \name L2_T field IDs.
+ */
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_L2_T_MACDA 0
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_L2_T_MACSA 1
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_L2_T_FID_COUNT          2
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_L2_T_FIELD_NAME_MAP_INIT \
+    {"MACDA", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_L2_T_MACDA},\
+    {"MACSA", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_L2_T_MACSA},\
+    {"l2_t fid count", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_L2_T_FID_COUNT}
+
+/*!
+ * \name MIRROR_ERSPAN_SN_T field IDs.
+ */
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM 0
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT          1
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT \
+    {"SEQ_NUM", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM},\
+    {"mirror_erspan_sn_t fid count", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT}
+
+/*!
+ * \name MIRROR_TRANSPORT_T field IDs.
+ */
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T_DATA 0
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT          1
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT \
+    {"DATA", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T_DATA},\
+    {"mirror_transport_t fid count", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_MIRROR_ON_DROP_0_T field IDs.
+ */
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT 0
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT    1
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH          2
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS     3
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S      4
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID       5
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID     6
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT          7
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT \
+    {"EGRESS_MOD_PORT", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT},\
+    {"INGRESS_PORT", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT},\
+    {"LENGTH", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH},\
+    {"OBS_TIME_NS", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS},\
+    {"OBS_TIME_S", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S},\
+    {"SWITCH_ID", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID},\
+    {"TEMPLATE_ID", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID},\
+    {"psamp_mirror_on_drop_0_t fid count", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_MIRROR_ON_DROP_1_T field IDs.
+ */
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_ING_DROP_REASON    0
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_MIRROR_ON_DROP_OBJ 1
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_MMU_DROP_CTRL      2
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_SAMPLED_LENGTH     3
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_USER_META_DATA     4
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_VAR_LEN_INDICATOR  5
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FID_COUNT          6
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FIELD_NAME_MAP_INIT \
+    {"ING_DROP_REASON", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_ING_DROP_REASON},\
+    {"MIRROR_ON_DROP_OBJ", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_MIRROR_ON_DROP_OBJ},\
+    {"MMU_DROP_CTRL", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_MMU_DROP_CTRL},\
+    {"SAMPLED_LENGTH", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_SAMPLED_LENGTH},\
+    {"USER_META_DATA", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_USER_META_DATA},\
+    {"VAR_LEN_INDICATOR", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_VAR_LEN_INDICATOR},\
+    {"psamp_mirror_on_drop_1_t fid count", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_MIRROR_ON_DROP_2_T field IDs.
+ */
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_EGR_DROP_REASON       0
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_EP_COPY_SESSION_INDEX 1
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_RESERVED_0            2
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_SAMPLED_LENGTH        3
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_USER_META_DATA        4
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_VAR_LEN_INDICATOR     5
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_FID_COUNT          6
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_FIELD_NAME_MAP_INIT \
+    {"EGR_DROP_REASON", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_EGR_DROP_REASON},\
+    {"EP_COPY_SESSION_INDEX", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_EP_COPY_SESSION_INDEX},\
+    {"RESERVED_0", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_RESERVED_0},\
+    {"SAMPLED_LENGTH", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_SAMPLED_LENGTH},\
+    {"USER_META_DATA", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_USER_META_DATA},\
+    {"VAR_LEN_INDICATOR", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_VAR_LEN_INDICATOR},\
+    {"psamp_mirror_on_drop_2_t fid count", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_FID_COUNT}
+
+/*!
+ * \name RARP_T field IDs.
+ */
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_HARDWARE_LEN  0
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_HARDWARE_TYPE 1
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_OPERATION     2
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_PROT_ADDR_LEN 3
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_PROTOCOL_TYPE 4
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_SENDER_HA     5
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_SENDER_IP     6
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_TARGET_HA     7
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_TARGET_IP     8
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_FID_COUNT          9
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT \
+    {"HARDWARE_LEN", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_HARDWARE_LEN},\
+    {"HARDWARE_TYPE", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_HARDWARE_TYPE},\
+    {"OPERATION", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_OPERATION},\
+    {"PROT_ADDR_LEN", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_PROT_ADDR_LEN},\
+    {"PROTOCOL_TYPE", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_PROTOCOL_TYPE},\
+    {"SENDER_HA", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_SENDER_HA},\
+    {"SENDER_IP", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_SENDER_IP},\
+    {"TARGET_HA", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_TARGET_HA},\
+    {"TARGET_IP", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_TARGET_IP},\
+    {"rarp_t fid count", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_FID_COUNT}
+
+/*!
+ * \name TCP_FIRST_4BYTES_T field IDs.
+ */
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT 0
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT 1
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT          2
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT \
+    {"DST_PORT", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT},\
+    {"SRC_PORT", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT},\
+    {"tcp_first_4bytes_t fid count", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT}
+
+/*!
+ * \name TCP_LAST_16BYTES_T field IDs.
+ */
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM           0
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM          1
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS 2
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM           3
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR        4
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE          5
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT          6
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT \
+    {"ACK_NUM", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM},\
+    {"CHECKSUM", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM},\
+    {"HDR_LEN_AND_FLAGS", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS},\
+    {"SEQ_NUM", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM},\
+    {"URGENT_PTR", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR},\
+    {"WIN_SIZE", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE},\
+    {"tcp_last_16bytes_t fid count", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT}
+
+/*!
+ * \name UDP_T field IDs.
+ */
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UDP_T_CHECKSUM   0
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UDP_T_DST_PORT   1
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UDP_T_SRC_PORT   2
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UDP_T_UDP_LENGTH 3
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UDP_T_FID_COUNT          4
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT \
+    {"CHECKSUM", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UDP_T_CHECKSUM},\
+    {"DST_PORT", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UDP_T_DST_PORT},\
+    {"SRC_PORT", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UDP_T_SRC_PORT},\
+    {"UDP_LENGTH", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UDP_T_UDP_LENGTH},\
+    {"udp_t fid count", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UDP_T_FID_COUNT}
+
+/*!
+ * \name UNKNOWN_L3_T field IDs.
+ */
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD 0
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD  1
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT          2
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT \
+    {"FIRST_16BYTES_OF_L3_PAYLOAD", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD},\
+    {"NEXT_16BYTES_OF_L3_PAYLOAD", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD},\
+    {"unknown_l3_t fid count", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT}
+
+/*!
+ * \name UNKNOWN_L4_T field IDs.
+ */
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD 0
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT          1
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT \
+    {"FIRST_4BYTES_OF_L4_PAYLOAD", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD},\
+    {"unknown_l4_t fid count", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT}
+
+/*!
+ * \name UNKNOWN_L5_T field IDs.
+ */
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1 0
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3 1
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7 2
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT          3
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT \
+    {"L5_BYTES_0_1", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1},\
+    {"L5_BYTES_2_3", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3},\
+    {"L5_BYTES_4_7", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7},\
+    {"unknown_l5_t fid count", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT}
+
+/*!
+ * \name VLAN_T field IDs.
+ */
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_VLAN_T_CFI  0
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_VLAN_T_PCP  1
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_VLAN_T_TPID 2
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_VLAN_T_VID  3
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_VLAN_T_FID_COUNT          4
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT \
+    {"CFI", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_VLAN_T_CFI},\
+    {"PCP", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_VLAN_T_PCP},\
+    {"TPID", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_VLAN_T_TPID},\
+    {"VID", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_VLAN_T_VID},\
+    {"vlan_t fid count", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_VLAN_T_FID_COUNT}
+
+/*!
+ * \name VXLAN_T field IDs.
+ */
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_VXLAN_T_FLAGS_RESERVED_1 0
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_VXLAN_T_RESERVED2        1
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_VXLAN_T_VN_ID            2
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_VXLAN_T_FID_COUNT          3
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT \
+    {"FLAGS_RESERVED_1", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_VXLAN_T_FLAGS_RESERVED_1},\
+    {"RESERVED2", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_VXLAN_T_RESERVED2},\
+    {"VN_ID", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_VXLAN_T_VN_ID},\
+    {"vxlan_t fid count", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_VXLAN_T_FID_COUNT}
+
+
+#endif /* BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_FLEXHDR_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_bcmpkt_rxpmd_flex_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_bcmpkt_rxpmd_flex_data.h
new file mode 100644
index 000000000000..92342a29d0a5
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_bcmpkt_rxpmd_flex_data.h
@@ -0,0 +1,124 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) map.yml.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_DATA_H
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_DATA_H
+
+/*!
+ * \name RX flex metadata field IDs.
+ */
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0                                 0
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_DVP_15_0                                       1
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_7_0                              2
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_HIGH_3_0                         3
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0                         4
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_DROP_CODE_15_0                      5
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_RECIRC_CODE_3_0                     6
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_15_0                      7
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_31_16                     8
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_ERSPAN3_GBP_SID_15_0                           9
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_15_0                        10
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_16                       11
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32                       12
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0                              13
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_15_0                             14
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_16                            15
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_INGRESS_PP_PORT_8_0                            16
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0 17
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0                    18
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_INT_PRI_3_0                                    19
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_L2_IIF_10_0                                    20
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_L2_OIF_10_0                                    21
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_L2_TUNNEL_SVP_15_0                             22
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_L3_IIF_13_0                                    23
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0                                  24
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_14_0              25
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_14_0                              26
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0                            27
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0                            28
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0                   29
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0                        30
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0                              31
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_SYSTEM_SOURCE_15_0                             32
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_TAG_ACTION_CTRL_1_0                            33
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0                34
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_VFI_15_0                                       35
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_FID_COUNT                       36
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_COUNT                    21
+
+/*!
+ * \name Packet Flex Reason Types.
+ */
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS                  0
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP                        1
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER                  2
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT                      3
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP              4
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS         5
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_DISCARD             6
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE         7
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP              8
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS         9
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR               10
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR               11
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL           12
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST            13
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED    14
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU             15
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED 16
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT               17
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED 18
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP                  19
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_VFP                        20
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT \
+    {"CML_FLAGS", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS},\
+    {"IFP", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP},\
+    {"IFP_METER", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER},\
+    {"IVXLT", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT},\
+    {"L2_DST_LOOKUP", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP},\
+    {"L2_DST_LOOKUP_MISS", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS},\
+    {"L2_SRC_DISCARD", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_DISCARD},\
+    {"L2_SRC_STATIC_MOVE", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE},\
+    {"L3_DST_LOOKUP", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP},\
+    {"L3_DST_LOOKUP_MISS", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS},\
+    {"L3_HDR_ERROR", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR},\
+    {"L3_TTL_ERROR", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR},\
+    {"LEARN_CACHE_FULL", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL},\
+    {"MACSA_MULTICAST", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST},\
+    {"MEMBERSHIP_CHECK_FAILED", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED},\
+    {"NO_COPY_TO_CPU", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU},\
+    {"PKT_INTEGRITY_CHECK_FAILED", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED},\
+    {"PROTOCOL_PKT", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT},\
+    {"SPANNING_TREE_CHECK_FAILED", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED},\
+    {"TRACE_DOP", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP},\
+    {"VFP", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_VFP},\
+    {"flex reason count", BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_COUNT}
+
+#endif /* BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_bcmpkt_rxpmd_match_id_defs.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_bcmpkt_rxpmd_match_id_defs.h
new file mode 100644
index 000000000000..30aa758fba76
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_bcmpkt_rxpmd_match_id_defs.h
@@ -0,0 +1,213 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) bcm56890_a0_cna_6_5_31_3_0_sf_match_id_info.yml
+ * for device bcm56890_a0 and variant cna_6_5_31_3_0.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H
+
+#include <bcmpkt/bcmpkt_rxpmd_match_id.h>
+
+/*!
+ * \brief Get the Match ID DataBase information.
+ *
+ * \retval bcmpkt_rxpmd_match_id_db_info_t Match ID DataBase information.
+*/
+extern bcmpkt_rxpmd_match_id_db_info_t *
+    bcm56890_a0_cna_6_5_31_3_0_rxpmd_match_id_db_info_get(void);
+
+/*!
+ * \brief Get the Match ID Mapping information.
+ *
+ * \retval bcmpkt_rxpmd_match_id_map_info_t Match ID Mapping information.
+*/
+extern bcmpkt_rxpmd_match_id_map_info_t *
+    bcm56890_a0_cna_6_5_31_3_0_rxpmd_match_id_map_info_get(void);
+
+/*!
+  \name RXPMD Match IDs
+*/
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG  0
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2  1
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE  2
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG  3
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP  4
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE  5
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP  6
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4  7
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6  8
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE  9
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP  10
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES  11
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES  12
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP  13
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3  14
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4  15
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5  16
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN  17
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH  18
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK  19
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE  20
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG  21
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2  22
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE  23
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG  24
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP  25
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE  26
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP  27
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4  28
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6  29
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE  30
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP  31
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES  32
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES  33
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP  34
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3  35
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4  36
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5  37
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN  38
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG  39
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2  40
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE  41
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG  42
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP  43
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE  44
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP  45
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4  46
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6  47
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE  48
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP  49
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES  50
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES  51
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP  52
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3  53
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4  54
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5  55
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG  56
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2  57
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE  58
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG  59
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP  60
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE  61
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP  62
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4  63
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6  64
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE  65
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP  66
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES  67
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES  68
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP  69
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3  70
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4  71
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5  72
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN  73
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH  74
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK  75
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE  76
+#define BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_COUNT  77
+
+#define BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT \
+    {"EGRESS_PKT_FWD_L2_HDR_ITAG", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG}, \
+    {"EGRESS_PKT_FWD_L2_HDR_L2", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2}, \
+    {"EGRESS_PKT_FWD_L2_HDR_NONE", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE}, \
+    {"EGRESS_PKT_FWD_L2_HDR_OTAG", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ARP", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ICMP", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV4", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV6", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_NONE", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_RARP", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UDP", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_VXLAN", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN}, \
+    {"EGRESS_PKT_SYS_HDR_EP_NIH", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH}, \
+    {"EGRESS_PKT_SYS_HDR_LOOPBACK", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK}, \
+    {"EGRESS_PKT_SYS_HDR_NONE", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_ITAG", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_L2", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_NONE", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_OTAG", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN}, \
+    {"INGRESS_PKT_INNER_L2_HDR_ITAG", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG}, \
+    {"INGRESS_PKT_INNER_L2_HDR_L2", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2}, \
+    {"INGRESS_PKT_INNER_L2_HDR_NONE", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE}, \
+    {"INGRESS_PKT_INNER_L2_HDR_OTAG", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ARP", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ICMP", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV4", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV6", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_NONE", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_RARP", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UDP", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_ITAG", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_L2", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_NONE", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_OTAG", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ARP", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ICMP", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV4", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV6", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_NONE", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_RARP", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UDP", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN}, \
+    {"INGRESS_PKT_SYS_HDR_EP_NIH", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH}, \
+    {"INGRESS_PKT_SYS_HDR_LOOPBACK", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK}, \
+    {"INGRESS_PKT_SYS_HDR_NONE", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE}, \
+    {"rxpmd_match_id_count", BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_COUNT}
+
+#endif /*! BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_bcmpkt_flexhdr.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_bcmpkt_flexhdr.h
deleted file mode 100644
index 52afc1e47caf..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_bcmpkt_flexhdr.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) header.yml.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_FLEXHDR_H
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_FLEXHDR_H
-
-#include <bcmpkt/bcmpkt_flexhdr_internal.h>
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ARP_T                      0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_AUTHEN_T                   1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T                      2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CNTAG_T                    3
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_0_T         4
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_1_T         5
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_DEST_OPTION_T              6
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_EP_NIH_HEADER_T            7
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_FIXED_HDR_T        8
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_SUBHDR_5_T         9
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ESP_T                      10
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ETHERTYPE_T                11
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_FRAG_T                     12
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GBP_ETHERNET_SHIM_T        13
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T         14
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GPE_T                      15
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_CHKSUM_T               16
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_KEY_T                  17
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_ROUT_T                 18
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_SEQ_T                  19
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_T                      20
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T                 21
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_EXTENSION_0_T          22
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HOP_BY_HOP_T               23
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ICMP_T                     24
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_HEADER_T               25
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_A_T           26
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_B_T           27
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_BASE_T        28
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IGMP_T                     29
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IOAM_E2E_T                 30
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPFIX_T                    31
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV4_T                     32
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV6_T                     33
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_L2_T                       34
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MIRROR_ERSPAN_SN_T         35
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MIRROR_TRANSPORT_T         36
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_ACH_T                 37
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_BV_T                  38
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_CW_T                  39
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_T                     40
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_P_1588_T                   41
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PROG_EXT_HDR_T             42
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_0_T                  43
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_1_T                  44
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T   45
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T   46
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RARP_T                     47
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ROUTING_T                  48
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RSPAN_T                    49
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_SRH_T      50
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_T          51
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_0_T             52
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_1_T             53
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_2_T             54
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SNAP_LLC_T                 55
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_STD_SEGMENT_ID_T           56
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SVTAG_T                    57
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_TCP_FIRST_4BYTES_T         58
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_TCP_LAST_16BYTES_T         59
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UDP_T                      60
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L3_T               61
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L4_T               62
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L5_T               63
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_VLAN_T                     64
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_VXLAN_T                    65
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_WESP_T                     66
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_T               67
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_FLEXHDR_COUNT    68
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_FLEXHDR_NAME_MAP_INIT \
-    {"arp_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ARP_T},\
-    {"authen_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_AUTHEN_T},\
-    {"bfd_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T},\
-    {"cntag_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CNTAG_T},\
-    {"cpu_composites_0_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_0_T},\
-    {"cpu_composites_1_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_1_T},\
-    {"dest_option_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_DEST_OPTION_T},\
-    {"ep_nih_header_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_EP_NIH_HEADER_T},\
-    {"erspan3_fixed_hdr_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_FIXED_HDR_T},\
-    {"erspan3_subhdr_5_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_SUBHDR_5_T},\
-    {"esp_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ESP_T},\
-    {"ethertype_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ETHERTYPE_T},\
-    {"frag_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_FRAG_T},\
-    {"gbp_ethernet_shim_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GBP_ETHERNET_SHIM_T},\
-    {"generic_loopback_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T},\
-    {"gpe_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GPE_T},\
-    {"gre_chksum_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_CHKSUM_T},\
-    {"gre_key_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_KEY_T},\
-    {"gre_rout_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_ROUT_T},\
-    {"gre_seq_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_SEQ_T},\
-    {"gre_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_T},\
-    {"hg3_base_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T},\
-    {"hg3_extension_0_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_EXTENSION_0_T},\
-    {"hop_by_hop_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HOP_BY_HOP_T},\
-    {"icmp_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ICMP_T},\
-    {"ifa_header_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_HEADER_T},\
-    {"ifa_metadata_a_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_A_T},\
-    {"ifa_metadata_b_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_B_T},\
-    {"ifa_metadata_base_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_BASE_T},\
-    {"igmp_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IGMP_T},\
-    {"ioam_e2e_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IOAM_E2E_T},\
-    {"ipfix_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPFIX_T},\
-    {"ipv4_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV4_T},\
-    {"ipv6_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV6_T},\
-    {"l2_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_L2_T},\
-    {"mirror_erspan_sn_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MIRROR_ERSPAN_SN_T},\
-    {"mirror_transport_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MIRROR_TRANSPORT_T},\
-    {"mpls_ach_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_ACH_T},\
-    {"mpls_bv_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_BV_T},\
-    {"mpls_cw_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_CW_T},\
-    {"mpls_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_T},\
-    {"p_1588_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_P_1588_T},\
-    {"prog_ext_hdr_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PROG_EXT_HDR_T},\
-    {"psamp_0_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_0_T},\
-    {"psamp_1_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_1_T},\
-    {"psamp_mirror_on_drop_0_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T},\
-    {"psamp_mirror_on_drop_3_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T},\
-    {"rarp_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RARP_T},\
-    {"routing_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ROUTING_T},\
-    {"rspan_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RSPAN_T},\
-    {"segment_routing_srh_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_SRH_T},\
-    {"segment_routing_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_T},\
-    {"sflow_shim_0_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_0_T},\
-    {"sflow_shim_1_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_1_T},\
-    {"sflow_shim_2_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_2_T},\
-    {"snap_llc_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SNAP_LLC_T},\
-    {"std_segment_id_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_STD_SEGMENT_ID_T},\
-    {"svtag_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SVTAG_T},\
-    {"tcp_first_4bytes_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_TCP_FIRST_4BYTES_T},\
-    {"tcp_last_16bytes_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_TCP_LAST_16BYTES_T},\
-    {"udp_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UDP_T},\
-    {"unknown_l3_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L3_T},\
-    {"unknown_l4_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L4_T},\
-    {"unknown_l5_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L5_T},\
-    {"vlan_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_VLAN_T},\
-    {"vxlan_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_VXLAN_T},\
-    {"wesp_t", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_WESP_T},\
-    {"RXPMD_FLEX_T", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_T},\
-    {"flexhdr count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_FLEXHDR_COUNT}
-
-#endif /* BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_FLEXHDR_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_bcmpkt_flexhdr_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_bcmpkt_flexhdr_data.h
deleted file mode 100644
index 765cb7355c7b..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_bcmpkt_flexhdr_data.h
+++ /dev/null
@@ -1,1361 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) header.yml.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_FLEXHDR_DATA_H
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_FLEXHDR_DATA_H
-
-/*!
- * \name ARP_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ARP_T_HARDWARE_LEN  0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ARP_T_HARDWARE_TYPE 1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ARP_T_OPERATION     2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ARP_T_PROT_ADDR_LEN 3
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ARP_T_PROTOCOL_TYPE 4
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ARP_T_SENDER_HA     5
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ARP_T_SENDER_IP     6
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ARP_T_TARGET_HA     7
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ARP_T_TARGET_IP     8
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ARP_T_FID_COUNT          9
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT \
-    {"HARDWARE_LEN", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ARP_T_HARDWARE_LEN},\
-    {"HARDWARE_TYPE", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ARP_T_HARDWARE_TYPE},\
-    {"OPERATION", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ARP_T_OPERATION},\
-    {"PROT_ADDR_LEN", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ARP_T_PROT_ADDR_LEN},\
-    {"PROTOCOL_TYPE", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ARP_T_PROTOCOL_TYPE},\
-    {"SENDER_HA", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ARP_T_SENDER_HA},\
-    {"SENDER_IP", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ARP_T_SENDER_IP},\
-    {"TARGET_HA", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ARP_T_TARGET_HA},\
-    {"TARGET_IP", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ARP_T_TARGET_IP},\
-    {"arp_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ARP_T_FID_COUNT}
-
-/*!
- * \name AUTHEN_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_AUTHEN_T_DATA        0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_AUTHEN_T_NEXT_HEADER 1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_AUTHEN_T_PAYLOAD_LEN 2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_AUTHEN_T_RESERVED    3
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_AUTHEN_T_SEQ_NUM     4
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_AUTHEN_T_SPI         5
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_AUTHEN_T_FID_COUNT          6
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_AUTHEN_T_FIELD_NAME_MAP_INIT \
-    {"DATA", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_AUTHEN_T_DATA},\
-    {"NEXT_HEADER", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_AUTHEN_T_NEXT_HEADER},\
-    {"PAYLOAD_LEN", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_AUTHEN_T_PAYLOAD_LEN},\
-    {"RESERVED", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_AUTHEN_T_RESERVED},\
-    {"SEQ_NUM", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_AUTHEN_T_SEQ_NUM},\
-    {"SPI", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_AUTHEN_T_SPI},\
-    {"authen_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_AUTHEN_T_FID_COUNT}
-
-/*!
- * \name BFD_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_AP            0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_BFD_LENGTH    1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_CPI           2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_DEM           3
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_DESMINTXINTV  4
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_DETECTMULT    5
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_DIAG          6
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_FIN           7
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_MINECHORXINTV 8
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_MPT           9
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_MYDISCRIM     10
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_POLL          11
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_REQMINRXINTV  12
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_STA           13
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_URDISCRIM     14
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_VERSION       15
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_FID_COUNT          16
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_FIELD_NAME_MAP_INIT \
-    {"AP", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_AP},\
-    {"BFD_LENGTH", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_BFD_LENGTH},\
-    {"CPI", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_CPI},\
-    {"DEM", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_DEM},\
-    {"DESMINTXINTV", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_DESMINTXINTV},\
-    {"DETECTMULT", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_DETECTMULT},\
-    {"DIAG", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_DIAG},\
-    {"FIN", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_FIN},\
-    {"MINECHORXINTV", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_MINECHORXINTV},\
-    {"MPT", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_MPT},\
-    {"MYDISCRIM", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_MYDISCRIM},\
-    {"POLL", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_POLL},\
-    {"REQMINRXINTV", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_REQMINRXINTV},\
-    {"STA", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_STA},\
-    {"URDISCRIM", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_URDISCRIM},\
-    {"VERSION", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_VERSION},\
-    {"bfd_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_FID_COUNT}
-
-/*!
- * \name CNTAG_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CNTAG_T_RPID 0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CNTAG_T_TPID 1
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CNTAG_T_FID_COUNT          2
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CNTAG_T_FIELD_NAME_MAP_INIT \
-    {"RPID", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CNTAG_T_RPID},\
-    {"TPID", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CNTAG_T_TPID},\
-    {"cntag_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CNTAG_T_FID_COUNT}
-
-/*!
- * \name CPU_COMPOSITES_0_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0 0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1 1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2 2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3 3
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4 4
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5 5
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6 6
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT          7
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT \
-    {"DMA_CONT0", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0},\
-    {"DMA_CONT1", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1},\
-    {"DMA_CONT2", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2},\
-    {"DMA_CONT3", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3},\
-    {"DMA_CONT4", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4},\
-    {"DMA_CONT5", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5},\
-    {"DMA_CONT6", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6},\
-    {"cpu_composites_0_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT}
-
-/*!
- * \name CPU_COMPOSITES_1_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10 0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11 1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12 2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13 3
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14 4
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15 5
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16 6
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17 7
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7  8
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8  9
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9  10
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT          11
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT \
-    {"DMA_CONT10", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10},\
-    {"DMA_CONT11", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11},\
-    {"DMA_CONT12", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12},\
-    {"DMA_CONT13", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13},\
-    {"DMA_CONT14", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14},\
-    {"DMA_CONT15", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15},\
-    {"DMA_CONT16", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16},\
-    {"DMA_CONT17", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17},\
-    {"DMA_CONT7", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7},\
-    {"DMA_CONT8", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8},\
-    {"DMA_CONT9", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9},\
-    {"cpu_composites_1_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT}
-
-/*!
- * \name DEST_OPTION_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_DEST_OPTION_T_HDR_EXT_LEN 0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_DEST_OPTION_T_NEXT_HEADER 1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_DEST_OPTION_T_OPTION      2
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_DEST_OPTION_T_FID_COUNT          3
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_DEST_OPTION_T_FIELD_NAME_MAP_INIT \
-    {"HDR_EXT_LEN", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_DEST_OPTION_T_HDR_EXT_LEN},\
-    {"NEXT_HEADER", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_DEST_OPTION_T_NEXT_HEADER},\
-    {"OPTION", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_DEST_OPTION_T_OPTION},\
-    {"dest_option_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_DEST_OPTION_T_FID_COUNT}
-
-/*!
- * \name EP_NIH_HEADER_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_EP_NIH_HEADER_T_HEADER_SUBTYPE       0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_EP_NIH_HEADER_T_HEADER_TYPE          1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_A        2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_B        3
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_C        4
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_A      5
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_B      6
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_C      7
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_EP_NIH_HEADER_T_RECIRC_PROFILE_INDEX 8
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_EP_NIH_HEADER_T_RESERVED_0           9
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_EP_NIH_HEADER_T_START                10
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_EP_NIH_HEADER_T_TIMESTAMP            11
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT          12
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_EP_NIH_HEADER_T_FIELD_NAME_MAP_INIT \
-    {"HEADER_SUBTYPE", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_EP_NIH_HEADER_T_HEADER_SUBTYPE},\
-    {"HEADER_TYPE", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_EP_NIH_HEADER_T_HEADER_TYPE},\
-    {"OPAQUE_CTRL_A", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_A},\
-    {"OPAQUE_CTRL_B", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_B},\
-    {"OPAQUE_CTRL_C", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_C},\
-    {"OPAQUE_OBJECT_A", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_A},\
-    {"OPAQUE_OBJECT_B", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_B},\
-    {"OPAQUE_OBJECT_C", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_C},\
-    {"RECIRC_PROFILE_INDEX", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_EP_NIH_HEADER_T_RECIRC_PROFILE_INDEX},\
-    {"RESERVED_0", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_EP_NIH_HEADER_T_RESERVED_0},\
-    {"START", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_EP_NIH_HEADER_T_START},\
-    {"TIMESTAMP", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_EP_NIH_HEADER_T_TIMESTAMP},\
-    {"ep_nih_header_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT}
-
-/*!
- * \name ERSPAN3_FIXED_HDR_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO               0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_FIXED_HDR_T_COS               1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID           2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O 3
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID        4
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_FIXED_HDR_T_T                 5
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP         6
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VER               7
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN              8
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT          9
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT \
-    {"BSO", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO},\
-    {"COS", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_FIXED_HDR_T_COS},\
-    {"GBP_SID", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID},\
-    {"P_FT_HWID_D_GRA_O", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O},\
-    {"SESSION_ID", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID},\
-    {"T", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_FIXED_HDR_T_T},\
-    {"TIMESTAMP", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP},\
-    {"VER", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VER},\
-    {"VLAN", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN},\
-    {"erspan3_fixed_hdr_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT}
-
-/*!
- * \name ERSPAN3_SUBHDR_5_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID 0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID     1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID   2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP   3
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT          4
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT \
-    {"PLATFORM_ID", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID},\
-    {"PORT_ID", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID},\
-    {"SWITCH_ID", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID},\
-    {"TIMESTAMP", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP},\
-    {"erspan3_subhdr_5_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT}
-
-/*!
- * \name ESP_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ESP_T_NEXT_HEADER 0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ESP_T_PAD         1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ESP_T_PAD_LEN     2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ESP_T_SEQ_NUM     3
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ESP_T_SPI         4
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ESP_T_FID_COUNT          5
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ESP_T_FIELD_NAME_MAP_INIT \
-    {"NEXT_HEADER", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ESP_T_NEXT_HEADER},\
-    {"PAD", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ESP_T_PAD},\
-    {"PAD_LEN", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ESP_T_PAD_LEN},\
-    {"SEQ_NUM", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ESP_T_SEQ_NUM},\
-    {"SPI", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ESP_T_SPI},\
-    {"esp_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ESP_T_FID_COUNT}
-
-/*!
- * \name ETHERTYPE_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ETHERTYPE_T_TYPE 0
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ETHERTYPE_T_FID_COUNT          1
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT \
-    {"TYPE", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ETHERTYPE_T_TYPE},\
-    {"ethertype_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ETHERTYPE_T_FID_COUNT}
-
-/*!
- * \name FRAG_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_FRAG_T_FRAG_INFO   0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_FRAG_T_ID          1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_FRAG_T_NEXT_HEADER 2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_FRAG_T_RESERVED    3
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_FRAG_T_FID_COUNT          4
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_FRAG_T_FIELD_NAME_MAP_INIT \
-    {"FRAG_INFO", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_FRAG_T_FRAG_INFO},\
-    {"ID", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_FRAG_T_ID},\
-    {"NEXT_HEADER", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_FRAG_T_NEXT_HEADER},\
-    {"RESERVED", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_FRAG_T_RESERVED},\
-    {"frag_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_FRAG_T_FID_COUNT}
-
-/*!
- * \name GBP_ETHERNET_SHIM_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GBP_ETHERNET_SHIM_T_ETHERTYPE 0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GBP_ETHERNET_SHIM_T_FLAGS     1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GBP_ETHERNET_SHIM_T_RESERVED  2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GBP_ETHERNET_SHIM_T_SID       3
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GBP_ETHERNET_SHIM_T_SUBTYPE   4
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GBP_ETHERNET_SHIM_T_VER       5
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GBP_ETHERNET_SHIM_T_FID_COUNT          6
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GBP_ETHERNET_SHIM_T_FIELD_NAME_MAP_INIT \
-    {"ETHERTYPE", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GBP_ETHERNET_SHIM_T_ETHERTYPE},\
-    {"FLAGS", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GBP_ETHERNET_SHIM_T_FLAGS},\
-    {"RESERVED", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GBP_ETHERNET_SHIM_T_RESERVED},\
-    {"SID", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GBP_ETHERNET_SHIM_T_SID},\
-    {"SUBTYPE", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GBP_ETHERNET_SHIM_T_SUBTYPE},\
-    {"VER", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GBP_ETHERNET_SHIM_T_VER},\
-    {"gbp_ethernet_shim_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GBP_ETHERNET_SHIM_T_FID_COUNT}
-
-/*!
- * \name GENERIC_LOOPBACK_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ    0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE   1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ        2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_FLAGS              3
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE        4
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY     5
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL     6
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ      7
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0  8
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1  9
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ            10
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1         11
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT 12
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_SRC_SUBPORT_NUM    13
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE         14
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT          15
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT \
-    {"DESTINATION_OBJ", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ},\
-    {"DESTINATION_TYPE", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE},\
-    {"ENTROPY_OBJ", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ},\
-    {"FLAGS", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_FLAGS},\
-    {"HEADER_TYPE", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE},\
-    {"INPUT_PRIORITY", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY},\
-    {"INTERFACE_CTRL", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL},\
-    {"INTERFACE_OBJ", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ},\
-    {"PROCESSING_CTRL_0", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0},\
-    {"PROCESSING_CTRL_1", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1},\
-    {"QOS_OBJ", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ},\
-    {"RESERVED_1", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1},\
-    {"SOURCE_SYSTEM_PORT", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT},\
-    {"SRC_SUBPORT_NUM", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_SRC_SUBPORT_NUM},\
-    {"START_BYTE", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE},\
-    {"generic_loopback_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT}
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NO_OP         0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2_OIF        1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED      2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__VP            3
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP          4
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NHOP          5
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2MC_GROUP    6
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L3MC_GROUP    7
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED_1    8
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP_MEMBER   9
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__DEVICE_PORT   10
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__UNDERLAY_ECMP 11
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_TYPE__TUNNEL  0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_TYPE__GENERIC 1
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__NOOP   0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__VFI    1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__L3_IIF 2
-
-/*!
- * \name GPE_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GPE_T_FLAGS         0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GPE_T_NEXT_PROTOCOL 1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GPE_T_RESERVED0     2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GPE_T_RESERVED1     3
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GPE_T_VNI           4
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GPE_T_FID_COUNT          5
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GPE_T_FIELD_NAME_MAP_INIT \
-    {"FLAGS", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GPE_T_FLAGS},\
-    {"NEXT_PROTOCOL", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GPE_T_NEXT_PROTOCOL},\
-    {"RESERVED0", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GPE_T_RESERVED0},\
-    {"RESERVED1", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GPE_T_RESERVED1},\
-    {"VNI", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GPE_T_VNI},\
-    {"gpe_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GPE_T_FID_COUNT}
-
-/*!
- * \name GRE_CHKSUM_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_CHKSUM_T_CHECKSUM 0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_CHKSUM_T_OFFSET   1
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT          2
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_CHKSUM_T_FIELD_NAME_MAP_INIT \
-    {"CHECKSUM", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_CHKSUM_T_CHECKSUM},\
-    {"OFFSET", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_CHKSUM_T_OFFSET},\
-    {"gre_chksum_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT}
-
-/*!
- * \name GRE_KEY_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_KEY_T_KEY 0
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_KEY_T_FID_COUNT          1
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_KEY_T_FIELD_NAME_MAP_INIT \
-    {"KEY", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_KEY_T_KEY},\
-    {"gre_key_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_KEY_T_FID_COUNT}
-
-/*!
- * \name GRE_ROUT_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_ROUT_T_ROUTING 0
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_ROUT_T_FID_COUNT          1
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_ROUT_T_FIELD_NAME_MAP_INIT \
-    {"ROUTING", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_ROUT_T_ROUTING},\
-    {"gre_rout_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_ROUT_T_FID_COUNT}
-
-/*!
- * \name GRE_SEQ_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_SEQ_T_SEQUENCE 0
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_SEQ_T_FID_COUNT          1
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_SEQ_T_FIELD_NAME_MAP_INIT \
-    {"SEQUENCE", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_SEQ_T_SEQUENCE},\
-    {"gre_seq_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_SEQ_T_FID_COUNT}
-
-/*!
- * \name GRE_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_T_C_R_K_S  0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_T_PROTOCOL 1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_T_RESERVED 2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_T_VERSION  3
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_T_FID_COUNT          4
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_T_FIELD_NAME_MAP_INIT \
-    {"C_R_K_S", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_T_C_R_K_S},\
-    {"PROTOCOL", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_T_PROTOCOL},\
-    {"RESERVED", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_T_RESERVED},\
-    {"VERSION", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_T_VERSION},\
-    {"gre_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_T_FID_COUNT}
-
-/*!
- * \name HG3_BASE_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_CN                      0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_CNG                     1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_ENTROPY                 2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_EXT_HDR_PRESENT         3
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_HG3_RESERVED            4
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_L3_ROUTED               5
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_MIRROR_COPY             6
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_RESERVED_ETYPE          7
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION      8
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION_TYPE 9
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_SYSTEM_SOURCE           10
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_TC                      11
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_VERSION                 12
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_FID_COUNT          13
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_FIELD_NAME_MAP_INIT \
-    {"CN", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_CN},\
-    {"CNG", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_CNG},\
-    {"ENTROPY", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_ENTROPY},\
-    {"EXT_HDR_PRESENT", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_EXT_HDR_PRESENT},\
-    {"HG3_RESERVED", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_HG3_RESERVED},\
-    {"L3_ROUTED", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_L3_ROUTED},\
-    {"MIRROR_COPY", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_MIRROR_COPY},\
-    {"RESERVED_ETYPE", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_RESERVED_ETYPE},\
-    {"SYSTEM_DESTINATION", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION},\
-    {"SYSTEM_DESTINATION_TYPE", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION_TYPE},\
-    {"SYSTEM_SOURCE", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_SYSTEM_SOURCE},\
-    {"TC", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_TC},\
-    {"VERSION", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_VERSION},\
-    {"hg3_base_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_FID_COUNT}
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__NO_OP         0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__L2_OIF        1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__RESERVED      2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__VP            3
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__ECMP          4
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__NHOP          5
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__L2MC_GROUP    6
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__L3MC_GROUP    7
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__RESERVED_1    8
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__ECMP_MEMBER   9
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__DEVICE_PORT   10
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__UNDERLAY_ECMP 11
-
-/*!
- * \name HG3_EXTENSION_0_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_LSB      0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_MSB      1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_EXTENSION_0_T_DVP_OR_L3_IIF     2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_EXTENSION_0_T_FLAGS             3
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_EXTENSION_0_T_FORWARDING_DOMAIN 4
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_EXTENSION_0_T_SVP               5
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT          6
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_EXTENSION_0_T_FIELD_NAME_MAP_INIT \
-    {"CLASS_ID_LSB", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_LSB},\
-    {"CLASS_ID_MSB", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_MSB},\
-    {"DVP_OR_L3_IIF", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_EXTENSION_0_T_DVP_OR_L3_IIF},\
-    {"FLAGS", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_EXTENSION_0_T_FLAGS},\
-    {"FORWARDING_DOMAIN", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_EXTENSION_0_T_FORWARDING_DOMAIN},\
-    {"SVP", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_EXTENSION_0_T_SVP},\
-    {"hg3_extension_0_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT}
-
-/*!
- * \name HOP_BY_HOP_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HOP_BY_HOP_T_HDR_EXT_LEN 0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HOP_BY_HOP_T_NEXT_HEADER 1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HOP_BY_HOP_T_OPTION      2
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT          3
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HOP_BY_HOP_T_FIELD_NAME_MAP_INIT \
-    {"HDR_EXT_LEN", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HOP_BY_HOP_T_HDR_EXT_LEN},\
-    {"NEXT_HEADER", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HOP_BY_HOP_T_NEXT_HEADER},\
-    {"OPTION", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HOP_BY_HOP_T_OPTION},\
-    {"hop_by_hop_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT}
-
-/*!
- * \name ICMP_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ICMP_T_CHECKSUM  0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ICMP_T_CODE      1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ICMP_T_ICMP_TYPE 2
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ICMP_T_FID_COUNT          3
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT \
-    {"CHECKSUM", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ICMP_T_CHECKSUM},\
-    {"CODE", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ICMP_T_CODE},\
-    {"ICMP_TYPE", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ICMP_T_ICMP_TYPE},\
-    {"icmp_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ICMP_T_FID_COUNT}
-
-/*!
- * \name IFA_HEADER_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_HEADER_T_FLAGS      0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_HEADER_T_GNS        1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_HEADER_T_MAX_LENGTH 2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_HEADER_T_NEXT_HDR   3
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_HEADER_T_VER        4
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_HEADER_T_FID_COUNT          5
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_HEADER_T_FIELD_NAME_MAP_INIT \
-    {"FLAGS", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_HEADER_T_FLAGS},\
-    {"GNS", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_HEADER_T_GNS},\
-    {"MAX_LENGTH", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_HEADER_T_MAX_LENGTH},\
-    {"NEXT_HDR", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_HEADER_T_NEXT_HDR},\
-    {"VER", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_HEADER_T_VER},\
-    {"ifa_header_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_HEADER_T_FID_COUNT}
-
-/*!
- * \name IFA_METADATA_A_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_A_T_CN               0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_A_T_FWD_HDR_TTL      1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_A_T_LNS_DEVICE_ID    2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_A_T_PORT_SPEED       3
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_A_T_QUEUE_ID         4
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_A_T_RX_TIMESTAMP_SEC 5
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_A_T_FID_COUNT          6
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_A_T_FIELD_NAME_MAP_INIT \
-    {"CN", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_A_T_CN},\
-    {"FWD_HDR_TTL", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_A_T_FWD_HDR_TTL},\
-    {"LNS_DEVICE_ID", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_A_T_LNS_DEVICE_ID},\
-    {"PORT_SPEED", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_A_T_PORT_SPEED},\
-    {"QUEUE_ID", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_A_T_QUEUE_ID},\
-    {"RX_TIMESTAMP_SEC", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_A_T_RX_TIMESTAMP_SEC},\
-    {"ifa_metadata_a_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_A_T_FID_COUNT}
-
-/*!
- * \name IFA_METADATA_B_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_B_T_EGRESS_PORT_ID         0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_B_T_INGRESS_PORT_ID        1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_B_T_MMU_STAT_0             2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_B_T_MMU_STAT_1             3
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_B_T_RESIDENCE_TIME_NANOSEC 4
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_B_T_RX_TIMESTAMP_NANOSEC   5
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_B_T_TX_QUEUE_BYTE_COUNT    6
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_B_T_FID_COUNT          7
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_B_T_FIELD_NAME_MAP_INIT \
-    {"EGRESS_PORT_ID", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_B_T_EGRESS_PORT_ID},\
-    {"INGRESS_PORT_ID", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_B_T_INGRESS_PORT_ID},\
-    {"MMU_STAT_0", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_B_T_MMU_STAT_0},\
-    {"MMU_STAT_1", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_B_T_MMU_STAT_1},\
-    {"RESIDENCE_TIME_NANOSEC", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_B_T_RESIDENCE_TIME_NANOSEC},\
-    {"RX_TIMESTAMP_NANOSEC", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_B_T_RX_TIMESTAMP_NANOSEC},\
-    {"TX_QUEUE_BYTE_COUNT", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_B_T_TX_QUEUE_BYTE_COUNT},\
-    {"ifa_metadata_b_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_B_T_FID_COUNT}
-
-/*!
- * \name IFA_METADATA_BASE_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_BASE_T_ACTION_VECTOR            0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_BASE_T_HOP_LIMIT_CURRENT_LENGTH 1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_BASE_T_REQUEST_VECTOR           2
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_BASE_T_FID_COUNT          3
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_BASE_T_FIELD_NAME_MAP_INIT \
-    {"ACTION_VECTOR", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_BASE_T_ACTION_VECTOR},\
-    {"HOP_LIMIT_CURRENT_LENGTH", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_BASE_T_HOP_LIMIT_CURRENT_LENGTH},\
-    {"REQUEST_VECTOR", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_BASE_T_REQUEST_VECTOR},\
-    {"ifa_metadata_base_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_BASE_T_FID_COUNT}
-
-/*!
- * \name IGMP_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IGMP_T_CHECKSUM      0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IGMP_T_GROUP_ADDRESS 1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IGMP_T_IGMP_TYPE     2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IGMP_T_MAX_RESP_TIME 3
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IGMP_T_FID_COUNT          4
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IGMP_T_FIELD_NAME_MAP_INIT \
-    {"CHECKSUM", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IGMP_T_CHECKSUM},\
-    {"GROUP_ADDRESS", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IGMP_T_GROUP_ADDRESS},\
-    {"IGMP_TYPE", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IGMP_T_IGMP_TYPE},\
-    {"MAX_RESP_TIME", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IGMP_T_MAX_RESP_TIME},\
-    {"igmp_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IGMP_T_FID_COUNT}
-
-/*!
- * \name IOAM_E2E_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IOAM_E2E_T_IOAM_E2E_DATA 0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IOAM_E2E_T_IOAM_E2E_TYPE 1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IOAM_E2E_T_IOAM_HDR_LEN  2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IOAM_E2E_T_NAMESPACE_ID  3
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IOAM_E2E_T_NEXT_PROTOCOL 4
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IOAM_E2E_T_RESERVED      5
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IOAM_E2E_T_TYPE          6
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IOAM_E2E_T_FID_COUNT          7
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IOAM_E2E_T_FIELD_NAME_MAP_INIT \
-    {"IOAM_E2E_DATA", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IOAM_E2E_T_IOAM_E2E_DATA},\
-    {"IOAM_E2E_TYPE", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IOAM_E2E_T_IOAM_E2E_TYPE},\
-    {"IOAM_HDR_LEN", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IOAM_E2E_T_IOAM_HDR_LEN},\
-    {"NAMESPACE_ID", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IOAM_E2E_T_NAMESPACE_ID},\
-    {"NEXT_PROTOCOL", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IOAM_E2E_T_NEXT_PROTOCOL},\
-    {"RESERVED", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IOAM_E2E_T_RESERVED},\
-    {"TYPE", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IOAM_E2E_T_TYPE},\
-    {"ioam_e2e_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IOAM_E2E_T_FID_COUNT}
-
-/*!
- * \name IPFIX_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPFIX_T_EXPORT_TIME   0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPFIX_T_LENGTH        1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPFIX_T_OBS_DOMAIN_ID 2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPFIX_T_SEQUENCE_NUM  3
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPFIX_T_VERSION       4
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPFIX_T_FID_COUNT          5
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT \
-    {"EXPORT_TIME", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPFIX_T_EXPORT_TIME},\
-    {"LENGTH", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPFIX_T_LENGTH},\
-    {"OBS_DOMAIN_ID", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPFIX_T_OBS_DOMAIN_ID},\
-    {"SEQUENCE_NUM", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPFIX_T_SEQUENCE_NUM},\
-    {"VERSION", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPFIX_T_VERSION},\
-    {"ipfix_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPFIX_T_FID_COUNT}
-
-/*!
- * \name IPV4_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV4_T_DA                0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET 1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV4_T_HDR_CHECKSUM      2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV4_T_ID                3
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV4_T_OPTION            4
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV4_T_PROTOCOL          5
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV4_T_SA                6
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV4_T_TOS               7
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV4_T_TOTAL_LENGTH      8
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV4_T_TTL               9
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV4_T_VERSION_HDR_LEN   10
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV4_T_FID_COUNT          11
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT \
-    {"DA", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV4_T_DA},\
-    {"FLAGS_FRAG_OFFSET", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET},\
-    {"HDR_CHECKSUM", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV4_T_HDR_CHECKSUM},\
-    {"ID", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV4_T_ID},\
-    {"OPTION", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV4_T_OPTION},\
-    {"PROTOCOL", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV4_T_PROTOCOL},\
-    {"SA", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV4_T_SA},\
-    {"TOS", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV4_T_TOS},\
-    {"TOTAL_LENGTH", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV4_T_TOTAL_LENGTH},\
-    {"TTL", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV4_T_TTL},\
-    {"VERSION_HDR_LEN", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV4_T_VERSION_HDR_LEN},\
-    {"ipv4_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV4_T_FID_COUNT}
-
-/*!
- * \name IPV6_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV6_T_DA             0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV6_T_FLOW_LABEL     1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV6_T_HOP_LIMIT      2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV6_T_NEXT_HEADER    3
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV6_T_PAYLOAD_LENGTH 4
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV6_T_SA             5
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV6_T_TRAFFIC_CLASS  6
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV6_T_VERSION        7
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV6_T_FID_COUNT          8
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT \
-    {"DA", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV6_T_DA},\
-    {"FLOW_LABEL", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV6_T_FLOW_LABEL},\
-    {"HOP_LIMIT", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV6_T_HOP_LIMIT},\
-    {"NEXT_HEADER", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV6_T_NEXT_HEADER},\
-    {"PAYLOAD_LENGTH", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV6_T_PAYLOAD_LENGTH},\
-    {"SA", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV6_T_SA},\
-    {"TRAFFIC_CLASS", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV6_T_TRAFFIC_CLASS},\
-    {"VERSION", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV6_T_VERSION},\
-    {"ipv6_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV6_T_FID_COUNT}
-
-/*!
- * \name L2_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_L2_T_MACDA 0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_L2_T_MACSA 1
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_L2_T_FID_COUNT          2
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_L2_T_FIELD_NAME_MAP_INIT \
-    {"MACDA", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_L2_T_MACDA},\
-    {"MACSA", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_L2_T_MACSA},\
-    {"l2_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_L2_T_FID_COUNT}
-
-/*!
- * \name MIRROR_ERSPAN_SN_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM 0
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT          1
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT \
-    {"SEQ_NUM", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM},\
-    {"mirror_erspan_sn_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT}
-
-/*!
- * \name MIRROR_TRANSPORT_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MIRROR_TRANSPORT_T_DATA 0
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT          1
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT \
-    {"DATA", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MIRROR_TRANSPORT_T_DATA},\
-    {"mirror_transport_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT}
-
-/*!
- * \name MPLS_ACH_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_ACH_T_CHANNEL_TYPE 0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_ACH_T_CW_TYPE      1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_ACH_T_RESERVED     2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_ACH_T_VERSION      3
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_ACH_T_FID_COUNT          4
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_ACH_T_FIELD_NAME_MAP_INIT \
-    {"CHANNEL_TYPE", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_ACH_T_CHANNEL_TYPE},\
-    {"CW_TYPE", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_ACH_T_CW_TYPE},\
-    {"RESERVED", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_ACH_T_RESERVED},\
-    {"VERSION", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_ACH_T_VERSION},\
-    {"mpls_ach_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_ACH_T_FID_COUNT}
-
-/*!
- * \name MPLS_BV_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_BV_T_VALUE 0
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_BV_T_FID_COUNT          1
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_BV_T_FIELD_NAME_MAP_INIT \
-    {"VALUE", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_BV_T_VALUE},\
-    {"mpls_bv_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_BV_T_FID_COUNT}
-
-/*!
- * \name MPLS_CW_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_CW_T_CW_TYPE    0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_CW_T_RESERVED   1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_CW_T_SEQ_NUMBER 2
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_CW_T_FID_COUNT          3
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_CW_T_FIELD_NAME_MAP_INIT \
-    {"CW_TYPE", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_CW_T_CW_TYPE},\
-    {"RESERVED", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_CW_T_RESERVED},\
-    {"SEQ_NUMBER", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_CW_T_SEQ_NUMBER},\
-    {"mpls_cw_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_CW_T_FID_COUNT}
-
-/*!
- * \name MPLS_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_T_BOS   0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_T_EXP   1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_T_LABEL 2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_T_TTL   3
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_T_FID_COUNT          4
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_T_FIELD_NAME_MAP_INIT \
-    {"BOS", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_T_BOS},\
-    {"EXP", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_T_EXP},\
-    {"LABEL", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_T_LABEL},\
-    {"TTL", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_T_TTL},\
-    {"mpls_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_T_FID_COUNT}
-
-/*!
- * \name P_1588_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_P_1588_T_CNTRL          0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_P_1588_T_CORRECTION     1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_P_1588_T_DOMAIN_NB      2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_P_1588_T_FLAGS          3
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_P_1588_T_LOGMSGINTERVAL 4
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_P_1588_T_MSG_LENGTH     5
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_P_1588_T_MSG_TYPE       6
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_P_1588_T_RESERVED1      7
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_P_1588_T_RESERVED2      8
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_P_1588_T_RESERVED3      9
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_P_1588_T_SEQ_ID         10
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_P_1588_T_SRCPORTID      11
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_P_1588_T_TRANSPORTSPEC  12
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_P_1588_T_VERSION        13
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_P_1588_T_FID_COUNT          14
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_P_1588_T_FIELD_NAME_MAP_INIT \
-    {"CNTRL", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_P_1588_T_CNTRL},\
-    {"CORRECTION", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_P_1588_T_CORRECTION},\
-    {"DOMAIN_NB", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_P_1588_T_DOMAIN_NB},\
-    {"FLAGS", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_P_1588_T_FLAGS},\
-    {"LOGMSGINTERVAL", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_P_1588_T_LOGMSGINTERVAL},\
-    {"MSG_LENGTH", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_P_1588_T_MSG_LENGTH},\
-    {"MSG_TYPE", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_P_1588_T_MSG_TYPE},\
-    {"RESERVED1", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_P_1588_T_RESERVED1},\
-    {"RESERVED2", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_P_1588_T_RESERVED2},\
-    {"RESERVED3", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_P_1588_T_RESERVED3},\
-    {"SEQ_ID", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_P_1588_T_SEQ_ID},\
-    {"SRCPORTID", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_P_1588_T_SRCPORTID},\
-    {"TRANSPORTSPEC", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_P_1588_T_TRANSPORTSPEC},\
-    {"VERSION", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_P_1588_T_VERSION},\
-    {"p_1588_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_P_1588_T_FID_COUNT}
-
-/*!
- * \name PROG_EXT_HDR_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PROG_EXT_HDR_T_HDR_EXT_LEN 0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PROG_EXT_HDR_T_NEXT_HEADER 1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PROG_EXT_HDR_T_OPTION      2
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT          3
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PROG_EXT_HDR_T_FIELD_NAME_MAP_INIT \
-    {"HDR_EXT_LEN", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PROG_EXT_HDR_T_HDR_EXT_LEN},\
-    {"NEXT_HEADER", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PROG_EXT_HDR_T_NEXT_HEADER},\
-    {"OPTION", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PROG_EXT_HDR_T_OPTION},\
-    {"prog_ext_hdr_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT}
-
-/*!
- * \name PSAMP_0_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_0_T_FLOWSET        0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_0_T_LENGTH         1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_0_T_NEXT_HOP_INDEX 2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_0_T_OBS_TIME_NS    3
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_0_T_OBS_TIME_S     4
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_0_T_TEMPLATE_ID    5
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_0_T_FID_COUNT          6
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_0_T_FIELD_NAME_MAP_INIT \
-    {"FLOWSET", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_0_T_FLOWSET},\
-    {"LENGTH", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_0_T_LENGTH},\
-    {"NEXT_HOP_INDEX", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_0_T_NEXT_HOP_INDEX},\
-    {"OBS_TIME_NS", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_0_T_OBS_TIME_NS},\
-    {"OBS_TIME_S", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_0_T_OBS_TIME_S},\
-    {"TEMPLATE_ID", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_0_T_TEMPLATE_ID},\
-    {"psamp_0_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_0_T_FID_COUNT}
-
-/*!
- * \name PSAMP_1_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_1_T_DLB_ID         0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_1_T_EGRESS_PORT    1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_1_T_EPOCH          2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_1_T_INGRESS_PORT   3
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_1_T_SAMPLED_LENGTH 4
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_1_T_USER_META_DATA 5
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_1_T_VARIABLE_FLAG  6
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_1_T_FID_COUNT          7
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_1_T_FIELD_NAME_MAP_INIT \
-    {"DLB_ID", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_1_T_DLB_ID},\
-    {"EGRESS_PORT", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_1_T_EGRESS_PORT},\
-    {"EPOCH", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_1_T_EPOCH},\
-    {"INGRESS_PORT", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_1_T_INGRESS_PORT},\
-    {"SAMPLED_LENGTH", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_1_T_SAMPLED_LENGTH},\
-    {"USER_META_DATA", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_1_T_USER_META_DATA},\
-    {"VARIABLE_FLAG", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_1_T_VARIABLE_FLAG},\
-    {"psamp_1_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_1_T_FID_COUNT}
-
-/*!
- * \name PSAMP_MIRROR_ON_DROP_0_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT 0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT    1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH          2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS     3
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S      4
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID       5
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID     6
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT          7
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT \
-    {"EGRESS_MOD_PORT", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT},\
-    {"INGRESS_PORT", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT},\
-    {"LENGTH", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH},\
-    {"OBS_TIME_NS", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS},\
-    {"OBS_TIME_S", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S},\
-    {"SWITCH_ID", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID},\
-    {"TEMPLATE_ID", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID},\
-    {"psamp_mirror_on_drop_0_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT}
-
-/*!
- * \name PSAMP_MIRROR_ON_DROP_3_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_DROP_REASON             0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_RESERVED_0              1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SAMPLED_LENGTH          2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SMOD_STATE              3
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_UC_COS__COLOR__PROB_IDX 4
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_USER_META_DATA          5
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_VAR_LEN_INDICATOR       6
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT          7
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FIELD_NAME_MAP_INIT \
-    {"DROP_REASON", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_DROP_REASON},\
-    {"RESERVED_0", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_RESERVED_0},\
-    {"SAMPLED_LENGTH", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SAMPLED_LENGTH},\
-    {"SMOD_STATE", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SMOD_STATE},\
-    {"UC_COS__COLOR__PROB_IDX", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_UC_COS__COLOR__PROB_IDX},\
-    {"USER_META_DATA", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_USER_META_DATA},\
-    {"VAR_LEN_INDICATOR", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_VAR_LEN_INDICATOR},\
-    {"psamp_mirror_on_drop_3_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT}
-
-/*!
- * \name RARP_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RARP_T_HARDWARE_LEN  0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RARP_T_HARDWARE_TYPE 1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RARP_T_OPERATION     2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RARP_T_PROT_ADDR_LEN 3
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RARP_T_PROTOCOL_TYPE 4
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RARP_T_SENDER_HA     5
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RARP_T_SENDER_IP     6
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RARP_T_TARGET_HA     7
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RARP_T_TARGET_IP     8
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RARP_T_FID_COUNT          9
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT \
-    {"HARDWARE_LEN", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RARP_T_HARDWARE_LEN},\
-    {"HARDWARE_TYPE", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RARP_T_HARDWARE_TYPE},\
-    {"OPERATION", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RARP_T_OPERATION},\
-    {"PROT_ADDR_LEN", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RARP_T_PROT_ADDR_LEN},\
-    {"PROTOCOL_TYPE", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RARP_T_PROTOCOL_TYPE},\
-    {"SENDER_HA", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RARP_T_SENDER_HA},\
-    {"SENDER_IP", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RARP_T_SENDER_IP},\
-    {"TARGET_HA", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RARP_T_TARGET_HA},\
-    {"TARGET_IP", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RARP_T_TARGET_IP},\
-    {"rarp_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RARP_T_FID_COUNT}
-
-/*!
- * \name ROUTING_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ROUTING_T_DATA          0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ROUTING_T_HDR_EXT_LEN   1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ROUTING_T_NEXT_HEADER   2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ROUTING_T_ROUTING_TYPE  3
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ROUTING_T_SEGMENTS_LEFT 4
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ROUTING_T_FID_COUNT          5
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ROUTING_T_FIELD_NAME_MAP_INIT \
-    {"DATA", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ROUTING_T_DATA},\
-    {"HDR_EXT_LEN", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ROUTING_T_HDR_EXT_LEN},\
-    {"NEXT_HEADER", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ROUTING_T_NEXT_HEADER},\
-    {"ROUTING_TYPE", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ROUTING_T_ROUTING_TYPE},\
-    {"SEGMENTS_LEFT", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ROUTING_T_SEGMENTS_LEFT},\
-    {"routing_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ROUTING_T_FID_COUNT}
-
-/*!
- * \name RSPAN_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RSPAN_T_TAG  0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RSPAN_T_TPID 1
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RSPAN_T_FID_COUNT          2
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RSPAN_T_FIELD_NAME_MAP_INIT \
-    {"TAG", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RSPAN_T_TAG},\
-    {"TPID", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RSPAN_T_TPID},\
-    {"rspan_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RSPAN_T_FID_COUNT}
-
-/*!
- * \name SEGMENT_ROUTING_SRH_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_SRH_T_FLAGS         0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_SRH_T_HDR_EXT_LEN   1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_SRH_T_LAST_ENTRY    2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_SRH_T_NEXT_HEADER   3
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_SRH_T_ROUTING_TYPE  4
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_SRH_T_SEGMENTS_LEFT 5
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_SRH_T_TAG           6
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_SRH_T_FID_COUNT          7
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_SRH_T_FIELD_NAME_MAP_INIT \
-    {"FLAGS", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_SRH_T_FLAGS},\
-    {"HDR_EXT_LEN", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_SRH_T_HDR_EXT_LEN},\
-    {"LAST_ENTRY", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_SRH_T_LAST_ENTRY},\
-    {"NEXT_HEADER", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_SRH_T_NEXT_HEADER},\
-    {"ROUTING_TYPE", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_SRH_T_ROUTING_TYPE},\
-    {"SEGMENTS_LEFT", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_SRH_T_SEGMENTS_LEFT},\
-    {"TAG", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_SRH_T_TAG},\
-    {"segment_routing_srh_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_SRH_T_FID_COUNT}
-
-/*!
- * \name SEGMENT_ROUTING_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_T_HDR_EXT_LEN      0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_T_LAST_ENTRY_FLAGS 1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_T_NEXT_HEADER      2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_T_ROUTING_TYPE     3
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_T_SEG_LIST         4
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_T_SEGMENTS_LEFT    5
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_T_TAG              6
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_T_FID_COUNT          7
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_T_FIELD_NAME_MAP_INIT \
-    {"HDR_EXT_LEN", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_T_HDR_EXT_LEN},\
-    {"LAST_ENTRY_FLAGS", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_T_LAST_ENTRY_FLAGS},\
-    {"NEXT_HEADER", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_T_NEXT_HEADER},\
-    {"ROUTING_TYPE", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_T_ROUTING_TYPE},\
-    {"SEG_LIST", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_T_SEG_LIST},\
-    {"SEGMENTS_LEFT", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_T_SEGMENTS_LEFT},\
-    {"TAG", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_T_TAG},\
-    {"segment_routing_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_T_FID_COUNT}
-
-/*!
- * \name SFLOW_SHIM_0_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_0_T_SYS_DESTINATION 0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_0_T_SYS_SOURCE      1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_0_T_VERSION         2
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT          3
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_0_T_FIELD_NAME_MAP_INIT \
-    {"SYS_DESTINATION", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_0_T_SYS_DESTINATION},\
-    {"SYS_SOURCE", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_0_T_SYS_SOURCE},\
-    {"VERSION", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_0_T_VERSION},\
-    {"sflow_shim_0_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT}
-
-/*!
- * \name SFLOW_SHIM_1_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DEST_SAMPLE 0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DISCARDED   1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_FLEX_SAMPLE 2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_MCAST       3
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_SRC_SAMPLE  4
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_TRUNCATED   5
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_1_T_RESERVED         6
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_1_T_SYS_OPCODE       7
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT          8
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_1_T_FIELD_NAME_MAP_INIT \
-    {"FLAG_DEST_SAMPLE", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DEST_SAMPLE},\
-    {"FLAG_DISCARDED", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DISCARDED},\
-    {"FLAG_FLEX_SAMPLE", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_FLEX_SAMPLE},\
-    {"FLAG_MCAST", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_MCAST},\
-    {"FLAG_SRC_SAMPLE", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_SRC_SAMPLE},\
-    {"FLAG_TRUNCATED", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_TRUNCATED},\
-    {"RESERVED", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_1_T_RESERVED},\
-    {"SYS_OPCODE", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_1_T_SYS_OPCODE},\
-    {"sflow_shim_1_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT}
-
-/*!
- * \name SFLOW_SHIM_2_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_2_T_SEQUENCE_NUM   0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_2_T_USER_META_DATA 1
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT          2
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_2_T_FIELD_NAME_MAP_INIT \
-    {"SEQUENCE_NUM", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_2_T_SEQUENCE_NUM},\
-    {"USER_META_DATA", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_2_T_USER_META_DATA},\
-    {"sflow_shim_2_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT}
-
-/*!
- * \name SNAP_LLC_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SNAP_LLC_T_LENGTH   0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SNAP_LLC_T_SNAP_LLC 1
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SNAP_LLC_T_FID_COUNT          2
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SNAP_LLC_T_FIELD_NAME_MAP_INIT \
-    {"LENGTH", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SNAP_LLC_T_LENGTH},\
-    {"SNAP_LLC", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SNAP_LLC_T_SNAP_LLC},\
-    {"snap_llc_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SNAP_LLC_T_FID_COUNT}
-
-/*!
- * \name STD_SEGMENT_ID_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_STD_SEGMENT_ID_T_DATA 0
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_STD_SEGMENT_ID_T_FID_COUNT          1
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_STD_SEGMENT_ID_T_FIELD_NAME_MAP_INIT \
-    {"DATA", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_STD_SEGMENT_ID_T_DATA},\
-    {"std_segment_id_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_STD_SEGMENT_ID_T_FID_COUNT}
-
-/*!
- * \name SVTAG_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SVTAG_T_DATA_LWR 0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SVTAG_T_DATA_UPR 1
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SVTAG_T_FID_COUNT          2
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SVTAG_T_FIELD_NAME_MAP_INIT \
-    {"DATA_LWR", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SVTAG_T_DATA_LWR},\
-    {"DATA_UPR", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SVTAG_T_DATA_UPR},\
-    {"svtag_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SVTAG_T_FID_COUNT}
-
-/*!
- * \name TCP_FIRST_4BYTES_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT 0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT 1
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT          2
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT \
-    {"DST_PORT", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT},\
-    {"SRC_PORT", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT},\
-    {"tcp_first_4bytes_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT}
-
-/*!
- * \name TCP_LAST_16BYTES_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM           0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM          1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS 2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM           3
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR        4
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE          5
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT          6
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT \
-    {"ACK_NUM", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM},\
-    {"CHECKSUM", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM},\
-    {"HDR_LEN_AND_FLAGS", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS},\
-    {"SEQ_NUM", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM},\
-    {"URGENT_PTR", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR},\
-    {"WIN_SIZE", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE},\
-    {"tcp_last_16bytes_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT}
-
-/*!
- * \name UDP_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UDP_T_CHECKSUM   0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UDP_T_DST_PORT   1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UDP_T_SRC_PORT   2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UDP_T_UDP_LENGTH 3
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UDP_T_FID_COUNT          4
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT \
-    {"CHECKSUM", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UDP_T_CHECKSUM},\
-    {"DST_PORT", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UDP_T_DST_PORT},\
-    {"SRC_PORT", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UDP_T_SRC_PORT},\
-    {"UDP_LENGTH", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UDP_T_UDP_LENGTH},\
-    {"udp_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UDP_T_FID_COUNT}
-
-/*!
- * \name UNKNOWN_L3_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD 0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD  1
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT          2
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT \
-    {"FIRST_16BYTES_OF_L3_PAYLOAD", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD},\
-    {"NEXT_16BYTES_OF_L3_PAYLOAD", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD},\
-    {"unknown_l3_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT}
-
-/*!
- * \name UNKNOWN_L4_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD 0
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT          1
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT \
-    {"FIRST_4BYTES_OF_L4_PAYLOAD", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD},\
-    {"unknown_l4_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT}
-
-/*!
- * \name UNKNOWN_L5_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1 0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3 1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7 2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_8_9 3
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT          4
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT \
-    {"L5_BYTES_0_1", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1},\
-    {"L5_BYTES_2_3", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3},\
-    {"L5_BYTES_4_7", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7},\
-    {"L5_BYTES_8_9", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_8_9},\
-    {"unknown_l5_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT}
-
-/*!
- * \name VLAN_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_VLAN_T_CFI  0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_VLAN_T_PCP  1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_VLAN_T_TPID 2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_VLAN_T_VID  3
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_VLAN_T_FID_COUNT          4
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT \
-    {"CFI", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_VLAN_T_CFI},\
-    {"PCP", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_VLAN_T_PCP},\
-    {"TPID", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_VLAN_T_TPID},\
-    {"VID", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_VLAN_T_VID},\
-    {"vlan_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_VLAN_T_FID_COUNT}
-
-/*!
- * \name VXLAN_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_VXLAN_T_FLAGS_RESERVED_1 0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_VXLAN_T_RESERVED2        1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_VXLAN_T_VN_ID            2
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_VXLAN_T_FID_COUNT          3
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT \
-    {"FLAGS_RESERVED_1", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_VXLAN_T_FLAGS_RESERVED_1},\
-    {"RESERVED2", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_VXLAN_T_RESERVED2},\
-    {"VN_ID", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_VXLAN_T_VN_ID},\
-    {"vxlan_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_VXLAN_T_FID_COUNT}
-
-/*!
- * \name WESP_T field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_WESP_T_FLAGS       0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_WESP_T_HEADER_LEN  1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_WESP_T_NEXT_HEADER 2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_WESP_T_SEQ_NUM     3
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_WESP_T_SPI         4
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_WESP_T_TRAILER_LEN 5
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_WESP_T_WESP_IV     6
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_WESP_T_FID_COUNT          7
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_WESP_T_FIELD_NAME_MAP_INIT \
-    {"FLAGS", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_WESP_T_FLAGS},\
-    {"HEADER_LEN", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_WESP_T_HEADER_LEN},\
-    {"NEXT_HEADER", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_WESP_T_NEXT_HEADER},\
-    {"SEQ_NUM", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_WESP_T_SEQ_NUM},\
-    {"SPI", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_WESP_T_SPI},\
-    {"TRAILER_LEN", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_WESP_T_TRAILER_LEN},\
-    {"WESP_IV", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_WESP_T_WESP_IV},\
-    {"wesp_t fid count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_WESP_T_FID_COUNT}
-
-
-#endif /* BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_FLEXHDR_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_bcmpkt_rxpmd_flex_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_bcmpkt_rxpmd_flex_data.h
deleted file mode 100644
index 5e273d4c8081..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_bcmpkt_rxpmd_flex_data.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) map.yml.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_DATA_H
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_DATA_H
-
-/*!
- * \name RX flex metadata field IDs.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_BSCAN_CONTROL_DATA_15_0                        0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_BSCAN_CONTROL_FLAGS_3_0                        1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_DLB_ECMP_DESTINATION_15_0                      2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_DNAT_CTRL_3_0                                  3
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0                                 4
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_DVP_15_0                                       5
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_AND_SNAT_CTRL_15_0               6
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_EM_FT_OPAQUE_OBJ_OR_IFP_OPAQUE_OBJ_15_0        7
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_HIGH_3_0                         8
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0                         9
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_EP_NIH_DROP_CODE_OR_IFP_OPAQUE_OBJ_15_0        10
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_RECIRC_CODE_3_0                     11
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_15_0                      12
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_31_16                     13
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_15_0                        14
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_16                       15
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32                       16
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_FLOW_ID_LSB_15_0                               17
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_FLOW_ID_MSB_3_0                                18
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0                              19
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_IFP_IOAM_GBP_ACTION_3_0                        20
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_IFP_TS_CONTROL_ACTION_3_0                      21
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_15_0                             22
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_16                            23
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_INGRESS_DEVICE_PORT_8_0                        24
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0 25
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0                    26
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_INT_PRI_3_0                                    27
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_L2_IIF_12_0                                    28
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_L2_OIF_12_0                                    29
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_L3_DNAT_INDEX_15_0                             30
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_L3_IIF_13_0                                    31
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0                                  32
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_L3_SNAT_INDEX_15_0                             33
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_MAC_DA_23_20_3_0                               34
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_MPLS_LABEL_DECAP_COUNT_3_0                     35
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0              36
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_15_0                              37
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0                            38
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0                            39
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_SRV6_DIP_EDIT_CTRL_3_0                         40
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_SRV6_EDIT_AND_SL_UPDATE_CTRL_3_0               41
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_SRV6_NEW_GSID_SI_2_0                           42
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_SRV6_SID_AND_PREFIX_LEN_ENC_3_0                43
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_SVP_15_0                                       44
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0                   45
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_SVTAG_CTRL_PKT_INFO_3_0                        46
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_SVTAG_SC_INDEX_OR_IFP_OPAQUE_OBJ_15_0          47
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_SVTAG_SC_INDEX_STR_ALLOW_NAT_3_0               48
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0                        49
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0                              50
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_SYSTEM_SOURCE_15_0                             51
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_TIMESTAMP_CTRL_3_0                             52
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0                53
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_VFI_15_0                                       54
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_VLAN_TAG_PRESERVE_CTRL_SVP_MIRROR_ENABLE_3_0   55
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_FID_COUNT                       56
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_COUNT                    48
-
-/*!
- * \name Packet Flex Reason Types.
- */
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE                         0
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS                               1
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_DEFAULT                                 2
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED 3
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED                    4
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED  5
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED                     6
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP                                  7
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT                                   8
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT_HPAE_MISS                         9
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_IFP                                     10
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER                               11
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED      12
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT                                   13
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP                           14
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS                      15
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE                      16
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP                           17
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS                      18
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR                            19
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF                        20
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR                            21
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL                        22
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD                    23
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0                      24
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1                      25
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2                      26
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3                      27
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4                      28
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5                      29
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6                      30
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7                      31
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD            32
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED              33
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED                  34
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU                    35
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU                          36
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED              37
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT                            38
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP                                39
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD         40
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_SRV6                                    41
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_SVP                                     42
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP                               43
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU                44
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR                     45
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED                       46
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_VFP                                     47
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT \
-    {"CB_STATION_MOVE", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE},\
-    {"CML_FLAGS", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS},\
-    {"DEFAULT", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_DEFAULT},\
-    {"DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED},\
-    {"DLB_ECMP_PKT_SAMPLED", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED},\
-    {"DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED},\
-    {"DLB_LAG_PKT_SAMPLED", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED},\
-    {"DST_FP", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP},\
-    {"EM_FT", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT},\
-    {"EM_FT_HPAE_MISS", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT_HPAE_MISS},\
-    {"IFP", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_IFP},\
-    {"IFP_METER", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER},\
-    {"IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED},\
-    {"IVXLT", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT},\
-    {"L2_DST_LOOKUP", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP},\
-    {"L2_DST_LOOKUP_MISS", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS},\
-    {"L2_SRC_STATIC_MOVE", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE},\
-    {"L3_DST_LOOKUP", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP},\
-    {"L3_DST_LOOKUP_MISS", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS},\
-    {"L3_HDR_ERROR", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR},\
-    {"L3_IIF_EQ_L3_OIF", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF},\
-    {"L3_TTL_ERROR", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR},\
-    {"LEARN_CACHE_FULL", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL},\
-    {"MACSA_MULTICAST_RSVD", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD},\
-    {"MATCHED_RULE_BIT_0", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0},\
-    {"MATCHED_RULE_BIT_1", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1},\
-    {"MATCHED_RULE_BIT_2", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2},\
-    {"MATCHED_RULE_BIT_3", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3},\
-    {"MATCHED_RULE_BIT_4", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4},\
-    {"MATCHED_RULE_BIT_5", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5},\
-    {"MATCHED_RULE_BIT_6", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6},\
-    {"MATCHED_RULE_BIT_7", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7},\
-    {"MEMBERSHIP_CHECK_FAILED_RSVD", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD},\
-    {"MIRROR_SAMPLER_EGR_SAMPLED", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED},\
-    {"MIRROR_SAMPLER_SAMPLED", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED},\
-    {"MPLS_CTRL_PKT_TO_CPU", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU},\
-    {"NO_COPY_TO_CPU", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU},\
-    {"PKT_INTEGRITY_CHECK_FAILED", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED},\
-    {"PROTOCOL_PKT", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT},\
-    {"SER_DROP", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP},\
-    {"SPANNING_TREE_CHECK_FAILED_RSVD", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD},\
-    {"SRV6", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_SRV6},\
-    {"SVP", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_SVP},\
-    {"TRACE_DOP", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP},\
-    {"TRACE_DO_NOT_COPY_TO_CPU", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU},\
-    {"TRACE_DO_NOT_MIRROR", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR},\
-    {"URPF_CHECK_FAILED", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED},\
-    {"VFP", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_VFP},\
-    {"flex reason count", BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_COUNT}
-
-#endif /* BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_bcmpkt_rxpmd_match_id_defs.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_bcmpkt_rxpmd_match_id_defs.h
deleted file mode 100644
index 834579bbe3a3..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_bcmpkt_rxpmd_match_id_defs.h
+++ /dev/null
@@ -1,515 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) bcm56890_a0_dna_6_5_30_8_0_sf_match_id_info.yml
- * for device bcm56890_a0 and variant dna_6_5_30_8_0.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H
-
-#include <bcmpkt/bcmpkt_rxpmd_match_id.h>
-
-/*!
- * \brief Get the Match ID DataBase information.
- *
- * \retval bcmpkt_rxpmd_match_id_db_info_t Match ID DataBase information.
-*/
-extern bcmpkt_rxpmd_match_id_db_info_t *
-    bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db_info_get(void);
-
-/*!
- * \brief Get the Match ID Mapping information.
- *
- * \retval bcmpkt_rxpmd_match_id_map_info_t Match ID Mapping information.
-*/
-extern bcmpkt_rxpmd_match_id_map_info_t *
-    bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_map_info_get(void);
-
-/*!
-  \name RXPMD Match IDs
-*/
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_CNTAG  0
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_GBP_ETHERNET_SHIM  1
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_BASE  2
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0  3
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG  4
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2  5
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE  6
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG  7
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC  8
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SVTAG  9
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP  10
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1  11
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2  12
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD  13
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_1  14
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_2  15
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT  16
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE  17
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1  18
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2  19
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE  20
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE  21
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM  22
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY  23
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT  24
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ  25
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_1  26
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_2  27
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP  28
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_HEADER  29
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA_BASE  30
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP  31
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IOAM_E2E  32
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4  33
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6  34
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0  35
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1  36
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2  37
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3  38
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4  39
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5  40
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6  41
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH  42
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW  43
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE  44
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588  45
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_1  46
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_2  47
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP  48
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_1  49
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_2  50
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_SEG_ROUT_EXT_1  51
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES  52
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES  53
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP  54
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3  55
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4  56
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5  57
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN  58
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_1  59
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_2  60
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH  61
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK  62
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE  63
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_CNTAG  64
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_GBP_ETHERNET_SHIM  65
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE  66
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0  67
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG  68
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2  69
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE  70
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG  71
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC  72
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SVTAG  73
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP  74
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1  75
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2  76
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD  77
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_1  78
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_2  79
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT  80
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE  81
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1  82
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2  83
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE  84
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE  85
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM  86
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY  87
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT  88
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ  89
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_1  90
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_2  91
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP  92
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_HEADER  93
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA_BASE  94
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP  95
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IOAM_E2E  96
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4  97
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6  98
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0  99
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1  100
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2  101
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3  102
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4  103
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5  104
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6  105
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH  106
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW  107
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE  108
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588  109
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_1  110
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_2  111
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP  112
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_1  113
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_2  114
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_SEG_ROUT_EXT_1  115
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES  116
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES  117
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP  118
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3  119
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4  120
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5  121
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN  122
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_1  123
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_2  124
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_CNTAG  125
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG  126
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2  127
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE  128
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG  129
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC  130
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP  131
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1  132
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2  133
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD  134
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_1  135
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_2  136
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT  137
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE  138
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1  139
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2  140
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_1  141
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_2  142
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP  143
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_HEADER  144
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA_BASE  145
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP  146
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4  147
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6  148
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE  149
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588  150
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_1  151
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_2  152
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP  153
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_1  154
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_2  155
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES  156
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES  157
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP  158
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3  159
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4  160
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5  161
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_1  162
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_2  163
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_CNTAG  164
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_GBP_ETHERNET_SHIM  165
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_BASE  166
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0  167
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG  168
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2  169
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE  170
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG  171
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC  172
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SVTAG  173
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP  174
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1  175
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2  176
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD  177
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_1  178
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_2  179
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT  180
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE  181
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1  182
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2  183
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE  184
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE  185
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM  186
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY  187
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT  188
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ  189
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_1  190
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_2  191
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP  192
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_HEADER  193
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA_BASE  194
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP  195
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IOAM_E2E  196
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4  197
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6  198
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0  199
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1  200
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2  201
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3  202
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4  203
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5  204
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6  205
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH  206
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW  207
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE  208
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588  209
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_1  210
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_2  211
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP  212
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_1  213
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_2  214
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_SEG_ROUT_EXT_1  215
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES  216
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES  217
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP  218
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3  219
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4  220
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5  221
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN  222
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_1  223
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_2  224
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH  225
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK  226
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE  227
-#define BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_COUNT  228
-
-#define BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT \
-    {"EGRESS_PKT_FWD_L2_HDR_CNTAG", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_CNTAG}, \
-    {"EGRESS_PKT_FWD_L2_HDR_GBP_ETHERNET_SHIM", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_GBP_ETHERNET_SHIM}, \
-    {"EGRESS_PKT_FWD_L2_HDR_HG3_BASE", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_BASE}, \
-    {"EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0}, \
-    {"EGRESS_PKT_FWD_L2_HDR_ITAG", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG}, \
-    {"EGRESS_PKT_FWD_L2_HDR_L2", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2}, \
-    {"EGRESS_PKT_FWD_L2_HDR_NONE", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE}, \
-    {"EGRESS_PKT_FWD_L2_HDR_OTAG", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG}, \
-    {"EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC}, \
-    {"EGRESS_PKT_FWD_L2_HDR_SVTAG", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SVTAG}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ARP", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_BFD", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_1", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_2", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_2}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GPE", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_1", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_2", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_2}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ICMP", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IFA_HEADER", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_HEADER}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA_BASE", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA_BASE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IGMP", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IOAM_E2E", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IOAM_E2E}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV4", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV6", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS0", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS1", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS2", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS3", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS4", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS5", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS6", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_NONE", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_P_1588", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_1", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_2", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_2}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_RARP", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_1", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_2", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_2}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_SEG_ROUT_EXT_1", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_SEG_ROUT_EXT_1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UDP", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_VXLAN", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_1", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_2", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_2}, \
-    {"EGRESS_PKT_SYS_HDR_EP_NIH", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH}, \
-    {"EGRESS_PKT_SYS_HDR_LOOPBACK", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK}, \
-    {"EGRESS_PKT_SYS_HDR_NONE", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_CNTAG", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_CNTAG}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_GBP_ETHERNET_SHIM", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_GBP_ETHERNET_SHIM}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_ITAG", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_L2", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_NONE", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_OTAG", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_SVTAG", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SVTAG}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_1", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_2", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_2}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_1", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_2", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_2}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_HEADER", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_HEADER}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA_BASE", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA_BASE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IOAM_E2E", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IOAM_E2E}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_1", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_2", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_2}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_1", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_2", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_2}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_SEG_ROUT_EXT_1", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_SEG_ROUT_EXT_1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_1", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_2", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_2}, \
-    {"INGRESS_PKT_INNER_L2_HDR_CNTAG", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_CNTAG}, \
-    {"INGRESS_PKT_INNER_L2_HDR_ITAG", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG}, \
-    {"INGRESS_PKT_INNER_L2_HDR_L2", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2}, \
-    {"INGRESS_PKT_INNER_L2_HDR_NONE", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE}, \
-    {"INGRESS_PKT_INNER_L2_HDR_OTAG", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG}, \
-    {"INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ARP", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_BFD", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_1", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_1}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_2", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_2}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_1", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_1}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_2", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_2}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ICMP", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_IFA_HEADER", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_HEADER}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA_BASE", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA_BASE}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_IGMP", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV4", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV6", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_NONE", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_P_1588", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_1", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_1}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_2", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_2}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_RARP", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_1", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_1}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_2", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_2}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UDP", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_1", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_1}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_2", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_2}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_CNTAG", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_CNTAG}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_GBP_ETHERNET_SHIM", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_GBP_ETHERNET_SHIM}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_HG3_BASE", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_BASE}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_ITAG", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_L2", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_NONE", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_OTAG", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_SVTAG", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SVTAG}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ARP", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_BFD", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_1", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_2", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_2}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GPE", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_1", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_2", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_2}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ICMP", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IFA_HEADER", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_HEADER}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA_BASE", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA_BASE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IGMP", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IOAM_E2E", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IOAM_E2E}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV4", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV6", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_NONE", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_P_1588", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_1", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_2", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_2}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_RARP", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_1", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_2", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_2}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_SEG_ROUT_EXT_1", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_SEG_ROUT_EXT_1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UDP", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_1", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_2", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_2}, \
-    {"INGRESS_PKT_SYS_HDR_EP_NIH", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH}, \
-    {"INGRESS_PKT_SYS_HDR_LOOPBACK", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK}, \
-    {"INGRESS_PKT_SYS_HDR_NONE", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE}, \
-    {"rxpmd_match_id_count", BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_COUNT}
-
-#endif /*! BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_bcmpkt_flexhdr.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_bcmpkt_flexhdr.h
new file mode 100644
index 000000000000..740cd098e3fc
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_bcmpkt_flexhdr.h
@@ -0,0 +1,176 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) header.yml.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_FLEXHDR_H
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_FLEXHDR_H
+
+#include <bcmpkt/bcmpkt_flexhdr_internal.h>
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T                      0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T                   1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T                      2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CNTAG_T                    3
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T         4
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T         5
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_DEST_OPTION_T              6
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_EP_NIH_HEADER_T            7
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T        8
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T         9
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ESP_T                      10
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ETHERTYPE_T                11
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_FRAG_T                     12
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GBP_ETHERNET_SHIM_T        13
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T         14
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GPE_T                      15
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_CHKSUM_T               16
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_KEY_T                  17
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_ROUT_T                 18
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_SEQ_T                  19
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_T                      20
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T                 21
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T          22
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HOP_BY_HOP_T               23
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ICMP_T                     24
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_HEADER_T               25
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_A_T           26
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_B_T           27
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_BASE_T        28
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IGMP_T                     29
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IOAM_E2E_T                 30
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPFIX_T                    31
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T                     32
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T                     33
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_L2_T                       34
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_ERSPAN_SN_T         35
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_TRANSPORT_T         36
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_ACH_T                 37
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_BV_T                  38
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_CW_T                  39
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_T                     40
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T                   41
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PROG_EXT_HDR_T             42
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T                  43
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T                  44
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T   45
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T   46
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T                     47
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ROUTING_T                  48
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RSPAN_T                    49
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_SRH_T      50
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_T          51
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_0_T             52
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T             53
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_2_T             54
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SNAP_LLC_T                 55
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_STD_SEGMENT_ID_T           56
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SVTAG_T                    57
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_TCP_FIRST_4BYTES_T         58
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T         59
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UDP_T                      60
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L3_T               61
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L4_T               62
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L5_T               63
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_VLAN_T                     64
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_VXLAN_T                    65
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T                     66
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_T               67
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_FLEXHDR_COUNT    68
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_FLEXHDR_NAME_MAP_INIT \
+    {"arp_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T},\
+    {"authen_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T},\
+    {"bfd_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T},\
+    {"cntag_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CNTAG_T},\
+    {"cpu_composites_0_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T},\
+    {"cpu_composites_1_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T},\
+    {"dest_option_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_DEST_OPTION_T},\
+    {"ep_nih_header_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_EP_NIH_HEADER_T},\
+    {"erspan3_fixed_hdr_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T},\
+    {"erspan3_subhdr_5_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T},\
+    {"esp_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ESP_T},\
+    {"ethertype_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ETHERTYPE_T},\
+    {"frag_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_FRAG_T},\
+    {"gbp_ethernet_shim_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GBP_ETHERNET_SHIM_T},\
+    {"generic_loopback_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T},\
+    {"gpe_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GPE_T},\
+    {"gre_chksum_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_CHKSUM_T},\
+    {"gre_key_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_KEY_T},\
+    {"gre_rout_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_ROUT_T},\
+    {"gre_seq_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_SEQ_T},\
+    {"gre_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_T},\
+    {"hg3_base_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T},\
+    {"hg3_extension_0_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T},\
+    {"hop_by_hop_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HOP_BY_HOP_T},\
+    {"icmp_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ICMP_T},\
+    {"ifa_header_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_HEADER_T},\
+    {"ifa_metadata_a_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_A_T},\
+    {"ifa_metadata_b_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_B_T},\
+    {"ifa_metadata_base_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_BASE_T},\
+    {"igmp_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IGMP_T},\
+    {"ioam_e2e_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IOAM_E2E_T},\
+    {"ipfix_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPFIX_T},\
+    {"ipv4_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T},\
+    {"ipv6_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T},\
+    {"l2_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_L2_T},\
+    {"mirror_erspan_sn_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_ERSPAN_SN_T},\
+    {"mirror_transport_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_TRANSPORT_T},\
+    {"mpls_ach_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_ACH_T},\
+    {"mpls_bv_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_BV_T},\
+    {"mpls_cw_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_CW_T},\
+    {"mpls_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_T},\
+    {"p_1588_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T},\
+    {"prog_ext_hdr_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PROG_EXT_HDR_T},\
+    {"psamp_0_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T},\
+    {"psamp_1_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T},\
+    {"psamp_mirror_on_drop_0_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T},\
+    {"psamp_mirror_on_drop_3_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T},\
+    {"rarp_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T},\
+    {"routing_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ROUTING_T},\
+    {"rspan_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RSPAN_T},\
+    {"segment_routing_srh_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_SRH_T},\
+    {"segment_routing_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_T},\
+    {"sflow_shim_0_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_0_T},\
+    {"sflow_shim_1_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T},\
+    {"sflow_shim_2_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_2_T},\
+    {"snap_llc_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SNAP_LLC_T},\
+    {"std_segment_id_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_STD_SEGMENT_ID_T},\
+    {"svtag_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SVTAG_T},\
+    {"tcp_first_4bytes_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_TCP_FIRST_4BYTES_T},\
+    {"tcp_last_16bytes_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T},\
+    {"udp_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UDP_T},\
+    {"unknown_l3_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L3_T},\
+    {"unknown_l4_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L4_T},\
+    {"unknown_l5_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L5_T},\
+    {"vlan_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_VLAN_T},\
+    {"vxlan_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_VXLAN_T},\
+    {"wesp_t", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T},\
+    {"RXPMD_FLEX_T", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_T},\
+    {"flexhdr count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_FLEXHDR_COUNT}
+
+#endif /* BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_FLEXHDR_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_bcmpkt_flexhdr_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_bcmpkt_flexhdr_data.h
new file mode 100644
index 000000000000..fc6e0c2ef077
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_bcmpkt_flexhdr_data.h
@@ -0,0 +1,1361 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) header.yml.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_FLEXHDR_DATA_H
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_FLEXHDR_DATA_H
+
+/*!
+ * \name ARP_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_HARDWARE_LEN  0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_HARDWARE_TYPE 1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_OPERATION     2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_PROT_ADDR_LEN 3
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_PROTOCOL_TYPE 4
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_SENDER_HA     5
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_SENDER_IP     6
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_TARGET_HA     7
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_TARGET_IP     8
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_FID_COUNT          9
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT \
+    {"HARDWARE_LEN", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_HARDWARE_LEN},\
+    {"HARDWARE_TYPE", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_HARDWARE_TYPE},\
+    {"OPERATION", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_OPERATION},\
+    {"PROT_ADDR_LEN", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_PROT_ADDR_LEN},\
+    {"PROTOCOL_TYPE", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_PROTOCOL_TYPE},\
+    {"SENDER_HA", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_SENDER_HA},\
+    {"SENDER_IP", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_SENDER_IP},\
+    {"TARGET_HA", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_TARGET_HA},\
+    {"TARGET_IP", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_TARGET_IP},\
+    {"arp_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_FID_COUNT}
+
+/*!
+ * \name AUTHEN_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T_DATA        0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T_NEXT_HEADER 1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T_PAYLOAD_LEN 2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T_RESERVED    3
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T_SEQ_NUM     4
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T_SPI         5
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T_FID_COUNT          6
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T_FIELD_NAME_MAP_INIT \
+    {"DATA", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T_DATA},\
+    {"NEXT_HEADER", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T_NEXT_HEADER},\
+    {"PAYLOAD_LEN", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T_PAYLOAD_LEN},\
+    {"RESERVED", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T_RESERVED},\
+    {"SEQ_NUM", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T_SEQ_NUM},\
+    {"SPI", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T_SPI},\
+    {"authen_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T_FID_COUNT}
+
+/*!
+ * \name BFD_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_AP            0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_BFD_LENGTH    1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_CPI           2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_DEM           3
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_DESMINTXINTV  4
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_DETECTMULT    5
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_DIAG          6
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_FIN           7
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_MINECHORXINTV 8
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_MPT           9
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_MYDISCRIM     10
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_POLL          11
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_REQMINRXINTV  12
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_STA           13
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_URDISCRIM     14
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_VERSION       15
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_FID_COUNT          16
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_FIELD_NAME_MAP_INIT \
+    {"AP", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_AP},\
+    {"BFD_LENGTH", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_BFD_LENGTH},\
+    {"CPI", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_CPI},\
+    {"DEM", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_DEM},\
+    {"DESMINTXINTV", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_DESMINTXINTV},\
+    {"DETECTMULT", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_DETECTMULT},\
+    {"DIAG", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_DIAG},\
+    {"FIN", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_FIN},\
+    {"MINECHORXINTV", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_MINECHORXINTV},\
+    {"MPT", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_MPT},\
+    {"MYDISCRIM", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_MYDISCRIM},\
+    {"POLL", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_POLL},\
+    {"REQMINRXINTV", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_REQMINRXINTV},\
+    {"STA", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_STA},\
+    {"URDISCRIM", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_URDISCRIM},\
+    {"VERSION", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_VERSION},\
+    {"bfd_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_FID_COUNT}
+
+/*!
+ * \name CNTAG_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CNTAG_T_RPID 0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CNTAG_T_TPID 1
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CNTAG_T_FID_COUNT          2
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CNTAG_T_FIELD_NAME_MAP_INIT \
+    {"RPID", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CNTAG_T_RPID},\
+    {"TPID", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CNTAG_T_TPID},\
+    {"cntag_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CNTAG_T_FID_COUNT}
+
+/*!
+ * \name CPU_COMPOSITES_0_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0 0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1 1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2 2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3 3
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4 4
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5 5
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6 6
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT          7
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT \
+    {"DMA_CONT0", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0},\
+    {"DMA_CONT1", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1},\
+    {"DMA_CONT2", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2},\
+    {"DMA_CONT3", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3},\
+    {"DMA_CONT4", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4},\
+    {"DMA_CONT5", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5},\
+    {"DMA_CONT6", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6},\
+    {"cpu_composites_0_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT}
+
+/*!
+ * \name CPU_COMPOSITES_1_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10 0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11 1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12 2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13 3
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14 4
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15 5
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16 6
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17 7
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7  8
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8  9
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9  10
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT          11
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT \
+    {"DMA_CONT10", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10},\
+    {"DMA_CONT11", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11},\
+    {"DMA_CONT12", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12},\
+    {"DMA_CONT13", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13},\
+    {"DMA_CONT14", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14},\
+    {"DMA_CONT15", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15},\
+    {"DMA_CONT16", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16},\
+    {"DMA_CONT17", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17},\
+    {"DMA_CONT7", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7},\
+    {"DMA_CONT8", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8},\
+    {"DMA_CONT9", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9},\
+    {"cpu_composites_1_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT}
+
+/*!
+ * \name DEST_OPTION_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_DEST_OPTION_T_HDR_EXT_LEN 0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_DEST_OPTION_T_NEXT_HEADER 1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_DEST_OPTION_T_OPTION      2
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_DEST_OPTION_T_FID_COUNT          3
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_DEST_OPTION_T_FIELD_NAME_MAP_INIT \
+    {"HDR_EXT_LEN", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_DEST_OPTION_T_HDR_EXT_LEN},\
+    {"NEXT_HEADER", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_DEST_OPTION_T_NEXT_HEADER},\
+    {"OPTION", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_DEST_OPTION_T_OPTION},\
+    {"dest_option_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_DEST_OPTION_T_FID_COUNT}
+
+/*!
+ * \name EP_NIH_HEADER_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_EP_NIH_HEADER_T_HEADER_SUBTYPE       0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_EP_NIH_HEADER_T_HEADER_TYPE          1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_A        2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_B        3
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_C        4
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_A      5
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_B      6
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_C      7
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_EP_NIH_HEADER_T_RECIRC_PROFILE_INDEX 8
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_EP_NIH_HEADER_T_RESERVED_0           9
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_EP_NIH_HEADER_T_START                10
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_EP_NIH_HEADER_T_TIMESTAMP            11
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT          12
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_EP_NIH_HEADER_T_FIELD_NAME_MAP_INIT \
+    {"HEADER_SUBTYPE", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_EP_NIH_HEADER_T_HEADER_SUBTYPE},\
+    {"HEADER_TYPE", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_EP_NIH_HEADER_T_HEADER_TYPE},\
+    {"OPAQUE_CTRL_A", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_A},\
+    {"OPAQUE_CTRL_B", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_B},\
+    {"OPAQUE_CTRL_C", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_C},\
+    {"OPAQUE_OBJECT_A", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_A},\
+    {"OPAQUE_OBJECT_B", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_B},\
+    {"OPAQUE_OBJECT_C", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_C},\
+    {"RECIRC_PROFILE_INDEX", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_EP_NIH_HEADER_T_RECIRC_PROFILE_INDEX},\
+    {"RESERVED_0", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_EP_NIH_HEADER_T_RESERVED_0},\
+    {"START", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_EP_NIH_HEADER_T_START},\
+    {"TIMESTAMP", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_EP_NIH_HEADER_T_TIMESTAMP},\
+    {"ep_nih_header_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT}
+
+/*!
+ * \name ERSPAN3_FIXED_HDR_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO               0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_COS               1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID           2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O 3
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID        4
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_T                 5
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP         6
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VER               7
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN              8
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT          9
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT \
+    {"BSO", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO},\
+    {"COS", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_COS},\
+    {"GBP_SID", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID},\
+    {"P_FT_HWID_D_GRA_O", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O},\
+    {"SESSION_ID", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID},\
+    {"T", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_T},\
+    {"TIMESTAMP", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP},\
+    {"VER", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VER},\
+    {"VLAN", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN},\
+    {"erspan3_fixed_hdr_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT}
+
+/*!
+ * \name ERSPAN3_SUBHDR_5_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID 0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID     1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID   2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP   3
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT          4
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT \
+    {"PLATFORM_ID", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID},\
+    {"PORT_ID", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID},\
+    {"SWITCH_ID", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID},\
+    {"TIMESTAMP", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP},\
+    {"erspan3_subhdr_5_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT}
+
+/*!
+ * \name ESP_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ESP_T_NEXT_HEADER 0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ESP_T_PAD         1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ESP_T_PAD_LEN     2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ESP_T_SEQ_NUM     3
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ESP_T_SPI         4
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ESP_T_FID_COUNT          5
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ESP_T_FIELD_NAME_MAP_INIT \
+    {"NEXT_HEADER", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ESP_T_NEXT_HEADER},\
+    {"PAD", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ESP_T_PAD},\
+    {"PAD_LEN", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ESP_T_PAD_LEN},\
+    {"SEQ_NUM", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ESP_T_SEQ_NUM},\
+    {"SPI", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ESP_T_SPI},\
+    {"esp_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ESP_T_FID_COUNT}
+
+/*!
+ * \name ETHERTYPE_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ETHERTYPE_T_TYPE 0
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ETHERTYPE_T_FID_COUNT          1
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT \
+    {"TYPE", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ETHERTYPE_T_TYPE},\
+    {"ethertype_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ETHERTYPE_T_FID_COUNT}
+
+/*!
+ * \name FRAG_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_FRAG_T_FRAG_INFO   0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_FRAG_T_ID          1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_FRAG_T_NEXT_HEADER 2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_FRAG_T_RESERVED    3
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_FRAG_T_FID_COUNT          4
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_FRAG_T_FIELD_NAME_MAP_INIT \
+    {"FRAG_INFO", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_FRAG_T_FRAG_INFO},\
+    {"ID", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_FRAG_T_ID},\
+    {"NEXT_HEADER", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_FRAG_T_NEXT_HEADER},\
+    {"RESERVED", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_FRAG_T_RESERVED},\
+    {"frag_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_FRAG_T_FID_COUNT}
+
+/*!
+ * \name GBP_ETHERNET_SHIM_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GBP_ETHERNET_SHIM_T_ETHERTYPE 0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GBP_ETHERNET_SHIM_T_FLAGS     1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GBP_ETHERNET_SHIM_T_RESERVED  2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GBP_ETHERNET_SHIM_T_SID       3
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GBP_ETHERNET_SHIM_T_SUBTYPE   4
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GBP_ETHERNET_SHIM_T_VER       5
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GBP_ETHERNET_SHIM_T_FID_COUNT          6
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GBP_ETHERNET_SHIM_T_FIELD_NAME_MAP_INIT \
+    {"ETHERTYPE", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GBP_ETHERNET_SHIM_T_ETHERTYPE},\
+    {"FLAGS", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GBP_ETHERNET_SHIM_T_FLAGS},\
+    {"RESERVED", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GBP_ETHERNET_SHIM_T_RESERVED},\
+    {"SID", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GBP_ETHERNET_SHIM_T_SID},\
+    {"SUBTYPE", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GBP_ETHERNET_SHIM_T_SUBTYPE},\
+    {"VER", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GBP_ETHERNET_SHIM_T_VER},\
+    {"gbp_ethernet_shim_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GBP_ETHERNET_SHIM_T_FID_COUNT}
+
+/*!
+ * \name GENERIC_LOOPBACK_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ    0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE   1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ        2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_FLAGS              3
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE        4
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY     5
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL     6
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ      7
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0  8
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1  9
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ            10
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1         11
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT 12
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_SRC_SUBPORT_NUM    13
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE         14
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT          15
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT \
+    {"DESTINATION_OBJ", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ},\
+    {"DESTINATION_TYPE", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE},\
+    {"ENTROPY_OBJ", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ},\
+    {"FLAGS", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_FLAGS},\
+    {"HEADER_TYPE", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE},\
+    {"INPUT_PRIORITY", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY},\
+    {"INTERFACE_CTRL", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL},\
+    {"INTERFACE_OBJ", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ},\
+    {"PROCESSING_CTRL_0", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0},\
+    {"PROCESSING_CTRL_1", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1},\
+    {"QOS_OBJ", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ},\
+    {"RESERVED_1", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1},\
+    {"SOURCE_SYSTEM_PORT", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT},\
+    {"SRC_SUBPORT_NUM", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_SRC_SUBPORT_NUM},\
+    {"START_BYTE", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE},\
+    {"generic_loopback_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT}
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NO_OP         0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2_OIF        1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED      2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__VP            3
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP          4
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NHOP          5
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2MC_GROUP    6
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L3MC_GROUP    7
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED_1    8
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP_MEMBER   9
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__DEVICE_PORT   10
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__UNDERLAY_ECMP 11
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_TYPE__TUNNEL  0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_TYPE__GENERIC 1
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__NOOP   0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__VFI    1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__L3_IIF 2
+
+/*!
+ * \name GPE_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GPE_T_FLAGS         0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GPE_T_NEXT_PROTOCOL 1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GPE_T_RESERVED0     2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GPE_T_RESERVED1     3
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GPE_T_VNI           4
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GPE_T_FID_COUNT          5
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GPE_T_FIELD_NAME_MAP_INIT \
+    {"FLAGS", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GPE_T_FLAGS},\
+    {"NEXT_PROTOCOL", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GPE_T_NEXT_PROTOCOL},\
+    {"RESERVED0", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GPE_T_RESERVED0},\
+    {"RESERVED1", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GPE_T_RESERVED1},\
+    {"VNI", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GPE_T_VNI},\
+    {"gpe_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GPE_T_FID_COUNT}
+
+/*!
+ * \name GRE_CHKSUM_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_CHKSUM_T_CHECKSUM 0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_CHKSUM_T_OFFSET   1
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT          2
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_CHKSUM_T_FIELD_NAME_MAP_INIT \
+    {"CHECKSUM", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_CHKSUM_T_CHECKSUM},\
+    {"OFFSET", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_CHKSUM_T_OFFSET},\
+    {"gre_chksum_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT}
+
+/*!
+ * \name GRE_KEY_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_KEY_T_KEY 0
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_KEY_T_FID_COUNT          1
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_KEY_T_FIELD_NAME_MAP_INIT \
+    {"KEY", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_KEY_T_KEY},\
+    {"gre_key_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_KEY_T_FID_COUNT}
+
+/*!
+ * \name GRE_ROUT_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_ROUT_T_ROUTING 0
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_ROUT_T_FID_COUNT          1
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_ROUT_T_FIELD_NAME_MAP_INIT \
+    {"ROUTING", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_ROUT_T_ROUTING},\
+    {"gre_rout_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_ROUT_T_FID_COUNT}
+
+/*!
+ * \name GRE_SEQ_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_SEQ_T_SEQUENCE 0
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_SEQ_T_FID_COUNT          1
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_SEQ_T_FIELD_NAME_MAP_INIT \
+    {"SEQUENCE", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_SEQ_T_SEQUENCE},\
+    {"gre_seq_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_SEQ_T_FID_COUNT}
+
+/*!
+ * \name GRE_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_T_C_R_K_S  0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_T_PROTOCOL 1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_T_RESERVED 2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_T_VERSION  3
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_T_FID_COUNT          4
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_T_FIELD_NAME_MAP_INIT \
+    {"C_R_K_S", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_T_C_R_K_S},\
+    {"PROTOCOL", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_T_PROTOCOL},\
+    {"RESERVED", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_T_RESERVED},\
+    {"VERSION", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_T_VERSION},\
+    {"gre_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_T_FID_COUNT}
+
+/*!
+ * \name HG3_BASE_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_CN                      0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_CNG                     1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_ENTROPY                 2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_EXT_HDR_PRESENT         3
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_HG3_RESERVED            4
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_L3_ROUTED               5
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_MIRROR_COPY             6
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_RESERVED_ETYPE          7
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION      8
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION_TYPE 9
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_SYSTEM_SOURCE           10
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_TC                      11
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_VERSION                 12
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_FID_COUNT          13
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_FIELD_NAME_MAP_INIT \
+    {"CN", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_CN},\
+    {"CNG", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_CNG},\
+    {"ENTROPY", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_ENTROPY},\
+    {"EXT_HDR_PRESENT", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_EXT_HDR_PRESENT},\
+    {"HG3_RESERVED", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_HG3_RESERVED},\
+    {"L3_ROUTED", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_L3_ROUTED},\
+    {"MIRROR_COPY", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_MIRROR_COPY},\
+    {"RESERVED_ETYPE", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_RESERVED_ETYPE},\
+    {"SYSTEM_DESTINATION", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION},\
+    {"SYSTEM_DESTINATION_TYPE", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION_TYPE},\
+    {"SYSTEM_SOURCE", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_SYSTEM_SOURCE},\
+    {"TC", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_TC},\
+    {"VERSION", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_VERSION},\
+    {"hg3_base_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_FID_COUNT}
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__NO_OP         0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__L2_OIF        1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__RESERVED      2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__VP            3
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__ECMP          4
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__NHOP          5
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__L2MC_GROUP    6
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__L3MC_GROUP    7
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__RESERVED_1    8
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__ECMP_MEMBER   9
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__DEVICE_PORT   10
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__UNDERLAY_ECMP 11
+
+/*!
+ * \name HG3_EXTENSION_0_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_LSB      0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_MSB      1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T_DVP_OR_L3_IIF     2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T_FLAGS             3
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T_FORWARDING_DOMAIN 4
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T_SVP               5
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT          6
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T_FIELD_NAME_MAP_INIT \
+    {"CLASS_ID_LSB", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_LSB},\
+    {"CLASS_ID_MSB", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_MSB},\
+    {"DVP_OR_L3_IIF", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T_DVP_OR_L3_IIF},\
+    {"FLAGS", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T_FLAGS},\
+    {"FORWARDING_DOMAIN", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T_FORWARDING_DOMAIN},\
+    {"SVP", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T_SVP},\
+    {"hg3_extension_0_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT}
+
+/*!
+ * \name HOP_BY_HOP_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HOP_BY_HOP_T_HDR_EXT_LEN 0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HOP_BY_HOP_T_NEXT_HEADER 1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HOP_BY_HOP_T_OPTION      2
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT          3
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HOP_BY_HOP_T_FIELD_NAME_MAP_INIT \
+    {"HDR_EXT_LEN", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HOP_BY_HOP_T_HDR_EXT_LEN},\
+    {"NEXT_HEADER", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HOP_BY_HOP_T_NEXT_HEADER},\
+    {"OPTION", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HOP_BY_HOP_T_OPTION},\
+    {"hop_by_hop_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT}
+
+/*!
+ * \name ICMP_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ICMP_T_CHECKSUM  0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ICMP_T_CODE      1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ICMP_T_ICMP_TYPE 2
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ICMP_T_FID_COUNT          3
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT \
+    {"CHECKSUM", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ICMP_T_CHECKSUM},\
+    {"CODE", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ICMP_T_CODE},\
+    {"ICMP_TYPE", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ICMP_T_ICMP_TYPE},\
+    {"icmp_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ICMP_T_FID_COUNT}
+
+/*!
+ * \name IFA_HEADER_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_HEADER_T_FLAGS      0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_HEADER_T_GNS        1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_HEADER_T_MAX_LENGTH 2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_HEADER_T_NEXT_HDR   3
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_HEADER_T_VER        4
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_HEADER_T_FID_COUNT          5
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_HEADER_T_FIELD_NAME_MAP_INIT \
+    {"FLAGS", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_HEADER_T_FLAGS},\
+    {"GNS", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_HEADER_T_GNS},\
+    {"MAX_LENGTH", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_HEADER_T_MAX_LENGTH},\
+    {"NEXT_HDR", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_HEADER_T_NEXT_HDR},\
+    {"VER", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_HEADER_T_VER},\
+    {"ifa_header_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_HEADER_T_FID_COUNT}
+
+/*!
+ * \name IFA_METADATA_A_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_A_T_CN               0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_A_T_FWD_HDR_TTL      1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_A_T_LNS_DEVICE_ID    2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_A_T_PORT_SPEED       3
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_A_T_QUEUE_ID         4
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_A_T_RX_TIMESTAMP_SEC 5
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_A_T_FID_COUNT          6
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_A_T_FIELD_NAME_MAP_INIT \
+    {"CN", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_A_T_CN},\
+    {"FWD_HDR_TTL", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_A_T_FWD_HDR_TTL},\
+    {"LNS_DEVICE_ID", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_A_T_LNS_DEVICE_ID},\
+    {"PORT_SPEED", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_A_T_PORT_SPEED},\
+    {"QUEUE_ID", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_A_T_QUEUE_ID},\
+    {"RX_TIMESTAMP_SEC", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_A_T_RX_TIMESTAMP_SEC},\
+    {"ifa_metadata_a_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_A_T_FID_COUNT}
+
+/*!
+ * \name IFA_METADATA_B_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_B_T_EGRESS_PORT_ID         0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_B_T_INGRESS_PORT_ID        1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_B_T_MMU_STAT_0             2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_B_T_MMU_STAT_1             3
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_B_T_RESIDENCE_TIME_NANOSEC 4
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_B_T_RX_TIMESTAMP_NANOSEC   5
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_B_T_TX_QUEUE_BYTE_COUNT    6
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_B_T_FID_COUNT          7
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_B_T_FIELD_NAME_MAP_INIT \
+    {"EGRESS_PORT_ID", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_B_T_EGRESS_PORT_ID},\
+    {"INGRESS_PORT_ID", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_B_T_INGRESS_PORT_ID},\
+    {"MMU_STAT_0", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_B_T_MMU_STAT_0},\
+    {"MMU_STAT_1", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_B_T_MMU_STAT_1},\
+    {"RESIDENCE_TIME_NANOSEC", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_B_T_RESIDENCE_TIME_NANOSEC},\
+    {"RX_TIMESTAMP_NANOSEC", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_B_T_RX_TIMESTAMP_NANOSEC},\
+    {"TX_QUEUE_BYTE_COUNT", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_B_T_TX_QUEUE_BYTE_COUNT},\
+    {"ifa_metadata_b_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_B_T_FID_COUNT}
+
+/*!
+ * \name IFA_METADATA_BASE_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_BASE_T_ACTION_VECTOR            0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_BASE_T_HOP_LIMIT_CURRENT_LENGTH 1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_BASE_T_REQUEST_VECTOR           2
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_BASE_T_FID_COUNT          3
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_BASE_T_FIELD_NAME_MAP_INIT \
+    {"ACTION_VECTOR", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_BASE_T_ACTION_VECTOR},\
+    {"HOP_LIMIT_CURRENT_LENGTH", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_BASE_T_HOP_LIMIT_CURRENT_LENGTH},\
+    {"REQUEST_VECTOR", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_BASE_T_REQUEST_VECTOR},\
+    {"ifa_metadata_base_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_BASE_T_FID_COUNT}
+
+/*!
+ * \name IGMP_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IGMP_T_CHECKSUM      0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IGMP_T_GROUP_ADDRESS 1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IGMP_T_IGMP_TYPE     2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IGMP_T_MAX_RESP_TIME 3
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IGMP_T_FID_COUNT          4
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IGMP_T_FIELD_NAME_MAP_INIT \
+    {"CHECKSUM", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IGMP_T_CHECKSUM},\
+    {"GROUP_ADDRESS", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IGMP_T_GROUP_ADDRESS},\
+    {"IGMP_TYPE", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IGMP_T_IGMP_TYPE},\
+    {"MAX_RESP_TIME", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IGMP_T_MAX_RESP_TIME},\
+    {"igmp_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IGMP_T_FID_COUNT}
+
+/*!
+ * \name IOAM_E2E_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IOAM_E2E_T_IOAM_E2E_DATA 0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IOAM_E2E_T_IOAM_E2E_TYPE 1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IOAM_E2E_T_IOAM_HDR_LEN  2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IOAM_E2E_T_NAMESPACE_ID  3
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IOAM_E2E_T_NEXT_PROTOCOL 4
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IOAM_E2E_T_RESERVED      5
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IOAM_E2E_T_TYPE          6
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IOAM_E2E_T_FID_COUNT          7
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IOAM_E2E_T_FIELD_NAME_MAP_INIT \
+    {"IOAM_E2E_DATA", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IOAM_E2E_T_IOAM_E2E_DATA},\
+    {"IOAM_E2E_TYPE", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IOAM_E2E_T_IOAM_E2E_TYPE},\
+    {"IOAM_HDR_LEN", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IOAM_E2E_T_IOAM_HDR_LEN},\
+    {"NAMESPACE_ID", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IOAM_E2E_T_NAMESPACE_ID},\
+    {"NEXT_PROTOCOL", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IOAM_E2E_T_NEXT_PROTOCOL},\
+    {"RESERVED", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IOAM_E2E_T_RESERVED},\
+    {"TYPE", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IOAM_E2E_T_TYPE},\
+    {"ioam_e2e_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IOAM_E2E_T_FID_COUNT}
+
+/*!
+ * \name IPFIX_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPFIX_T_EXPORT_TIME   0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPFIX_T_LENGTH        1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPFIX_T_OBS_DOMAIN_ID 2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPFIX_T_SEQUENCE_NUM  3
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPFIX_T_VERSION       4
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPFIX_T_FID_COUNT          5
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT \
+    {"EXPORT_TIME", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPFIX_T_EXPORT_TIME},\
+    {"LENGTH", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPFIX_T_LENGTH},\
+    {"OBS_DOMAIN_ID", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPFIX_T_OBS_DOMAIN_ID},\
+    {"SEQUENCE_NUM", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPFIX_T_SEQUENCE_NUM},\
+    {"VERSION", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPFIX_T_VERSION},\
+    {"ipfix_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPFIX_T_FID_COUNT}
+
+/*!
+ * \name IPV4_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_DA                0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET 1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_HDR_CHECKSUM      2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_ID                3
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_OPTION            4
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_PROTOCOL          5
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_SA                6
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_TOS               7
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_TOTAL_LENGTH      8
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_TTL               9
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_VERSION_HDR_LEN   10
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_FID_COUNT          11
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT \
+    {"DA", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_DA},\
+    {"FLAGS_FRAG_OFFSET", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET},\
+    {"HDR_CHECKSUM", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_HDR_CHECKSUM},\
+    {"ID", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_ID},\
+    {"OPTION", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_OPTION},\
+    {"PROTOCOL", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_PROTOCOL},\
+    {"SA", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_SA},\
+    {"TOS", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_TOS},\
+    {"TOTAL_LENGTH", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_TOTAL_LENGTH},\
+    {"TTL", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_TTL},\
+    {"VERSION_HDR_LEN", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_VERSION_HDR_LEN},\
+    {"ipv4_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_FID_COUNT}
+
+/*!
+ * \name IPV6_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_DA             0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_FLOW_LABEL     1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_HOP_LIMIT      2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_NEXT_HEADER    3
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_PAYLOAD_LENGTH 4
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_SA             5
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_TRAFFIC_CLASS  6
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_VERSION        7
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_FID_COUNT          8
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT \
+    {"DA", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_DA},\
+    {"FLOW_LABEL", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_FLOW_LABEL},\
+    {"HOP_LIMIT", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_HOP_LIMIT},\
+    {"NEXT_HEADER", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_NEXT_HEADER},\
+    {"PAYLOAD_LENGTH", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_PAYLOAD_LENGTH},\
+    {"SA", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_SA},\
+    {"TRAFFIC_CLASS", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_TRAFFIC_CLASS},\
+    {"VERSION", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_VERSION},\
+    {"ipv6_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_FID_COUNT}
+
+/*!
+ * \name L2_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_L2_T_MACDA 0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_L2_T_MACSA 1
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_L2_T_FID_COUNT          2
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_L2_T_FIELD_NAME_MAP_INIT \
+    {"MACDA", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_L2_T_MACDA},\
+    {"MACSA", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_L2_T_MACSA},\
+    {"l2_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_L2_T_FID_COUNT}
+
+/*!
+ * \name MIRROR_ERSPAN_SN_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM 0
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT          1
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT \
+    {"SEQ_NUM", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM},\
+    {"mirror_erspan_sn_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT}
+
+/*!
+ * \name MIRROR_TRANSPORT_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_TRANSPORT_T_DATA 0
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT          1
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT \
+    {"DATA", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_TRANSPORT_T_DATA},\
+    {"mirror_transport_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT}
+
+/*!
+ * \name MPLS_ACH_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_ACH_T_CHANNEL_TYPE 0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_ACH_T_CW_TYPE      1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_ACH_T_RESERVED     2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_ACH_T_VERSION      3
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_ACH_T_FID_COUNT          4
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_ACH_T_FIELD_NAME_MAP_INIT \
+    {"CHANNEL_TYPE", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_ACH_T_CHANNEL_TYPE},\
+    {"CW_TYPE", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_ACH_T_CW_TYPE},\
+    {"RESERVED", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_ACH_T_RESERVED},\
+    {"VERSION", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_ACH_T_VERSION},\
+    {"mpls_ach_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_ACH_T_FID_COUNT}
+
+/*!
+ * \name MPLS_BV_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_BV_T_VALUE 0
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_BV_T_FID_COUNT          1
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_BV_T_FIELD_NAME_MAP_INIT \
+    {"VALUE", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_BV_T_VALUE},\
+    {"mpls_bv_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_BV_T_FID_COUNT}
+
+/*!
+ * \name MPLS_CW_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_CW_T_CW_TYPE    0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_CW_T_RESERVED   1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_CW_T_SEQ_NUMBER 2
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_CW_T_FID_COUNT          3
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_CW_T_FIELD_NAME_MAP_INIT \
+    {"CW_TYPE", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_CW_T_CW_TYPE},\
+    {"RESERVED", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_CW_T_RESERVED},\
+    {"SEQ_NUMBER", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_CW_T_SEQ_NUMBER},\
+    {"mpls_cw_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_CW_T_FID_COUNT}
+
+/*!
+ * \name MPLS_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_T_BOS   0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_T_EXP   1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_T_LABEL 2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_T_TTL   3
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_T_FID_COUNT          4
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_T_FIELD_NAME_MAP_INIT \
+    {"BOS", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_T_BOS},\
+    {"EXP", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_T_EXP},\
+    {"LABEL", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_T_LABEL},\
+    {"TTL", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_T_TTL},\
+    {"mpls_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_T_FID_COUNT}
+
+/*!
+ * \name P_1588_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_CNTRL          0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_CORRECTION     1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_DOMAIN_NB      2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_FLAGS          3
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_LOGMSGINTERVAL 4
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_MSG_LENGTH     5
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_MSG_TYPE       6
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_RESERVED1      7
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_RESERVED2      8
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_RESERVED3      9
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_SEQ_ID         10
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_SRCPORTID      11
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_TRANSPORTSPEC  12
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_VERSION        13
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_FID_COUNT          14
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_FIELD_NAME_MAP_INIT \
+    {"CNTRL", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_CNTRL},\
+    {"CORRECTION", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_CORRECTION},\
+    {"DOMAIN_NB", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_DOMAIN_NB},\
+    {"FLAGS", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_FLAGS},\
+    {"LOGMSGINTERVAL", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_LOGMSGINTERVAL},\
+    {"MSG_LENGTH", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_MSG_LENGTH},\
+    {"MSG_TYPE", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_MSG_TYPE},\
+    {"RESERVED1", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_RESERVED1},\
+    {"RESERVED2", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_RESERVED2},\
+    {"RESERVED3", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_RESERVED3},\
+    {"SEQ_ID", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_SEQ_ID},\
+    {"SRCPORTID", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_SRCPORTID},\
+    {"TRANSPORTSPEC", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_TRANSPORTSPEC},\
+    {"VERSION", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_VERSION},\
+    {"p_1588_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_FID_COUNT}
+
+/*!
+ * \name PROG_EXT_HDR_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PROG_EXT_HDR_T_HDR_EXT_LEN 0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PROG_EXT_HDR_T_NEXT_HEADER 1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PROG_EXT_HDR_T_OPTION      2
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT          3
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PROG_EXT_HDR_T_FIELD_NAME_MAP_INIT \
+    {"HDR_EXT_LEN", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PROG_EXT_HDR_T_HDR_EXT_LEN},\
+    {"NEXT_HEADER", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PROG_EXT_HDR_T_NEXT_HEADER},\
+    {"OPTION", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PROG_EXT_HDR_T_OPTION},\
+    {"prog_ext_hdr_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_0_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T_FLOWSET        0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T_LENGTH         1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T_NEXT_HOP_INDEX 2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T_OBS_TIME_NS    3
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T_OBS_TIME_S     4
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T_TEMPLATE_ID    5
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T_FID_COUNT          6
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T_FIELD_NAME_MAP_INIT \
+    {"FLOWSET", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T_FLOWSET},\
+    {"LENGTH", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T_LENGTH},\
+    {"NEXT_HOP_INDEX", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T_NEXT_HOP_INDEX},\
+    {"OBS_TIME_NS", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T_OBS_TIME_NS},\
+    {"OBS_TIME_S", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T_OBS_TIME_S},\
+    {"TEMPLATE_ID", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T_TEMPLATE_ID},\
+    {"psamp_0_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_1_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_DLB_ID         0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_EGRESS_PORT    1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_EPOCH          2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_INGRESS_PORT   3
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_SAMPLED_LENGTH 4
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_USER_META_DATA 5
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_VARIABLE_FLAG  6
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_FID_COUNT          7
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_FIELD_NAME_MAP_INIT \
+    {"DLB_ID", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_DLB_ID},\
+    {"EGRESS_PORT", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_EGRESS_PORT},\
+    {"EPOCH", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_EPOCH},\
+    {"INGRESS_PORT", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_INGRESS_PORT},\
+    {"SAMPLED_LENGTH", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_SAMPLED_LENGTH},\
+    {"USER_META_DATA", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_USER_META_DATA},\
+    {"VARIABLE_FLAG", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_VARIABLE_FLAG},\
+    {"psamp_1_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_MIRROR_ON_DROP_0_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT 0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT    1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH          2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS     3
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S      4
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID       5
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID     6
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT          7
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT \
+    {"EGRESS_MOD_PORT", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT},\
+    {"INGRESS_PORT", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT},\
+    {"LENGTH", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH},\
+    {"OBS_TIME_NS", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS},\
+    {"OBS_TIME_S", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S},\
+    {"SWITCH_ID", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID},\
+    {"TEMPLATE_ID", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID},\
+    {"psamp_mirror_on_drop_0_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_MIRROR_ON_DROP_3_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_DROP_REASON             0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_RESERVED_0              1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SAMPLED_LENGTH          2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SMOD_STATE              3
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_UC_COS__COLOR__PROB_IDX 4
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_USER_META_DATA          5
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_VAR_LEN_INDICATOR       6
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT          7
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FIELD_NAME_MAP_INIT \
+    {"DROP_REASON", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_DROP_REASON},\
+    {"RESERVED_0", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_RESERVED_0},\
+    {"SAMPLED_LENGTH", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SAMPLED_LENGTH},\
+    {"SMOD_STATE", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SMOD_STATE},\
+    {"UC_COS__COLOR__PROB_IDX", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_UC_COS__COLOR__PROB_IDX},\
+    {"USER_META_DATA", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_USER_META_DATA},\
+    {"VAR_LEN_INDICATOR", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_VAR_LEN_INDICATOR},\
+    {"psamp_mirror_on_drop_3_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT}
+
+/*!
+ * \name RARP_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_HARDWARE_LEN  0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_HARDWARE_TYPE 1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_OPERATION     2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_PROT_ADDR_LEN 3
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_PROTOCOL_TYPE 4
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_SENDER_HA     5
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_SENDER_IP     6
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_TARGET_HA     7
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_TARGET_IP     8
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_FID_COUNT          9
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT \
+    {"HARDWARE_LEN", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_HARDWARE_LEN},\
+    {"HARDWARE_TYPE", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_HARDWARE_TYPE},\
+    {"OPERATION", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_OPERATION},\
+    {"PROT_ADDR_LEN", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_PROT_ADDR_LEN},\
+    {"PROTOCOL_TYPE", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_PROTOCOL_TYPE},\
+    {"SENDER_HA", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_SENDER_HA},\
+    {"SENDER_IP", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_SENDER_IP},\
+    {"TARGET_HA", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_TARGET_HA},\
+    {"TARGET_IP", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_TARGET_IP},\
+    {"rarp_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_FID_COUNT}
+
+/*!
+ * \name ROUTING_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ROUTING_T_DATA          0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ROUTING_T_HDR_EXT_LEN   1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ROUTING_T_NEXT_HEADER   2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ROUTING_T_ROUTING_TYPE  3
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ROUTING_T_SEGMENTS_LEFT 4
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ROUTING_T_FID_COUNT          5
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ROUTING_T_FIELD_NAME_MAP_INIT \
+    {"DATA", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ROUTING_T_DATA},\
+    {"HDR_EXT_LEN", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ROUTING_T_HDR_EXT_LEN},\
+    {"NEXT_HEADER", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ROUTING_T_NEXT_HEADER},\
+    {"ROUTING_TYPE", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ROUTING_T_ROUTING_TYPE},\
+    {"SEGMENTS_LEFT", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ROUTING_T_SEGMENTS_LEFT},\
+    {"routing_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ROUTING_T_FID_COUNT}
+
+/*!
+ * \name RSPAN_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RSPAN_T_TAG  0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RSPAN_T_TPID 1
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RSPAN_T_FID_COUNT          2
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RSPAN_T_FIELD_NAME_MAP_INIT \
+    {"TAG", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RSPAN_T_TAG},\
+    {"TPID", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RSPAN_T_TPID},\
+    {"rspan_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RSPAN_T_FID_COUNT}
+
+/*!
+ * \name SEGMENT_ROUTING_SRH_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_SRH_T_FLAGS         0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_SRH_T_HDR_EXT_LEN   1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_SRH_T_LAST_ENTRY    2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_SRH_T_NEXT_HEADER   3
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_SRH_T_ROUTING_TYPE  4
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_SRH_T_SEGMENTS_LEFT 5
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_SRH_T_TAG           6
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_SRH_T_FID_COUNT          7
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_SRH_T_FIELD_NAME_MAP_INIT \
+    {"FLAGS", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_SRH_T_FLAGS},\
+    {"HDR_EXT_LEN", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_SRH_T_HDR_EXT_LEN},\
+    {"LAST_ENTRY", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_SRH_T_LAST_ENTRY},\
+    {"NEXT_HEADER", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_SRH_T_NEXT_HEADER},\
+    {"ROUTING_TYPE", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_SRH_T_ROUTING_TYPE},\
+    {"SEGMENTS_LEFT", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_SRH_T_SEGMENTS_LEFT},\
+    {"TAG", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_SRH_T_TAG},\
+    {"segment_routing_srh_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_SRH_T_FID_COUNT}
+
+/*!
+ * \name SEGMENT_ROUTING_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_T_HDR_EXT_LEN      0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_T_LAST_ENTRY_FLAGS 1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_T_NEXT_HEADER      2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_T_ROUTING_TYPE     3
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_T_SEG_LIST         4
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_T_SEGMENTS_LEFT    5
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_T_TAG              6
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_T_FID_COUNT          7
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_T_FIELD_NAME_MAP_INIT \
+    {"HDR_EXT_LEN", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_T_HDR_EXT_LEN},\
+    {"LAST_ENTRY_FLAGS", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_T_LAST_ENTRY_FLAGS},\
+    {"NEXT_HEADER", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_T_NEXT_HEADER},\
+    {"ROUTING_TYPE", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_T_ROUTING_TYPE},\
+    {"SEG_LIST", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_T_SEG_LIST},\
+    {"SEGMENTS_LEFT", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_T_SEGMENTS_LEFT},\
+    {"TAG", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_T_TAG},\
+    {"segment_routing_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_T_FID_COUNT}
+
+/*!
+ * \name SFLOW_SHIM_0_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_0_T_SYS_DESTINATION 0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_0_T_SYS_SOURCE      1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_0_T_VERSION         2
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT          3
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_0_T_FIELD_NAME_MAP_INIT \
+    {"SYS_DESTINATION", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_0_T_SYS_DESTINATION},\
+    {"SYS_SOURCE", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_0_T_SYS_SOURCE},\
+    {"VERSION", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_0_T_VERSION},\
+    {"sflow_shim_0_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT}
+
+/*!
+ * \name SFLOW_SHIM_1_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DEST_SAMPLE 0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DISCARDED   1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_FLEX_SAMPLE 2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_MCAST       3
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_SRC_SAMPLE  4
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_TRUNCATED   5
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_RESERVED         6
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_SYS_OPCODE       7
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT          8
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_FIELD_NAME_MAP_INIT \
+    {"FLAG_DEST_SAMPLE", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DEST_SAMPLE},\
+    {"FLAG_DISCARDED", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DISCARDED},\
+    {"FLAG_FLEX_SAMPLE", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_FLEX_SAMPLE},\
+    {"FLAG_MCAST", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_MCAST},\
+    {"FLAG_SRC_SAMPLE", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_SRC_SAMPLE},\
+    {"FLAG_TRUNCATED", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_TRUNCATED},\
+    {"RESERVED", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_RESERVED},\
+    {"SYS_OPCODE", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_SYS_OPCODE},\
+    {"sflow_shim_1_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT}
+
+/*!
+ * \name SFLOW_SHIM_2_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_2_T_SEQUENCE_NUM   0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_2_T_USER_META_DATA 1
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT          2
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_2_T_FIELD_NAME_MAP_INIT \
+    {"SEQUENCE_NUM", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_2_T_SEQUENCE_NUM},\
+    {"USER_META_DATA", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_2_T_USER_META_DATA},\
+    {"sflow_shim_2_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT}
+
+/*!
+ * \name SNAP_LLC_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SNAP_LLC_T_LENGTH   0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SNAP_LLC_T_SNAP_LLC 1
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SNAP_LLC_T_FID_COUNT          2
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SNAP_LLC_T_FIELD_NAME_MAP_INIT \
+    {"LENGTH", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SNAP_LLC_T_LENGTH},\
+    {"SNAP_LLC", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SNAP_LLC_T_SNAP_LLC},\
+    {"snap_llc_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SNAP_LLC_T_FID_COUNT}
+
+/*!
+ * \name STD_SEGMENT_ID_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_STD_SEGMENT_ID_T_DATA 0
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_STD_SEGMENT_ID_T_FID_COUNT          1
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_STD_SEGMENT_ID_T_FIELD_NAME_MAP_INIT \
+    {"DATA", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_STD_SEGMENT_ID_T_DATA},\
+    {"std_segment_id_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_STD_SEGMENT_ID_T_FID_COUNT}
+
+/*!
+ * \name SVTAG_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SVTAG_T_DATA_LWR 0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SVTAG_T_DATA_UPR 1
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SVTAG_T_FID_COUNT          2
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SVTAG_T_FIELD_NAME_MAP_INIT \
+    {"DATA_LWR", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SVTAG_T_DATA_LWR},\
+    {"DATA_UPR", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SVTAG_T_DATA_UPR},\
+    {"svtag_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SVTAG_T_FID_COUNT}
+
+/*!
+ * \name TCP_FIRST_4BYTES_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT 0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT 1
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT          2
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT \
+    {"DST_PORT", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT},\
+    {"SRC_PORT", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT},\
+    {"tcp_first_4bytes_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT}
+
+/*!
+ * \name TCP_LAST_16BYTES_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM           0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM          1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS 2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM           3
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR        4
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE          5
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT          6
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT \
+    {"ACK_NUM", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM},\
+    {"CHECKSUM", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM},\
+    {"HDR_LEN_AND_FLAGS", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS},\
+    {"SEQ_NUM", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM},\
+    {"URGENT_PTR", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR},\
+    {"WIN_SIZE", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE},\
+    {"tcp_last_16bytes_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT}
+
+/*!
+ * \name UDP_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UDP_T_CHECKSUM   0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UDP_T_DST_PORT   1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UDP_T_SRC_PORT   2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UDP_T_UDP_LENGTH 3
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UDP_T_FID_COUNT          4
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT \
+    {"CHECKSUM", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UDP_T_CHECKSUM},\
+    {"DST_PORT", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UDP_T_DST_PORT},\
+    {"SRC_PORT", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UDP_T_SRC_PORT},\
+    {"UDP_LENGTH", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UDP_T_UDP_LENGTH},\
+    {"udp_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UDP_T_FID_COUNT}
+
+/*!
+ * \name UNKNOWN_L3_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD 0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD  1
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT          2
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT \
+    {"FIRST_16BYTES_OF_L3_PAYLOAD", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD},\
+    {"NEXT_16BYTES_OF_L3_PAYLOAD", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD},\
+    {"unknown_l3_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT}
+
+/*!
+ * \name UNKNOWN_L4_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD 0
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT          1
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT \
+    {"FIRST_4BYTES_OF_L4_PAYLOAD", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD},\
+    {"unknown_l4_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT}
+
+/*!
+ * \name UNKNOWN_L5_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1 0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3 1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7 2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_8_9 3
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT          4
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT \
+    {"L5_BYTES_0_1", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1},\
+    {"L5_BYTES_2_3", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3},\
+    {"L5_BYTES_4_7", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7},\
+    {"L5_BYTES_8_9", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_8_9},\
+    {"unknown_l5_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT}
+
+/*!
+ * \name VLAN_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_VLAN_T_CFI  0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_VLAN_T_PCP  1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_VLAN_T_TPID 2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_VLAN_T_VID  3
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_VLAN_T_FID_COUNT          4
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT \
+    {"CFI", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_VLAN_T_CFI},\
+    {"PCP", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_VLAN_T_PCP},\
+    {"TPID", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_VLAN_T_TPID},\
+    {"VID", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_VLAN_T_VID},\
+    {"vlan_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_VLAN_T_FID_COUNT}
+
+/*!
+ * \name VXLAN_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_VXLAN_T_FLAGS_RESERVED_1 0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_VXLAN_T_RESERVED2        1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_VXLAN_T_VN_ID            2
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_VXLAN_T_FID_COUNT          3
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT \
+    {"FLAGS_RESERVED_1", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_VXLAN_T_FLAGS_RESERVED_1},\
+    {"RESERVED2", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_VXLAN_T_RESERVED2},\
+    {"VN_ID", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_VXLAN_T_VN_ID},\
+    {"vxlan_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_VXLAN_T_FID_COUNT}
+
+/*!
+ * \name WESP_T field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_FLAGS       0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_HEADER_LEN  1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_NEXT_HEADER 2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_SEQ_NUM     3
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_SPI         4
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_TRAILER_LEN 5
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_WESP_IV     6
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_FID_COUNT          7
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_FIELD_NAME_MAP_INIT \
+    {"FLAGS", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_FLAGS},\
+    {"HEADER_LEN", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_HEADER_LEN},\
+    {"NEXT_HEADER", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_NEXT_HEADER},\
+    {"SEQ_NUM", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_SEQ_NUM},\
+    {"SPI", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_SPI},\
+    {"TRAILER_LEN", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_TRAILER_LEN},\
+    {"WESP_IV", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_WESP_IV},\
+    {"wesp_t fid count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_FID_COUNT}
+
+
+#endif /* BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_FLEXHDR_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_bcmpkt_rxpmd_flex_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_bcmpkt_rxpmd_flex_data.h
new file mode 100644
index 000000000000..c65223045a88
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_bcmpkt_rxpmd_flex_data.h
@@ -0,0 +1,198 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) map.yml.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_DATA_H
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_DATA_H
+
+/*!
+ * \name RX flex metadata field IDs.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_BSCAN_CONTROL_DATA_15_0                        0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_BSCAN_CONTROL_FLAGS_3_0                        1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_DLB_ECMP_DESTINATION_15_0                      2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_DNAT_CTRL_3_0                                  3
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0                                 4
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_DVP_15_0                                       5
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_AND_SNAT_CTRL_15_0               6
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_EM_FT_OPAQUE_OBJ_OR_IFP_OPAQUE_OBJ_15_0        7
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_HIGH_3_0                         8
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0                         9
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_EP_NIH_DROP_CODE_OR_IFP_OPAQUE_OBJ_15_0        10
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_RECIRC_CODE_3_0                     11
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_15_0                      12
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_31_16                     13
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_15_0                        14
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_16                       15
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32                       16
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_FLOW_ID_LSB_15_0                               17
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_FLOW_ID_MSB_3_0                                18
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0                              19
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_IFP_IOAM_GBP_ACTION_3_0                        20
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_IFP_TS_CONTROL_ACTION_3_0                      21
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_15_0                             22
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_16                            23
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_INGRESS_DEVICE_PORT_8_0                        24
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0 25
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0                    26
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_INT_PRI_3_0                                    27
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_L2_IIF_12_0                                    28
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_L2_OIF_12_0                                    29
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_L3_DNAT_INDEX_15_0                             30
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_L3_IIF_13_0                                    31
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0                                  32
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_L3_SNAT_INDEX_15_0                             33
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_MAC_DA_23_20_3_0                               34
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_MPLS_LABEL_DECAP_COUNT_3_0                     35
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0              36
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_15_0                              37
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0                            38
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0                            39
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_SRV6_DIP_EDIT_CTRL_3_0                         40
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_SRV6_EDIT_AND_SL_UPDATE_CTRL_3_0               41
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_SRV6_NEW_GSID_SI_2_0                           42
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_SRV6_SID_AND_PREFIX_LEN_ENC_3_0                43
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_SVP_15_0                                       44
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0                   45
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_SVTAG_CTRL_PKT_INFO_3_0                        46
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_SVTAG_SC_INDEX_OR_IFP_OPAQUE_OBJ_15_0          47
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_SVTAG_SC_INDEX_STR_ALLOW_NAT_3_0               48
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0                        49
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0                              50
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_SYSTEM_SOURCE_15_0                             51
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_TIMESTAMP_CTRL_3_0                             52
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0                53
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_VFI_15_0                                       54
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_VLAN_TAG_PRESERVE_CTRL_SVP_MIRROR_ENABLE_3_0   55
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_FID_COUNT                       56
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_COUNT                    48
+
+/*!
+ * \name Packet Flex Reason Types.
+ */
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE                         0
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS                               1
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_DEFAULT                                 2
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED 3
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED                    4
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED  5
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED                     6
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP                                  7
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT                                   8
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT_HPAE_MISS                         9
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_IFP                                     10
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER                               11
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED      12
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT                                   13
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP                           14
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS                      15
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE                      16
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP                           17
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS                      18
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR                            19
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF                        20
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR                            21
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL                        22
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD                    23
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0                      24
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1                      25
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2                      26
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3                      27
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4                      28
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5                      29
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6                      30
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7                      31
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD            32
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED              33
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED                  34
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU                    35
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU                          36
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED              37
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT                            38
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP                                39
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD         40
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_SRV6                                    41
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_SVP                                     42
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP                               43
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU                44
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR                     45
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED                       46
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_VFP                                     47
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT \
+    {"CB_STATION_MOVE", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE},\
+    {"CML_FLAGS", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS},\
+    {"DEFAULT", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_DEFAULT},\
+    {"DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED},\
+    {"DLB_ECMP_PKT_SAMPLED", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED},\
+    {"DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED},\
+    {"DLB_LAG_PKT_SAMPLED", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED},\
+    {"DST_FP", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP},\
+    {"EM_FT", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT},\
+    {"EM_FT_HPAE_MISS", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT_HPAE_MISS},\
+    {"IFP", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_IFP},\
+    {"IFP_METER", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER},\
+    {"IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED},\
+    {"IVXLT", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT},\
+    {"L2_DST_LOOKUP", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP},\
+    {"L2_DST_LOOKUP_MISS", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS},\
+    {"L2_SRC_STATIC_MOVE", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE},\
+    {"L3_DST_LOOKUP", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP},\
+    {"L3_DST_LOOKUP_MISS", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS},\
+    {"L3_HDR_ERROR", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR},\
+    {"L3_IIF_EQ_L3_OIF", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF},\
+    {"L3_TTL_ERROR", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR},\
+    {"LEARN_CACHE_FULL", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL},\
+    {"MACSA_MULTICAST_RSVD", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD},\
+    {"MATCHED_RULE_BIT_0", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0},\
+    {"MATCHED_RULE_BIT_1", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1},\
+    {"MATCHED_RULE_BIT_2", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2},\
+    {"MATCHED_RULE_BIT_3", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3},\
+    {"MATCHED_RULE_BIT_4", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4},\
+    {"MATCHED_RULE_BIT_5", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5},\
+    {"MATCHED_RULE_BIT_6", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6},\
+    {"MATCHED_RULE_BIT_7", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7},\
+    {"MEMBERSHIP_CHECK_FAILED_RSVD", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD},\
+    {"MIRROR_SAMPLER_EGR_SAMPLED", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED},\
+    {"MIRROR_SAMPLER_SAMPLED", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED},\
+    {"MPLS_CTRL_PKT_TO_CPU", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU},\
+    {"NO_COPY_TO_CPU", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU},\
+    {"PKT_INTEGRITY_CHECK_FAILED", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED},\
+    {"PROTOCOL_PKT", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT},\
+    {"SER_DROP", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP},\
+    {"SPANNING_TREE_CHECK_FAILED_RSVD", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD},\
+    {"SRV6", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_SRV6},\
+    {"SVP", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_SVP},\
+    {"TRACE_DOP", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP},\
+    {"TRACE_DO_NOT_COPY_TO_CPU", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU},\
+    {"TRACE_DO_NOT_MIRROR", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR},\
+    {"URPF_CHECK_FAILED", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED},\
+    {"VFP", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_VFP},\
+    {"flex reason count", BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_COUNT}
+
+#endif /* BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_bcmpkt_rxpmd_match_id_defs.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_bcmpkt_rxpmd_match_id_defs.h
new file mode 100644
index 000000000000..2fc50ab8fa92
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_bcmpkt_rxpmd_match_id_defs.h
@@ -0,0 +1,515 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) bcm56890_a0_dna_6_5_31_6_0_sf_match_id_info.yml
+ * for device bcm56890_a0 and variant dna_6_5_31_6_0.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H
+
+#include <bcmpkt/bcmpkt_rxpmd_match_id.h>
+
+/*!
+ * \brief Get the Match ID DataBase information.
+ *
+ * \retval bcmpkt_rxpmd_match_id_db_info_t Match ID DataBase information.
+*/
+extern bcmpkt_rxpmd_match_id_db_info_t *
+    bcm56890_a0_dna_6_5_31_6_0_rxpmd_match_id_db_info_get(void);
+
+/*!
+ * \brief Get the Match ID Mapping information.
+ *
+ * \retval bcmpkt_rxpmd_match_id_map_info_t Match ID Mapping information.
+*/
+extern bcmpkt_rxpmd_match_id_map_info_t *
+    bcm56890_a0_dna_6_5_31_6_0_rxpmd_match_id_map_info_get(void);
+
+/*!
+  \name RXPMD Match IDs
+*/
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_CNTAG  0
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_GBP_ETHERNET_SHIM  1
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_BASE  2
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0  3
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG  4
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2  5
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE  6
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG  7
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC  8
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SVTAG  9
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP  10
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1  11
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2  12
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD  13
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_1  14
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_2  15
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT  16
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE  17
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1  18
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2  19
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE  20
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE  21
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM  22
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY  23
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT  24
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ  25
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_1  26
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_2  27
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP  28
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_HEADER  29
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA_BASE  30
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP  31
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IOAM_E2E  32
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4  33
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6  34
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0  35
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1  36
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2  37
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3  38
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4  39
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5  40
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6  41
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH  42
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW  43
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE  44
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588  45
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_1  46
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_2  47
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP  48
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_1  49
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_2  50
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_SEG_ROUT_EXT_1  51
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES  52
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES  53
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP  54
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3  55
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4  56
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5  57
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN  58
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_1  59
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_2  60
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH  61
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK  62
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE  63
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_CNTAG  64
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_GBP_ETHERNET_SHIM  65
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE  66
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0  67
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG  68
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2  69
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE  70
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG  71
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC  72
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SVTAG  73
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP  74
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1  75
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2  76
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD  77
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_1  78
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_2  79
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT  80
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE  81
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1  82
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2  83
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE  84
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE  85
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM  86
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY  87
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT  88
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ  89
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_1  90
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_2  91
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP  92
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_HEADER  93
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA_BASE  94
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP  95
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IOAM_E2E  96
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4  97
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6  98
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0  99
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1  100
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2  101
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3  102
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4  103
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5  104
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6  105
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH  106
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW  107
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE  108
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588  109
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_1  110
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_2  111
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP  112
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_1  113
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_2  114
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_SEG_ROUT_EXT_1  115
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES  116
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES  117
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP  118
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3  119
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4  120
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5  121
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN  122
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_1  123
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_2  124
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_CNTAG  125
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG  126
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2  127
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE  128
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG  129
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC  130
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP  131
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1  132
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2  133
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD  134
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_1  135
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_2  136
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT  137
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE  138
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1  139
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2  140
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_1  141
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_2  142
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP  143
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_HEADER  144
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA_BASE  145
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP  146
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4  147
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6  148
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE  149
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588  150
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_1  151
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_2  152
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP  153
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_1  154
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_2  155
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES  156
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES  157
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP  158
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3  159
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4  160
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5  161
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_1  162
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_2  163
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_CNTAG  164
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_GBP_ETHERNET_SHIM  165
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_BASE  166
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0  167
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG  168
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2  169
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE  170
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG  171
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC  172
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SVTAG  173
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP  174
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1  175
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2  176
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD  177
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_1  178
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_2  179
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT  180
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE  181
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1  182
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2  183
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE  184
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE  185
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM  186
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY  187
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT  188
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ  189
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_1  190
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_2  191
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP  192
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_HEADER  193
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA_BASE  194
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP  195
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IOAM_E2E  196
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4  197
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6  198
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0  199
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1  200
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2  201
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3  202
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4  203
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5  204
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6  205
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH  206
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW  207
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE  208
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588  209
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_1  210
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_2  211
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP  212
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_1  213
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_2  214
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_SEG_ROUT_EXT_1  215
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES  216
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES  217
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP  218
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3  219
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4  220
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5  221
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN  222
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_1  223
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_2  224
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH  225
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK  226
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE  227
+#define BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_COUNT  228
+
+#define BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT \
+    {"EGRESS_PKT_FWD_L2_HDR_CNTAG", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_CNTAG}, \
+    {"EGRESS_PKT_FWD_L2_HDR_GBP_ETHERNET_SHIM", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_GBP_ETHERNET_SHIM}, \
+    {"EGRESS_PKT_FWD_L2_HDR_HG3_BASE", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_BASE}, \
+    {"EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0}, \
+    {"EGRESS_PKT_FWD_L2_HDR_ITAG", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG}, \
+    {"EGRESS_PKT_FWD_L2_HDR_L2", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2}, \
+    {"EGRESS_PKT_FWD_L2_HDR_NONE", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE}, \
+    {"EGRESS_PKT_FWD_L2_HDR_OTAG", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG}, \
+    {"EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC}, \
+    {"EGRESS_PKT_FWD_L2_HDR_SVTAG", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SVTAG}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ARP", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_BFD", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_1", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_2", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_2}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GPE", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_1", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_2", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_2}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ICMP", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IFA_HEADER", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_HEADER}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA_BASE", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA_BASE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IGMP", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IOAM_E2E", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IOAM_E2E}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV4", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV6", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS0", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS1", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS2", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS3", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS4", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS5", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS6", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_NONE", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_P_1588", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_1", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_2", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_2}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_RARP", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_1", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_2", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_2}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_SEG_ROUT_EXT_1", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_SEG_ROUT_EXT_1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UDP", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_VXLAN", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_1", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_2", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_2}, \
+    {"EGRESS_PKT_SYS_HDR_EP_NIH", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH}, \
+    {"EGRESS_PKT_SYS_HDR_LOOPBACK", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK}, \
+    {"EGRESS_PKT_SYS_HDR_NONE", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_CNTAG", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_CNTAG}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_GBP_ETHERNET_SHIM", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_GBP_ETHERNET_SHIM}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_ITAG", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_L2", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_NONE", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_OTAG", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_SVTAG", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SVTAG}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_1", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_2", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_2}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_1", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_2", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_2}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_HEADER", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_HEADER}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA_BASE", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA_BASE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IOAM_E2E", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IOAM_E2E}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_1", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_2", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_2}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_1", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_2", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_2}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_SEG_ROUT_EXT_1", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_SEG_ROUT_EXT_1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_1", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_2", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_2}, \
+    {"INGRESS_PKT_INNER_L2_HDR_CNTAG", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_CNTAG}, \
+    {"INGRESS_PKT_INNER_L2_HDR_ITAG", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG}, \
+    {"INGRESS_PKT_INNER_L2_HDR_L2", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2}, \
+    {"INGRESS_PKT_INNER_L2_HDR_NONE", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE}, \
+    {"INGRESS_PKT_INNER_L2_HDR_OTAG", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG}, \
+    {"INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ARP", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_BFD", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_1", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_1}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_2", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_2}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_1", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_1}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_2", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_2}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ICMP", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_IFA_HEADER", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_HEADER}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA_BASE", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA_BASE}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_IGMP", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV4", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV6", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_NONE", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_P_1588", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_1", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_1}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_2", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_2}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_RARP", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_1", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_1}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_2", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_2}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UDP", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_1", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_1}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_2", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_2}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_CNTAG", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_CNTAG}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_GBP_ETHERNET_SHIM", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_GBP_ETHERNET_SHIM}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_HG3_BASE", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_BASE}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_ITAG", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_L2", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_NONE", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_OTAG", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_SVTAG", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SVTAG}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ARP", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_BFD", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_1", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_2", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_2}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GPE", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_1", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_2", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_2}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ICMP", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IFA_HEADER", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_HEADER}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA_BASE", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA_BASE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IGMP", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IOAM_E2E", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IOAM_E2E}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV4", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV6", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_NONE", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_P_1588", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_1", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_2", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_2}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_RARP", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_1", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_2", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_2}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_SEG_ROUT_EXT_1", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_SEG_ROUT_EXT_1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UDP", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_1", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_2", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_2}, \
+    {"INGRESS_PKT_SYS_HDR_EP_NIH", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH}, \
+    {"INGRESS_PKT_SYS_HDR_LOOPBACK", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK}, \
+    {"INGRESS_PKT_SYS_HDR_NONE", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE}, \
+    {"rxpmd_match_id_count", BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_COUNT}
+
+#endif /*! BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_bcmpkt_flexhdr.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_bcmpkt_flexhdr.h
deleted file mode 100644
index 56e234a36042..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_bcmpkt_flexhdr.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) header.yml.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_FLEXHDR_H
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_FLEXHDR_H
-
-#include <bcmpkt/bcmpkt_flexhdr_internal.h>
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ARP_T                      0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_AUTHEN_T                   1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T                      2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CNTAG_T                    3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_0_T         4
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_1_T         5
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_DCN_T                      6
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_DEST_OPTION_T              7
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_EP_NIH_HEADER_T            8
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T        9
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_SUBHDR_5_T         10
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ESP_T                      11
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ETHERTYPE_T                12
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_FRAG_T                     13
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GBP_ETHERNET_SHIM_T        14
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T         15
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GPE_T                      16
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_CHKSUM_T               17
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_KEY_T                  18
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_ROUT_T                 19
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_SEQ_T                  20
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_T                      21
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T                 22
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_EXTENSION_0_T          23
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HOP_BY_HOP_T               24
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ICMP_T                     25
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_HEADER_T               26
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_A_T           27
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_B_T           28
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_BASE_T        29
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IGMP_T                     30
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IOAM_E2E_T                 31
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPFIX_T                    32
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV4_T                     33
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV6_T                     34
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_L2_T                       35
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MIRROR_ERSPAN_SN_T         36
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MIRROR_TRANSPORT_T         37
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_ACH_T                 38
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_BV_T                  39
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_CW_T                  40
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_T                     41
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_P_1588_T                   42
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PROG_EXT_HDR_T             43
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_0_T                  44
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_1_T                  45
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T   46
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T   47
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_0_T         48
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_1_T         49
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RARP_T                     50
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ROUTING_T                  51
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RSPAN_T                    52
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_SRH_T      53
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_T          54
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_0_T             55
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_1_T             56
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_2_T             57
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SNAP_LLC_T                 58
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_STD_SEGMENT_ID_T           59
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_TCP_FIRST_4BYTES_T         60
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_TCP_LAST_16BYTES_T         61
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UDP_T                      62
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L3_T               63
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L4_T               64
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L5_T               65
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_VLAN_T                     66
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_VXLAN_T                    67
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_WESP_T                     68
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_T               69
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_FLEXHDR_COUNT    70
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_FLEXHDR_NAME_MAP_INIT \
-    {"arp_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ARP_T},\
-    {"authen_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_AUTHEN_T},\
-    {"bfd_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T},\
-    {"cntag_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CNTAG_T},\
-    {"cpu_composites_0_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_0_T},\
-    {"cpu_composites_1_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_1_T},\
-    {"dcn_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_DCN_T},\
-    {"dest_option_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_DEST_OPTION_T},\
-    {"ep_nih_header_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_EP_NIH_HEADER_T},\
-    {"erspan3_fixed_hdr_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T},\
-    {"erspan3_subhdr_5_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_SUBHDR_5_T},\
-    {"esp_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ESP_T},\
-    {"ethertype_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ETHERTYPE_T},\
-    {"frag_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_FRAG_T},\
-    {"gbp_ethernet_shim_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GBP_ETHERNET_SHIM_T},\
-    {"generic_loopback_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T},\
-    {"gpe_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GPE_T},\
-    {"gre_chksum_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_CHKSUM_T},\
-    {"gre_key_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_KEY_T},\
-    {"gre_rout_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_ROUT_T},\
-    {"gre_seq_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_SEQ_T},\
-    {"gre_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_T},\
-    {"hg3_base_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T},\
-    {"hg3_extension_0_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_EXTENSION_0_T},\
-    {"hop_by_hop_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HOP_BY_HOP_T},\
-    {"icmp_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ICMP_T},\
-    {"ifa_header_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_HEADER_T},\
-    {"ifa_metadata_a_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_A_T},\
-    {"ifa_metadata_b_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_B_T},\
-    {"ifa_metadata_base_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_BASE_T},\
-    {"igmp_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IGMP_T},\
-    {"ioam_e2e_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IOAM_E2E_T},\
-    {"ipfix_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPFIX_T},\
-    {"ipv4_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV4_T},\
-    {"ipv6_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV6_T},\
-    {"l2_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_L2_T},\
-    {"mirror_erspan_sn_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MIRROR_ERSPAN_SN_T},\
-    {"mirror_transport_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MIRROR_TRANSPORT_T},\
-    {"mpls_ach_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_ACH_T},\
-    {"mpls_bv_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_BV_T},\
-    {"mpls_cw_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_CW_T},\
-    {"mpls_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_T},\
-    {"p_1588_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_P_1588_T},\
-    {"prog_ext_hdr_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PROG_EXT_HDR_T},\
-    {"psamp_0_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_0_T},\
-    {"psamp_1_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_1_T},\
-    {"psamp_mirror_on_drop_0_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T},\
-    {"psamp_mirror_on_drop_3_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T},\
-    {"psamp_postcard_0_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_0_T},\
-    {"psamp_postcard_1_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_1_T},\
-    {"rarp_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RARP_T},\
-    {"routing_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ROUTING_T},\
-    {"rspan_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RSPAN_T},\
-    {"segment_routing_srh_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_SRH_T},\
-    {"segment_routing_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_T},\
-    {"sflow_shim_0_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_0_T},\
-    {"sflow_shim_1_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_1_T},\
-    {"sflow_shim_2_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_2_T},\
-    {"snap_llc_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SNAP_LLC_T},\
-    {"std_segment_id_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_STD_SEGMENT_ID_T},\
-    {"tcp_first_4bytes_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_TCP_FIRST_4BYTES_T},\
-    {"tcp_last_16bytes_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_TCP_LAST_16BYTES_T},\
-    {"udp_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UDP_T},\
-    {"unknown_l3_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L3_T},\
-    {"unknown_l4_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L4_T},\
-    {"unknown_l5_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L5_T},\
-    {"vlan_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_VLAN_T},\
-    {"vxlan_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_VXLAN_T},\
-    {"wesp_t", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_WESP_T},\
-    {"RXPMD_FLEX_T", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_T},\
-    {"flexhdr count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_FLEXHDR_COUNT}
-
-#endif /* BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_FLEXHDR_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_bcmpkt_flexhdr_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_bcmpkt_flexhdr_data.h
deleted file mode 100644
index fdefb32b0dcc..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_bcmpkt_flexhdr_data.h
+++ /dev/null
@@ -1,1419 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) header.yml.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_FLEXHDR_DATA_H
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_FLEXHDR_DATA_H
-
-/*!
- * \name ARP_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ARP_T_HARDWARE_LEN  0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ARP_T_HARDWARE_TYPE 1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ARP_T_OPERATION     2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ARP_T_PROT_ADDR_LEN 3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ARP_T_PROTOCOL_TYPE 4
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ARP_T_SENDER_HA     5
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ARP_T_SENDER_IP     6
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ARP_T_TARGET_HA     7
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ARP_T_TARGET_IP     8
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ARP_T_FID_COUNT          9
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT \
-    {"HARDWARE_LEN", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ARP_T_HARDWARE_LEN},\
-    {"HARDWARE_TYPE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ARP_T_HARDWARE_TYPE},\
-    {"OPERATION", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ARP_T_OPERATION},\
-    {"PROT_ADDR_LEN", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ARP_T_PROT_ADDR_LEN},\
-    {"PROTOCOL_TYPE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ARP_T_PROTOCOL_TYPE},\
-    {"SENDER_HA", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ARP_T_SENDER_HA},\
-    {"SENDER_IP", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ARP_T_SENDER_IP},\
-    {"TARGET_HA", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ARP_T_TARGET_HA},\
-    {"TARGET_IP", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ARP_T_TARGET_IP},\
-    {"arp_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ARP_T_FID_COUNT}
-
-/*!
- * \name AUTHEN_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_AUTHEN_T_DATA        0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_AUTHEN_T_NEXT_HEADER 1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_AUTHEN_T_PAYLOAD_LEN 2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_AUTHEN_T_RESERVED    3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_AUTHEN_T_SEQ_NUM     4
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_AUTHEN_T_SPI         5
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_AUTHEN_T_FID_COUNT          6
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_AUTHEN_T_FIELD_NAME_MAP_INIT \
-    {"DATA", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_AUTHEN_T_DATA},\
-    {"NEXT_HEADER", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_AUTHEN_T_NEXT_HEADER},\
-    {"PAYLOAD_LEN", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_AUTHEN_T_PAYLOAD_LEN},\
-    {"RESERVED", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_AUTHEN_T_RESERVED},\
-    {"SEQ_NUM", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_AUTHEN_T_SEQ_NUM},\
-    {"SPI", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_AUTHEN_T_SPI},\
-    {"authen_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_AUTHEN_T_FID_COUNT}
-
-/*!
- * \name BFD_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_AP            0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_BFD_LENGTH    1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_CPI           2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_DEM           3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_DESMINTXINTV  4
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_DETECTMULT    5
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_DIAG          6
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_FIN           7
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_MINECHORXINTV 8
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_MPT           9
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_MYDISCRIM     10
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_POLL          11
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_REQMINRXINTV  12
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_STA           13
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_URDISCRIM     14
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_VERSION       15
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_FID_COUNT          16
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_FIELD_NAME_MAP_INIT \
-    {"AP", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_AP},\
-    {"BFD_LENGTH", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_BFD_LENGTH},\
-    {"CPI", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_CPI},\
-    {"DEM", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_DEM},\
-    {"DESMINTXINTV", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_DESMINTXINTV},\
-    {"DETECTMULT", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_DETECTMULT},\
-    {"DIAG", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_DIAG},\
-    {"FIN", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_FIN},\
-    {"MINECHORXINTV", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_MINECHORXINTV},\
-    {"MPT", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_MPT},\
-    {"MYDISCRIM", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_MYDISCRIM},\
-    {"POLL", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_POLL},\
-    {"REQMINRXINTV", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_REQMINRXINTV},\
-    {"STA", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_STA},\
-    {"URDISCRIM", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_URDISCRIM},\
-    {"VERSION", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_VERSION},\
-    {"bfd_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_FID_COUNT}
-
-/*!
- * \name CNTAG_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CNTAG_T_RPID 0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CNTAG_T_TPID 1
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CNTAG_T_FID_COUNT          2
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CNTAG_T_FIELD_NAME_MAP_INIT \
-    {"RPID", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CNTAG_T_RPID},\
-    {"TPID", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CNTAG_T_TPID},\
-    {"cntag_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CNTAG_T_FID_COUNT}
-
-/*!
- * \name CPU_COMPOSITES_0_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0 0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1 1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2 2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3 3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4 4
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5 5
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6 6
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT          7
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT \
-    {"DMA_CONT0", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0},\
-    {"DMA_CONT1", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1},\
-    {"DMA_CONT2", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2},\
-    {"DMA_CONT3", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3},\
-    {"DMA_CONT4", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4},\
-    {"DMA_CONT5", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5},\
-    {"DMA_CONT6", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6},\
-    {"cpu_composites_0_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT}
-
-/*!
- * \name CPU_COMPOSITES_1_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10 0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11 1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12 2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13 3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14 4
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15 5
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16 6
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17 7
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7  8
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8  9
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9  10
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT          11
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT \
-    {"DMA_CONT10", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10},\
-    {"DMA_CONT11", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11},\
-    {"DMA_CONT12", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12},\
-    {"DMA_CONT13", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13},\
-    {"DMA_CONT14", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14},\
-    {"DMA_CONT15", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15},\
-    {"DMA_CONT16", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16},\
-    {"DMA_CONT17", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17},\
-    {"DMA_CONT7", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7},\
-    {"DMA_CONT8", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8},\
-    {"DMA_CONT9", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9},\
-    {"cpu_composites_1_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT}
-
-/*!
- * \name DCN_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_DCN_T_FLAGS         0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_DCN_T_NEXT_PROTOCOL 1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_DCN_T_RESERVED0     2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_DCN_T_RESERVED1     3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_DCN_T_RESERVED2     4
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_DCN_T_RESERVED3     5
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_DCN_T_RESERVED4     6
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_DCN_T_FID_COUNT          7
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_DCN_T_FIELD_NAME_MAP_INIT \
-    {"FLAGS", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_DCN_T_FLAGS},\
-    {"NEXT_PROTOCOL", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_DCN_T_NEXT_PROTOCOL},\
-    {"RESERVED0", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_DCN_T_RESERVED0},\
-    {"RESERVED1", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_DCN_T_RESERVED1},\
-    {"RESERVED2", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_DCN_T_RESERVED2},\
-    {"RESERVED3", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_DCN_T_RESERVED3},\
-    {"RESERVED4", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_DCN_T_RESERVED4},\
-    {"dcn_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_DCN_T_FID_COUNT}
-
-/*!
- * \name DEST_OPTION_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_DEST_OPTION_T_HDR_EXT_LEN 0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_DEST_OPTION_T_NEXT_HEADER 1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_DEST_OPTION_T_OPTION      2
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_DEST_OPTION_T_FID_COUNT          3
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_DEST_OPTION_T_FIELD_NAME_MAP_INIT \
-    {"HDR_EXT_LEN", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_DEST_OPTION_T_HDR_EXT_LEN},\
-    {"NEXT_HEADER", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_DEST_OPTION_T_NEXT_HEADER},\
-    {"OPTION", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_DEST_OPTION_T_OPTION},\
-    {"dest_option_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_DEST_OPTION_T_FID_COUNT}
-
-/*!
- * \name EP_NIH_HEADER_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_EP_NIH_HEADER_T_HEADER_SUBTYPE       0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_EP_NIH_HEADER_T_HEADER_TYPE          1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_A        2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_B        3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_C        4
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_A      5
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_B      6
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_C      7
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_EP_NIH_HEADER_T_RECIRC_PROFILE_INDEX 8
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_EP_NIH_HEADER_T_RESERVED_0           9
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_EP_NIH_HEADER_T_START                10
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_EP_NIH_HEADER_T_TIMESTAMP            11
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_EP_NIH_HEADER_T_FID_COUNT          12
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_EP_NIH_HEADER_T_FIELD_NAME_MAP_INIT \
-    {"HEADER_SUBTYPE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_EP_NIH_HEADER_T_HEADER_SUBTYPE},\
-    {"HEADER_TYPE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_EP_NIH_HEADER_T_HEADER_TYPE},\
-    {"OPAQUE_CTRL_A", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_A},\
-    {"OPAQUE_CTRL_B", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_B},\
-    {"OPAQUE_CTRL_C", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_C},\
-    {"OPAQUE_OBJECT_A", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_A},\
-    {"OPAQUE_OBJECT_B", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_B},\
-    {"OPAQUE_OBJECT_C", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_C},\
-    {"RECIRC_PROFILE_INDEX", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_EP_NIH_HEADER_T_RECIRC_PROFILE_INDEX},\
-    {"RESERVED_0", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_EP_NIH_HEADER_T_RESERVED_0},\
-    {"START", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_EP_NIH_HEADER_T_START},\
-    {"TIMESTAMP", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_EP_NIH_HEADER_T_TIMESTAMP},\
-    {"ep_nih_header_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_EP_NIH_HEADER_T_FID_COUNT}
-
-/*!
- * \name ERSPAN3_FIXED_HDR_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO               0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_COS               1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID           2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O 3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID        4
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_T                 5
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP         6
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_VER               7
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN              8
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT          9
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT \
-    {"BSO", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO},\
-    {"COS", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_COS},\
-    {"GBP_SID", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID},\
-    {"P_FT_HWID_D_GRA_O", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O},\
-    {"SESSION_ID", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID},\
-    {"T", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_T},\
-    {"TIMESTAMP", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP},\
-    {"VER", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_VER},\
-    {"VLAN", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN},\
-    {"erspan3_fixed_hdr_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT}
-
-/*!
- * \name ERSPAN3_SUBHDR_5_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID 0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID     1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID   2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP   3
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT          4
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT \
-    {"PLATFORM_ID", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID},\
-    {"PORT_ID", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID},\
-    {"SWITCH_ID", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID},\
-    {"TIMESTAMP", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP},\
-    {"erspan3_subhdr_5_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT}
-
-/*!
- * \name ESP_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ESP_T_NEXT_HEADER 0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ESP_T_PAD         1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ESP_T_PAD_LEN     2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ESP_T_SEQ_NUM     3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ESP_T_SPI         4
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ESP_T_FID_COUNT          5
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ESP_T_FIELD_NAME_MAP_INIT \
-    {"NEXT_HEADER", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ESP_T_NEXT_HEADER},\
-    {"PAD", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ESP_T_PAD},\
-    {"PAD_LEN", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ESP_T_PAD_LEN},\
-    {"SEQ_NUM", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ESP_T_SEQ_NUM},\
-    {"SPI", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ESP_T_SPI},\
-    {"esp_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ESP_T_FID_COUNT}
-
-/*!
- * \name ETHERTYPE_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ETHERTYPE_T_TYPE 0
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ETHERTYPE_T_FID_COUNT          1
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT \
-    {"TYPE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ETHERTYPE_T_TYPE},\
-    {"ethertype_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ETHERTYPE_T_FID_COUNT}
-
-/*!
- * \name FRAG_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_FRAG_T_FRAG_INFO   0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_FRAG_T_ID          1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_FRAG_T_NEXT_HEADER 2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_FRAG_T_RESERVED    3
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_FRAG_T_FID_COUNT          4
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_FRAG_T_FIELD_NAME_MAP_INIT \
-    {"FRAG_INFO", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_FRAG_T_FRAG_INFO},\
-    {"ID", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_FRAG_T_ID},\
-    {"NEXT_HEADER", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_FRAG_T_NEXT_HEADER},\
-    {"RESERVED", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_FRAG_T_RESERVED},\
-    {"frag_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_FRAG_T_FID_COUNT}
-
-/*!
- * \name GBP_ETHERNET_SHIM_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GBP_ETHERNET_SHIM_T_ETHERTYPE 0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GBP_ETHERNET_SHIM_T_FLAGS     1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GBP_ETHERNET_SHIM_T_RESERVED  2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GBP_ETHERNET_SHIM_T_SID       3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GBP_ETHERNET_SHIM_T_SUBTYPE   4
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GBP_ETHERNET_SHIM_T_VER       5
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GBP_ETHERNET_SHIM_T_FID_COUNT          6
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GBP_ETHERNET_SHIM_T_FIELD_NAME_MAP_INIT \
-    {"ETHERTYPE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GBP_ETHERNET_SHIM_T_ETHERTYPE},\
-    {"FLAGS", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GBP_ETHERNET_SHIM_T_FLAGS},\
-    {"RESERVED", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GBP_ETHERNET_SHIM_T_RESERVED},\
-    {"SID", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GBP_ETHERNET_SHIM_T_SID},\
-    {"SUBTYPE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GBP_ETHERNET_SHIM_T_SUBTYPE},\
-    {"VER", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GBP_ETHERNET_SHIM_T_VER},\
-    {"gbp_ethernet_shim_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GBP_ETHERNET_SHIM_T_FID_COUNT}
-
-/*!
- * \name GENERIC_LOOPBACK_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ    0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE   1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ        2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_FLAGS              3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE        4
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY     5
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL     6
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ      7
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0  8
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1  9
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ            10
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1         11
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT 12
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_SRC_SUBPORT_NUM    13
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE         14
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT          15
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT \
-    {"DESTINATION_OBJ", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ},\
-    {"DESTINATION_TYPE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE},\
-    {"ENTROPY_OBJ", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ},\
-    {"FLAGS", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_FLAGS},\
-    {"HEADER_TYPE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE},\
-    {"INPUT_PRIORITY", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY},\
-    {"INTERFACE_CTRL", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL},\
-    {"INTERFACE_OBJ", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ},\
-    {"PROCESSING_CTRL_0", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0},\
-    {"PROCESSING_CTRL_1", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1},\
-    {"QOS_OBJ", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ},\
-    {"RESERVED_1", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1},\
-    {"SOURCE_SYSTEM_PORT", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT},\
-    {"SRC_SUBPORT_NUM", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_SRC_SUBPORT_NUM},\
-    {"START_BYTE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE},\
-    {"generic_loopback_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT}
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NO_OP         0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2_OIF        1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED      2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__VP            3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP          4
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NHOP          5
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2MC_GROUP    6
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L3MC_GROUP    7
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED_1    8
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP_MEMBER   9
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__DEVICE_PORT   10
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__UNDERLAY_ECMP 11
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_TYPE__TUNNEL  0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_TYPE__GENERIC 1
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__NOOP   0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__VFI    1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__L3_IIF 2
-
-/*!
- * \name GPE_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GPE_T_FLAGS         0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GPE_T_NEXT_PROTOCOL 1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GPE_T_RESERVED0     2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GPE_T_RESERVED1     3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GPE_T_VNI           4
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GPE_T_FID_COUNT          5
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GPE_T_FIELD_NAME_MAP_INIT \
-    {"FLAGS", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GPE_T_FLAGS},\
-    {"NEXT_PROTOCOL", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GPE_T_NEXT_PROTOCOL},\
-    {"RESERVED0", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GPE_T_RESERVED0},\
-    {"RESERVED1", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GPE_T_RESERVED1},\
-    {"VNI", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GPE_T_VNI},\
-    {"gpe_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GPE_T_FID_COUNT}
-
-/*!
- * \name GRE_CHKSUM_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_CHKSUM_T_CHECKSUM 0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_CHKSUM_T_OFFSET   1
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_CHKSUM_T_FID_COUNT          2
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_CHKSUM_T_FIELD_NAME_MAP_INIT \
-    {"CHECKSUM", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_CHKSUM_T_CHECKSUM},\
-    {"OFFSET", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_CHKSUM_T_OFFSET},\
-    {"gre_chksum_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_CHKSUM_T_FID_COUNT}
-
-/*!
- * \name GRE_KEY_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_KEY_T_KEY 0
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_KEY_T_FID_COUNT          1
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_KEY_T_FIELD_NAME_MAP_INIT \
-    {"KEY", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_KEY_T_KEY},\
-    {"gre_key_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_KEY_T_FID_COUNT}
-
-/*!
- * \name GRE_ROUT_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_ROUT_T_ROUTING 0
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_ROUT_T_FID_COUNT          1
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_ROUT_T_FIELD_NAME_MAP_INIT \
-    {"ROUTING", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_ROUT_T_ROUTING},\
-    {"gre_rout_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_ROUT_T_FID_COUNT}
-
-/*!
- * \name GRE_SEQ_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_SEQ_T_SEQUENCE 0
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_SEQ_T_FID_COUNT          1
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_SEQ_T_FIELD_NAME_MAP_INIT \
-    {"SEQUENCE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_SEQ_T_SEQUENCE},\
-    {"gre_seq_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_SEQ_T_FID_COUNT}
-
-/*!
- * \name GRE_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_T_C_R_K_S  0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_T_PROTOCOL 1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_T_RESERVED 2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_T_VERSION  3
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_T_FID_COUNT          4
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_T_FIELD_NAME_MAP_INIT \
-    {"C_R_K_S", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_T_C_R_K_S},\
-    {"PROTOCOL", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_T_PROTOCOL},\
-    {"RESERVED", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_T_RESERVED},\
-    {"VERSION", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_T_VERSION},\
-    {"gre_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_T_FID_COUNT}
-
-/*!
- * \name HG3_BASE_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_CN                      0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_CNG                     1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_ENTROPY                 2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_EXT_HDR_PRESENT         3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_HG3_RESERVED            4
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_L3_ROUTED               5
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_MIRROR_COPY             6
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_RESERVED_ETYPE          7
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION      8
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION_TYPE 9
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_SYSTEM_SOURCE           10
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_TC                      11
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_VERSION                 12
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_FID_COUNT          13
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_FIELD_NAME_MAP_INIT \
-    {"CN", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_CN},\
-    {"CNG", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_CNG},\
-    {"ENTROPY", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_ENTROPY},\
-    {"EXT_HDR_PRESENT", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_EXT_HDR_PRESENT},\
-    {"HG3_RESERVED", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_HG3_RESERVED},\
-    {"L3_ROUTED", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_L3_ROUTED},\
-    {"MIRROR_COPY", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_MIRROR_COPY},\
-    {"RESERVED_ETYPE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_RESERVED_ETYPE},\
-    {"SYSTEM_DESTINATION", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION},\
-    {"SYSTEM_DESTINATION_TYPE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION_TYPE},\
-    {"SYSTEM_SOURCE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_SYSTEM_SOURCE},\
-    {"TC", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_TC},\
-    {"VERSION", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_VERSION},\
-    {"hg3_base_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_FID_COUNT}
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__NO_OP         0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__L2_OIF        1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__RESERVED      2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__VP            3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__ECMP          4
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__NHOP          5
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__L2MC_GROUP    6
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__L3MC_GROUP    7
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__RESERVED_1    8
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__ECMP_MEMBER   9
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__DEVICE_PORT   10
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__UNDERLAY_ECMP 11
-
-/*!
- * \name HG3_EXTENSION_0_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_LSB      0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_MSB      1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_EXTENSION_0_T_DVP_OR_L3_IIF     2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_EXTENSION_0_T_FLAGS             3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_EXTENSION_0_T_FORWARDING_DOMAIN 4
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_EXTENSION_0_T_SVP               5
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT          6
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_EXTENSION_0_T_FIELD_NAME_MAP_INIT \
-    {"CLASS_ID_LSB", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_LSB},\
-    {"CLASS_ID_MSB", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_MSB},\
-    {"DVP_OR_L3_IIF", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_EXTENSION_0_T_DVP_OR_L3_IIF},\
-    {"FLAGS", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_EXTENSION_0_T_FLAGS},\
-    {"FORWARDING_DOMAIN", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_EXTENSION_0_T_FORWARDING_DOMAIN},\
-    {"SVP", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_EXTENSION_0_T_SVP},\
-    {"hg3_extension_0_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT}
-
-/*!
- * \name HOP_BY_HOP_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HOP_BY_HOP_T_HDR_EXT_LEN 0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HOP_BY_HOP_T_NEXT_HEADER 1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HOP_BY_HOP_T_OPTION      2
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HOP_BY_HOP_T_FID_COUNT          3
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HOP_BY_HOP_T_FIELD_NAME_MAP_INIT \
-    {"HDR_EXT_LEN", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HOP_BY_HOP_T_HDR_EXT_LEN},\
-    {"NEXT_HEADER", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HOP_BY_HOP_T_NEXT_HEADER},\
-    {"OPTION", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HOP_BY_HOP_T_OPTION},\
-    {"hop_by_hop_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HOP_BY_HOP_T_FID_COUNT}
-
-/*!
- * \name ICMP_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ICMP_T_CHECKSUM  0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ICMP_T_CODE      1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ICMP_T_ICMP_TYPE 2
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ICMP_T_FID_COUNT          3
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT \
-    {"CHECKSUM", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ICMP_T_CHECKSUM},\
-    {"CODE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ICMP_T_CODE},\
-    {"ICMP_TYPE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ICMP_T_ICMP_TYPE},\
-    {"icmp_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ICMP_T_FID_COUNT}
-
-/*!
- * \name IFA_HEADER_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_HEADER_T_FLAGS      0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_HEADER_T_GNS        1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_HEADER_T_MAX_LENGTH 2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_HEADER_T_NEXT_HDR   3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_HEADER_T_VER        4
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_HEADER_T_FID_COUNT          5
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_HEADER_T_FIELD_NAME_MAP_INIT \
-    {"FLAGS", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_HEADER_T_FLAGS},\
-    {"GNS", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_HEADER_T_GNS},\
-    {"MAX_LENGTH", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_HEADER_T_MAX_LENGTH},\
-    {"NEXT_HDR", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_HEADER_T_NEXT_HDR},\
-    {"VER", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_HEADER_T_VER},\
-    {"ifa_header_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_HEADER_T_FID_COUNT}
-
-/*!
- * \name IFA_METADATA_A_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_A_T_CN               0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_A_T_FWD_HDR_TTL      1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_A_T_LNS_DEVICE_ID    2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_A_T_PORT_SPEED       3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_A_T_QUEUE_ID         4
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_A_T_RX_TIMESTAMP_SEC 5
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_A_T_FID_COUNT          6
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_A_T_FIELD_NAME_MAP_INIT \
-    {"CN", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_A_T_CN},\
-    {"FWD_HDR_TTL", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_A_T_FWD_HDR_TTL},\
-    {"LNS_DEVICE_ID", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_A_T_LNS_DEVICE_ID},\
-    {"PORT_SPEED", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_A_T_PORT_SPEED},\
-    {"QUEUE_ID", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_A_T_QUEUE_ID},\
-    {"RX_TIMESTAMP_SEC", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_A_T_RX_TIMESTAMP_SEC},\
-    {"ifa_metadata_a_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_A_T_FID_COUNT}
-
-/*!
- * \name IFA_METADATA_B_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_B_T_EGRESS_PORT_ID         0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_B_T_INGRESS_PORT_ID        1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_B_T_MMU_STAT_0             2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_B_T_MMU_STAT_1             3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_B_T_RESIDENCE_TIME_NANOSEC 4
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_B_T_RX_TIMESTAMP_NANOSEC   5
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_B_T_TX_QUEUE_BYTE_COUNT    6
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_B_T_FID_COUNT          7
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_B_T_FIELD_NAME_MAP_INIT \
-    {"EGRESS_PORT_ID", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_B_T_EGRESS_PORT_ID},\
-    {"INGRESS_PORT_ID", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_B_T_INGRESS_PORT_ID},\
-    {"MMU_STAT_0", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_B_T_MMU_STAT_0},\
-    {"MMU_STAT_1", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_B_T_MMU_STAT_1},\
-    {"RESIDENCE_TIME_NANOSEC", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_B_T_RESIDENCE_TIME_NANOSEC},\
-    {"RX_TIMESTAMP_NANOSEC", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_B_T_RX_TIMESTAMP_NANOSEC},\
-    {"TX_QUEUE_BYTE_COUNT", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_B_T_TX_QUEUE_BYTE_COUNT},\
-    {"ifa_metadata_b_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_B_T_FID_COUNT}
-
-/*!
- * \name IFA_METADATA_BASE_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_BASE_T_ACTION_VECTOR            0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_BASE_T_HOP_LIMIT_CURRENT_LENGTH 1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_BASE_T_REQUEST_VECTOR           2
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_BASE_T_FID_COUNT          3
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_BASE_T_FIELD_NAME_MAP_INIT \
-    {"ACTION_VECTOR", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_BASE_T_ACTION_VECTOR},\
-    {"HOP_LIMIT_CURRENT_LENGTH", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_BASE_T_HOP_LIMIT_CURRENT_LENGTH},\
-    {"REQUEST_VECTOR", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_BASE_T_REQUEST_VECTOR},\
-    {"ifa_metadata_base_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_BASE_T_FID_COUNT}
-
-/*!
- * \name IGMP_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IGMP_T_CHECKSUM      0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IGMP_T_GROUP_ADDRESS 1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IGMP_T_IGMP_TYPE     2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IGMP_T_MAX_RESP_TIME 3
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IGMP_T_FID_COUNT          4
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IGMP_T_FIELD_NAME_MAP_INIT \
-    {"CHECKSUM", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IGMP_T_CHECKSUM},\
-    {"GROUP_ADDRESS", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IGMP_T_GROUP_ADDRESS},\
-    {"IGMP_TYPE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IGMP_T_IGMP_TYPE},\
-    {"MAX_RESP_TIME", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IGMP_T_MAX_RESP_TIME},\
-    {"igmp_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IGMP_T_FID_COUNT}
-
-/*!
- * \name IOAM_E2E_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IOAM_E2E_T_IOAM_E2E_DATA 0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IOAM_E2E_T_IOAM_E2E_TYPE 1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IOAM_E2E_T_IOAM_HDR_LEN  2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IOAM_E2E_T_NAMESPACE_ID  3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IOAM_E2E_T_NEXT_PROTOCOL 4
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IOAM_E2E_T_RESERVED      5
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IOAM_E2E_T_TYPE          6
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IOAM_E2E_T_FID_COUNT          7
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IOAM_E2E_T_FIELD_NAME_MAP_INIT \
-    {"IOAM_E2E_DATA", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IOAM_E2E_T_IOAM_E2E_DATA},\
-    {"IOAM_E2E_TYPE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IOAM_E2E_T_IOAM_E2E_TYPE},\
-    {"IOAM_HDR_LEN", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IOAM_E2E_T_IOAM_HDR_LEN},\
-    {"NAMESPACE_ID", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IOAM_E2E_T_NAMESPACE_ID},\
-    {"NEXT_PROTOCOL", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IOAM_E2E_T_NEXT_PROTOCOL},\
-    {"RESERVED", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IOAM_E2E_T_RESERVED},\
-    {"TYPE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IOAM_E2E_T_TYPE},\
-    {"ioam_e2e_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IOAM_E2E_T_FID_COUNT}
-
-/*!
- * \name IPFIX_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPFIX_T_EXPORT_TIME   0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPFIX_T_LENGTH        1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPFIX_T_OBS_DOMAIN_ID 2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPFIX_T_SEQUENCE_NUM  3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPFIX_T_VERSION       4
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPFIX_T_FID_COUNT          5
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT \
-    {"EXPORT_TIME", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPFIX_T_EXPORT_TIME},\
-    {"LENGTH", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPFIX_T_LENGTH},\
-    {"OBS_DOMAIN_ID", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPFIX_T_OBS_DOMAIN_ID},\
-    {"SEQUENCE_NUM", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPFIX_T_SEQUENCE_NUM},\
-    {"VERSION", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPFIX_T_VERSION},\
-    {"ipfix_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPFIX_T_FID_COUNT}
-
-/*!
- * \name IPV4_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV4_T_DA                0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET 1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV4_T_HDR_CHECKSUM      2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV4_T_ID                3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV4_T_OPTION            4
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV4_T_PROTOCOL          5
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV4_T_SA                6
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV4_T_TOS               7
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV4_T_TOTAL_LENGTH      8
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV4_T_TTL               9
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV4_T_VERSION_HDR_LEN   10
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV4_T_FID_COUNT          11
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT \
-    {"DA", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV4_T_DA},\
-    {"FLAGS_FRAG_OFFSET", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET},\
-    {"HDR_CHECKSUM", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV4_T_HDR_CHECKSUM},\
-    {"ID", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV4_T_ID},\
-    {"OPTION", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV4_T_OPTION},\
-    {"PROTOCOL", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV4_T_PROTOCOL},\
-    {"SA", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV4_T_SA},\
-    {"TOS", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV4_T_TOS},\
-    {"TOTAL_LENGTH", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV4_T_TOTAL_LENGTH},\
-    {"TTL", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV4_T_TTL},\
-    {"VERSION_HDR_LEN", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV4_T_VERSION_HDR_LEN},\
-    {"ipv4_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV4_T_FID_COUNT}
-
-/*!
- * \name IPV6_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV6_T_DA             0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV6_T_FLOW_LABEL     1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV6_T_HOP_LIMIT      2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV6_T_NEXT_HEADER    3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV6_T_PAYLOAD_LENGTH 4
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV6_T_SA             5
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV6_T_TRAFFIC_CLASS  6
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV6_T_VERSION        7
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV6_T_FID_COUNT          8
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT \
-    {"DA", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV6_T_DA},\
-    {"FLOW_LABEL", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV6_T_FLOW_LABEL},\
-    {"HOP_LIMIT", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV6_T_HOP_LIMIT},\
-    {"NEXT_HEADER", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV6_T_NEXT_HEADER},\
-    {"PAYLOAD_LENGTH", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV6_T_PAYLOAD_LENGTH},\
-    {"SA", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV6_T_SA},\
-    {"TRAFFIC_CLASS", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV6_T_TRAFFIC_CLASS},\
-    {"VERSION", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV6_T_VERSION},\
-    {"ipv6_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV6_T_FID_COUNT}
-
-/*!
- * \name L2_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_L2_T_MACDA 0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_L2_T_MACSA 1
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_L2_T_FID_COUNT          2
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_L2_T_FIELD_NAME_MAP_INIT \
-    {"MACDA", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_L2_T_MACDA},\
-    {"MACSA", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_L2_T_MACSA},\
-    {"l2_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_L2_T_FID_COUNT}
-
-/*!
- * \name MIRROR_ERSPAN_SN_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM 0
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT          1
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT \
-    {"SEQ_NUM", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM},\
-    {"mirror_erspan_sn_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT}
-
-/*!
- * \name MIRROR_TRANSPORT_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MIRROR_TRANSPORT_T_DATA 0
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT          1
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT \
-    {"DATA", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MIRROR_TRANSPORT_T_DATA},\
-    {"mirror_transport_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT}
-
-/*!
- * \name MPLS_ACH_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_ACH_T_CHANNEL_TYPE 0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_ACH_T_CW_TYPE      1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_ACH_T_RESERVED     2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_ACH_T_VERSION      3
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_ACH_T_FID_COUNT          4
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_ACH_T_FIELD_NAME_MAP_INIT \
-    {"CHANNEL_TYPE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_ACH_T_CHANNEL_TYPE},\
-    {"CW_TYPE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_ACH_T_CW_TYPE},\
-    {"RESERVED", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_ACH_T_RESERVED},\
-    {"VERSION", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_ACH_T_VERSION},\
-    {"mpls_ach_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_ACH_T_FID_COUNT}
-
-/*!
- * \name MPLS_BV_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_BV_T_VALUE 0
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_BV_T_FID_COUNT          1
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_BV_T_FIELD_NAME_MAP_INIT \
-    {"VALUE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_BV_T_VALUE},\
-    {"mpls_bv_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_BV_T_FID_COUNT}
-
-/*!
- * \name MPLS_CW_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_CW_T_CW_TYPE    0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_CW_T_RESERVED   1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_CW_T_SEQ_NUMBER 2
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_CW_T_FID_COUNT          3
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_CW_T_FIELD_NAME_MAP_INIT \
-    {"CW_TYPE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_CW_T_CW_TYPE},\
-    {"RESERVED", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_CW_T_RESERVED},\
-    {"SEQ_NUMBER", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_CW_T_SEQ_NUMBER},\
-    {"mpls_cw_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_CW_T_FID_COUNT}
-
-/*!
- * \name MPLS_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_T_BOS   0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_T_EXP   1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_T_LABEL 2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_T_TTL   3
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_T_FID_COUNT          4
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_T_FIELD_NAME_MAP_INIT \
-    {"BOS", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_T_BOS},\
-    {"EXP", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_T_EXP},\
-    {"LABEL", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_T_LABEL},\
-    {"TTL", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_T_TTL},\
-    {"mpls_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_T_FID_COUNT}
-
-/*!
- * \name P_1588_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_P_1588_T_CNTRL          0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_P_1588_T_CORRECTION     1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_P_1588_T_DOMAIN_NB      2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_P_1588_T_FLAGS          3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_P_1588_T_LOGMSGINTERVAL 4
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_P_1588_T_MSG_LENGTH     5
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_P_1588_T_MSG_TYPE       6
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_P_1588_T_RESERVED1      7
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_P_1588_T_RESERVED2      8
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_P_1588_T_RESERVED3      9
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_P_1588_T_SEQ_ID         10
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_P_1588_T_SRCPORTID      11
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_P_1588_T_TRANSPORTSPEC  12
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_P_1588_T_VERSION        13
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_P_1588_T_FID_COUNT          14
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_P_1588_T_FIELD_NAME_MAP_INIT \
-    {"CNTRL", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_P_1588_T_CNTRL},\
-    {"CORRECTION", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_P_1588_T_CORRECTION},\
-    {"DOMAIN_NB", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_P_1588_T_DOMAIN_NB},\
-    {"FLAGS", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_P_1588_T_FLAGS},\
-    {"LOGMSGINTERVAL", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_P_1588_T_LOGMSGINTERVAL},\
-    {"MSG_LENGTH", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_P_1588_T_MSG_LENGTH},\
-    {"MSG_TYPE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_P_1588_T_MSG_TYPE},\
-    {"RESERVED1", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_P_1588_T_RESERVED1},\
-    {"RESERVED2", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_P_1588_T_RESERVED2},\
-    {"RESERVED3", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_P_1588_T_RESERVED3},\
-    {"SEQ_ID", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_P_1588_T_SEQ_ID},\
-    {"SRCPORTID", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_P_1588_T_SRCPORTID},\
-    {"TRANSPORTSPEC", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_P_1588_T_TRANSPORTSPEC},\
-    {"VERSION", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_P_1588_T_VERSION},\
-    {"p_1588_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_P_1588_T_FID_COUNT}
-
-/*!
- * \name PROG_EXT_HDR_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PROG_EXT_HDR_T_HDR_EXT_LEN 0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PROG_EXT_HDR_T_NEXT_HEADER 1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PROG_EXT_HDR_T_OPTION      2
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PROG_EXT_HDR_T_FID_COUNT          3
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PROG_EXT_HDR_T_FIELD_NAME_MAP_INIT \
-    {"HDR_EXT_LEN", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PROG_EXT_HDR_T_HDR_EXT_LEN},\
-    {"NEXT_HEADER", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PROG_EXT_HDR_T_NEXT_HEADER},\
-    {"OPTION", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PROG_EXT_HDR_T_OPTION},\
-    {"prog_ext_hdr_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PROG_EXT_HDR_T_FID_COUNT}
-
-/*!
- * \name PSAMP_0_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_0_T_FLOWSET        0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_0_T_LENGTH         1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_0_T_NEXT_HOP_INDEX 2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_0_T_OBS_TIME_NS    3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_0_T_OBS_TIME_S     4
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_0_T_TEMPLATE_ID    5
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_0_T_FID_COUNT          6
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_0_T_FIELD_NAME_MAP_INIT \
-    {"FLOWSET", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_0_T_FLOWSET},\
-    {"LENGTH", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_0_T_LENGTH},\
-    {"NEXT_HOP_INDEX", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_0_T_NEXT_HOP_INDEX},\
-    {"OBS_TIME_NS", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_0_T_OBS_TIME_NS},\
-    {"OBS_TIME_S", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_0_T_OBS_TIME_S},\
-    {"TEMPLATE_ID", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_0_T_TEMPLATE_ID},\
-    {"psamp_0_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_0_T_FID_COUNT}
-
-/*!
- * \name PSAMP_1_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_1_T_DLB_ID         0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_1_T_EGRESS_PORT    1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_1_T_EPOCH          2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_1_T_INGRESS_PORT   3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_1_T_SAMPLED_LENGTH 4
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_1_T_USER_META_DATA 5
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_1_T_VARIABLE_FLAG  6
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_1_T_FID_COUNT          7
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_1_T_FIELD_NAME_MAP_INIT \
-    {"DLB_ID", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_1_T_DLB_ID},\
-    {"EGRESS_PORT", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_1_T_EGRESS_PORT},\
-    {"EPOCH", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_1_T_EPOCH},\
-    {"INGRESS_PORT", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_1_T_INGRESS_PORT},\
-    {"SAMPLED_LENGTH", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_1_T_SAMPLED_LENGTH},\
-    {"USER_META_DATA", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_1_T_USER_META_DATA},\
-    {"VARIABLE_FLAG", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_1_T_VARIABLE_FLAG},\
-    {"psamp_1_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_1_T_FID_COUNT}
-
-/*!
- * \name PSAMP_MIRROR_ON_DROP_0_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT 0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT    1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH          2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS     3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S      4
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID       5
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID     6
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT          7
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT \
-    {"EGRESS_MOD_PORT", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT},\
-    {"INGRESS_PORT", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT},\
-    {"LENGTH", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH},\
-    {"OBS_TIME_NS", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS},\
-    {"OBS_TIME_S", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S},\
-    {"SWITCH_ID", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID},\
-    {"TEMPLATE_ID", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID},\
-    {"psamp_mirror_on_drop_0_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT}
-
-/*!
- * \name PSAMP_MIRROR_ON_DROP_3_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_DROP_REASON             0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_RESERVED_0              1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SAMPLED_LENGTH          2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SMOD_STATE              3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_UC_COS__COLOR__PROB_IDX 4
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_USER_META_DATA          5
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_VAR_LEN_INDICATOR       6
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT          7
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FIELD_NAME_MAP_INIT \
-    {"DROP_REASON", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_DROP_REASON},\
-    {"RESERVED_0", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_RESERVED_0},\
-    {"SAMPLED_LENGTH", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SAMPLED_LENGTH},\
-    {"SMOD_STATE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SMOD_STATE},\
-    {"UC_COS__COLOR__PROB_IDX", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_UC_COS__COLOR__PROB_IDX},\
-    {"USER_META_DATA", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_USER_META_DATA},\
-    {"VAR_LEN_INDICATOR", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_VAR_LEN_INDICATOR},\
-    {"psamp_mirror_on_drop_3_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT}
-
-/*!
- * \name PSAMP_POSTCARD_0_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_0_T_EGRESS_MOD_PORT 0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_0_T_INGRESS_PORT    1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_0_T_OBS_TIME_NS     2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_0_T_OBS_TIME_S      3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_0_T_PSAMP_LENGTH    4
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_0_T_TEMPLATE_ID     5
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_0_T_FID_COUNT          6
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_0_T_FIELD_NAME_MAP_INIT \
-    {"EGRESS_MOD_PORT", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_0_T_EGRESS_MOD_PORT},\
-    {"INGRESS_PORT", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_0_T_INGRESS_PORT},\
-    {"OBS_TIME_NS", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_0_T_OBS_TIME_NS},\
-    {"OBS_TIME_S", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_0_T_OBS_TIME_S},\
-    {"PSAMP_LENGTH", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_0_T_PSAMP_LENGTH},\
-    {"TEMPLATE_ID", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_0_T_TEMPLATE_ID},\
-    {"psamp_postcard_0_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_0_T_FID_COUNT}
-
-/*!
- * \name PSAMP_POSTCARD_1_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_1_T_COLOR_IDX_COS_DROPLOC 0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_1_T_DROP_REASON_CODE      1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_1_T_MMU_STAT_0            2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_1_T_MMU_STAT_1            3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_1_T_QUEUE_ID              4
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_1_T_RESERVED_1            5
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_1_T_RESIDENCE_TIME        6
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_1_T_SAMPLED_LENGTH        7
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_1_T_VAR_LEN_INDICATOR     8
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_1_T_FID_COUNT          9
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_1_T_FIELD_NAME_MAP_INIT \
-    {"COLOR_IDX_COS_DROPLOC", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_1_T_COLOR_IDX_COS_DROPLOC},\
-    {"DROP_REASON_CODE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_1_T_DROP_REASON_CODE},\
-    {"MMU_STAT_0", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_1_T_MMU_STAT_0},\
-    {"MMU_STAT_1", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_1_T_MMU_STAT_1},\
-    {"QUEUE_ID", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_1_T_QUEUE_ID},\
-    {"RESERVED_1", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_1_T_RESERVED_1},\
-    {"RESIDENCE_TIME", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_1_T_RESIDENCE_TIME},\
-    {"SAMPLED_LENGTH", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_1_T_SAMPLED_LENGTH},\
-    {"VAR_LEN_INDICATOR", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_1_T_VAR_LEN_INDICATOR},\
-    {"psamp_postcard_1_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_1_T_FID_COUNT}
-
-/*!
- * \name RARP_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RARP_T_HARDWARE_LEN  0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RARP_T_HARDWARE_TYPE 1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RARP_T_OPERATION     2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RARP_T_PROT_ADDR_LEN 3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RARP_T_PROTOCOL_TYPE 4
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RARP_T_SENDER_HA     5
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RARP_T_SENDER_IP     6
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RARP_T_TARGET_HA     7
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RARP_T_TARGET_IP     8
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RARP_T_FID_COUNT          9
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT \
-    {"HARDWARE_LEN", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RARP_T_HARDWARE_LEN},\
-    {"HARDWARE_TYPE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RARP_T_HARDWARE_TYPE},\
-    {"OPERATION", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RARP_T_OPERATION},\
-    {"PROT_ADDR_LEN", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RARP_T_PROT_ADDR_LEN},\
-    {"PROTOCOL_TYPE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RARP_T_PROTOCOL_TYPE},\
-    {"SENDER_HA", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RARP_T_SENDER_HA},\
-    {"SENDER_IP", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RARP_T_SENDER_IP},\
-    {"TARGET_HA", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RARP_T_TARGET_HA},\
-    {"TARGET_IP", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RARP_T_TARGET_IP},\
-    {"rarp_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RARP_T_FID_COUNT}
-
-/*!
- * \name ROUTING_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ROUTING_T_DATA          0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ROUTING_T_HDR_EXT_LEN   1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ROUTING_T_NEXT_HEADER   2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ROUTING_T_ROUTING_TYPE  3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ROUTING_T_SEGMENTS_LEFT 4
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ROUTING_T_FID_COUNT          5
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ROUTING_T_FIELD_NAME_MAP_INIT \
-    {"DATA", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ROUTING_T_DATA},\
-    {"HDR_EXT_LEN", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ROUTING_T_HDR_EXT_LEN},\
-    {"NEXT_HEADER", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ROUTING_T_NEXT_HEADER},\
-    {"ROUTING_TYPE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ROUTING_T_ROUTING_TYPE},\
-    {"SEGMENTS_LEFT", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ROUTING_T_SEGMENTS_LEFT},\
-    {"routing_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ROUTING_T_FID_COUNT}
-
-/*!
- * \name RSPAN_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RSPAN_T_TAG  0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RSPAN_T_TPID 1
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RSPAN_T_FID_COUNT          2
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RSPAN_T_FIELD_NAME_MAP_INIT \
-    {"TAG", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RSPAN_T_TAG},\
-    {"TPID", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RSPAN_T_TPID},\
-    {"rspan_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RSPAN_T_FID_COUNT}
-
-/*!
- * \name SEGMENT_ROUTING_SRH_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_SRH_T_FLAGS         0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_SRH_T_HDR_EXT_LEN   1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_SRH_T_LAST_ENTRY    2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_SRH_T_NEXT_HEADER   3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_SRH_T_ROUTING_TYPE  4
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_SRH_T_SEGMENTS_LEFT 5
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_SRH_T_TAG           6
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_SRH_T_FID_COUNT          7
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_SRH_T_FIELD_NAME_MAP_INIT \
-    {"FLAGS", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_SRH_T_FLAGS},\
-    {"HDR_EXT_LEN", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_SRH_T_HDR_EXT_LEN},\
-    {"LAST_ENTRY", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_SRH_T_LAST_ENTRY},\
-    {"NEXT_HEADER", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_SRH_T_NEXT_HEADER},\
-    {"ROUTING_TYPE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_SRH_T_ROUTING_TYPE},\
-    {"SEGMENTS_LEFT", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_SRH_T_SEGMENTS_LEFT},\
-    {"TAG", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_SRH_T_TAG},\
-    {"segment_routing_srh_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_SRH_T_FID_COUNT}
-
-/*!
- * \name SEGMENT_ROUTING_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_T_HDR_EXT_LEN      0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_T_LAST_ENTRY_FLAGS 1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_T_NEXT_HEADER      2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_T_ROUTING_TYPE     3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_T_SEG_LIST         4
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_T_SEGMENTS_LEFT    5
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_T_TAG              6
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_T_FID_COUNT          7
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_T_FIELD_NAME_MAP_INIT \
-    {"HDR_EXT_LEN", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_T_HDR_EXT_LEN},\
-    {"LAST_ENTRY_FLAGS", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_T_LAST_ENTRY_FLAGS},\
-    {"NEXT_HEADER", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_T_NEXT_HEADER},\
-    {"ROUTING_TYPE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_T_ROUTING_TYPE},\
-    {"SEG_LIST", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_T_SEG_LIST},\
-    {"SEGMENTS_LEFT", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_T_SEGMENTS_LEFT},\
-    {"TAG", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_T_TAG},\
-    {"segment_routing_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_T_FID_COUNT}
-
-/*!
- * \name SFLOW_SHIM_0_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_0_T_SYS_DESTINATION 0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_0_T_SYS_SOURCE      1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_0_T_VERSION         2
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT          3
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_0_T_FIELD_NAME_MAP_INIT \
-    {"SYS_DESTINATION", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_0_T_SYS_DESTINATION},\
-    {"SYS_SOURCE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_0_T_SYS_SOURCE},\
-    {"VERSION", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_0_T_VERSION},\
-    {"sflow_shim_0_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT}
-
-/*!
- * \name SFLOW_SHIM_1_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_DEST_SAMPLE 0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_DISCARDED   1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_FLEX_SAMPLE 2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_MCAST       3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_SRC_SAMPLE  4
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_TRUNCATED   5
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_1_T_RESERVED         6
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_1_T_SYS_OPCODE       7
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT          8
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_1_T_FIELD_NAME_MAP_INIT \
-    {"FLAG_DEST_SAMPLE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_DEST_SAMPLE},\
-    {"FLAG_DISCARDED", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_DISCARDED},\
-    {"FLAG_FLEX_SAMPLE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_FLEX_SAMPLE},\
-    {"FLAG_MCAST", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_MCAST},\
-    {"FLAG_SRC_SAMPLE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_SRC_SAMPLE},\
-    {"FLAG_TRUNCATED", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_1_T_FLAG_TRUNCATED},\
-    {"RESERVED", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_1_T_RESERVED},\
-    {"SYS_OPCODE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_1_T_SYS_OPCODE},\
-    {"sflow_shim_1_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT}
-
-/*!
- * \name SFLOW_SHIM_2_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_2_T_SEQUENCE_NUM   0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_2_T_USER_META_DATA 1
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT          2
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_2_T_FIELD_NAME_MAP_INIT \
-    {"SEQUENCE_NUM", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_2_T_SEQUENCE_NUM},\
-    {"USER_META_DATA", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_2_T_USER_META_DATA},\
-    {"sflow_shim_2_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT}
-
-/*!
- * \name SNAP_LLC_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SNAP_LLC_T_LENGTH   0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SNAP_LLC_T_SNAP_LLC 1
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SNAP_LLC_T_FID_COUNT          2
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SNAP_LLC_T_FIELD_NAME_MAP_INIT \
-    {"LENGTH", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SNAP_LLC_T_LENGTH},\
-    {"SNAP_LLC", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SNAP_LLC_T_SNAP_LLC},\
-    {"snap_llc_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SNAP_LLC_T_FID_COUNT}
-
-/*!
- * \name STD_SEGMENT_ID_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_STD_SEGMENT_ID_T_DATA 0
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_STD_SEGMENT_ID_T_FID_COUNT          1
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_STD_SEGMENT_ID_T_FIELD_NAME_MAP_INIT \
-    {"DATA", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_STD_SEGMENT_ID_T_DATA},\
-    {"std_segment_id_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_STD_SEGMENT_ID_T_FID_COUNT}
-
-/*!
- * \name TCP_FIRST_4BYTES_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT 0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT 1
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT          2
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT \
-    {"DST_PORT", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT},\
-    {"SRC_PORT", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT},\
-    {"tcp_first_4bytes_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT}
-
-/*!
- * \name TCP_LAST_16BYTES_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM           0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM          1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS 2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM           3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR        4
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE          5
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT          6
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT \
-    {"ACK_NUM", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM},\
-    {"CHECKSUM", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM},\
-    {"HDR_LEN_AND_FLAGS", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS},\
-    {"SEQ_NUM", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM},\
-    {"URGENT_PTR", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR},\
-    {"WIN_SIZE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE},\
-    {"tcp_last_16bytes_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT}
-
-/*!
- * \name UDP_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UDP_T_CHECKSUM   0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UDP_T_DST_PORT   1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UDP_T_SRC_PORT   2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UDP_T_UDP_LENGTH 3
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UDP_T_FID_COUNT          4
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT \
-    {"CHECKSUM", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UDP_T_CHECKSUM},\
-    {"DST_PORT", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UDP_T_DST_PORT},\
-    {"SRC_PORT", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UDP_T_SRC_PORT},\
-    {"UDP_LENGTH", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UDP_T_UDP_LENGTH},\
-    {"udp_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UDP_T_FID_COUNT}
-
-/*!
- * \name UNKNOWN_L3_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD 0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD  1
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L3_T_FID_COUNT          2
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT \
-    {"FIRST_16BYTES_OF_L3_PAYLOAD", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD},\
-    {"NEXT_16BYTES_OF_L3_PAYLOAD", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD},\
-    {"unknown_l3_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L3_T_FID_COUNT}
-
-/*!
- * \name UNKNOWN_L4_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD 0
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L4_T_FID_COUNT          1
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT \
-    {"FIRST_4BYTES_OF_L4_PAYLOAD", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD},\
-    {"unknown_l4_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L4_T_FID_COUNT}
-
-/*!
- * \name UNKNOWN_L5_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1 0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3 1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7 2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L5_T_L5_BYTES_8_9 3
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L5_T_FID_COUNT          4
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT \
-    {"L5_BYTES_0_1", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1},\
-    {"L5_BYTES_2_3", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3},\
-    {"L5_BYTES_4_7", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7},\
-    {"L5_BYTES_8_9", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L5_T_L5_BYTES_8_9},\
-    {"unknown_l5_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L5_T_FID_COUNT}
-
-/*!
- * \name VLAN_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_VLAN_T_CFI  0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_VLAN_T_PCP  1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_VLAN_T_TPID 2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_VLAN_T_VID  3
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_VLAN_T_FID_COUNT          4
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT \
-    {"CFI", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_VLAN_T_CFI},\
-    {"PCP", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_VLAN_T_PCP},\
-    {"TPID", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_VLAN_T_TPID},\
-    {"VID", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_VLAN_T_VID},\
-    {"vlan_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_VLAN_T_FID_COUNT}
-
-/*!
- * \name VXLAN_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_VXLAN_T_FLAGS_RESERVED_1 0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_VXLAN_T_RESERVED2        1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_VXLAN_T_VN_ID            2
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_VXLAN_T_FID_COUNT          3
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT \
-    {"FLAGS_RESERVED_1", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_VXLAN_T_FLAGS_RESERVED_1},\
-    {"RESERVED2", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_VXLAN_T_RESERVED2},\
-    {"VN_ID", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_VXLAN_T_VN_ID},\
-    {"vxlan_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_VXLAN_T_FID_COUNT}
-
-/*!
- * \name WESP_T field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_WESP_T_FLAGS       0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_WESP_T_HEADER_LEN  1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_WESP_T_NEXT_HEADER 2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_WESP_T_SEQ_NUM     3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_WESP_T_SPI         4
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_WESP_T_TRAILER_LEN 5
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_WESP_T_WESP_IV     6
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_WESP_T_FID_COUNT          7
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_WESP_T_FIELD_NAME_MAP_INIT \
-    {"FLAGS", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_WESP_T_FLAGS},\
-    {"HEADER_LEN", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_WESP_T_HEADER_LEN},\
-    {"NEXT_HEADER", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_WESP_T_NEXT_HEADER},\
-    {"SEQ_NUM", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_WESP_T_SEQ_NUM},\
-    {"SPI", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_WESP_T_SPI},\
-    {"TRAILER_LEN", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_WESP_T_TRAILER_LEN},\
-    {"WESP_IV", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_WESP_T_WESP_IV},\
-    {"wesp_t fid count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_WESP_T_FID_COUNT}
-
-
-#endif /* BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_FLEXHDR_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_bcmpkt_rxpmd_flex_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_bcmpkt_rxpmd_flex_data.h
deleted file mode 100644
index 259def530346..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_bcmpkt_rxpmd_flex_data.h
+++ /dev/null
@@ -1,192 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) map.yml.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_DATA_H
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_DATA_H
-
-/*!
- * \name RX flex metadata field IDs.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_ALLOW_NAT_3_0                                  0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_DLB_ECMP_DESTINATION_15_0                      1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_DNAT_CTRL_3_0                                  2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0                                 3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_DVP_15_0                                       4
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_AND_SNAT_CTRL_15_0               5
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_EM_FT_OPAQUE_OBJ_OR_IFP_OPAQUE_OBJ_15_0        6
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_HIGH_3_0                         7
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0                         8
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_EP_NIH_DROP_CODE_OR_IFP_OPAQUE_OBJ_15_0        9
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_RECIRC_CODE_3_0                     10
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_15_0                      11
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_31_16                     12
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_15_0                        13
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_16                       14
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32                       15
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0                              16
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_IFP_IOAM_GBP_ACTION_3_0                        17
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_IFP_TS_CONTROL_ACTION_3_0                      18
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_15_0                             19
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_16                            20
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_INGRESS_PP_PORT_7_0                            21
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0 22
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0                    23
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_INT_PRI_3_0                                    24
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_L2_IIF_11_0                                    25
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_L2_OIF_11_0                                    26
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_L3_DNAT_INDEX_15_0                             27
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_L3_IIF_13_0                                    28
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0                                  29
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_L3_SNAT_INDEX_15_0                             30
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_MAC_DA_23_20_3_0                               31
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_MPLS_LABEL_DECAP_COUNT_3_0                     32
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0              33
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_15_0                              34
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0                            35
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0                            36
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_SRV6_DIP_EDIT_CTRL_3_0                         37
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_SRV6_EDIT_AND_SL_UPDATE_CTRL_3_0               38
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_SRV6_NEW_GSID_SI_2_0                           39
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_SRV6_SID_AND_PREFIX_LEN_ENC_3_0                40
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_SVP_15_0                                       41
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0                   42
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0                        43
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0                              44
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_SYSTEM_SOURCE_15_0                             45
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_TIMESTAMP_CTRL_3_0                             46
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0                47
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_VFI_15_0                                       48
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_VLAN_TAG_PRESERVE_CTRL_SVP_MIRROR_ENABLE_3_0   49
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_FID_COUNT                       50
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_COUNT                    48
-
-/*!
- * \name Packet Flex Reason Types.
- */
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE                         0
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS                               1
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED 2
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED                    3
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED  4
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED                     5
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_DST_FP                                  6
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_EM_FT                                   7
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_IDEV_CONFIG_TO_CPU                      8
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_IFP                                     9
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_IFP_METER                               10
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED      11
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_IVXLT                                   12
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP                           13
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS                      14
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE                      15
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP                           16
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS                      17
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR                            18
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF                        19
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR                            20
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL                        21
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD                    22
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0                      23
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1                      24
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2                      25
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3                      26
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4                      27
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5                      28
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6                      29
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7                      30
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED                 31
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED              32
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED                  33
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU                    34
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU                          35
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED              36
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT                            37
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_SER_DROP                                38
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_SER_DROP_EPIPE                          39
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED              40
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_SRV6                                    41
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_SVP                                     42
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP                               43
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU                44
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR                     45
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED                       46
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_VFP                                     47
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT \
-    {"CB_STATION_MOVE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE},\
-    {"CML_FLAGS", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS},\
-    {"DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED},\
-    {"DLB_ECMP_PKT_SAMPLED", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED},\
-    {"DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED},\
-    {"DLB_LAG_PKT_SAMPLED", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED},\
-    {"DST_FP", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_DST_FP},\
-    {"EM_FT", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_EM_FT},\
-    {"IDEV_CONFIG_TO_CPU", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_IDEV_CONFIG_TO_CPU},\
-    {"IFP", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_IFP},\
-    {"IFP_METER", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_IFP_METER},\
-    {"IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED},\
-    {"IVXLT", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_IVXLT},\
-    {"L2_DST_LOOKUP", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP},\
-    {"L2_DST_LOOKUP_MISS", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS},\
-    {"L2_SRC_STATIC_MOVE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE},\
-    {"L3_DST_LOOKUP", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP},\
-    {"L3_DST_LOOKUP_MISS", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS},\
-    {"L3_HDR_ERROR", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR},\
-    {"L3_IIF_EQ_L3_OIF", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF},\
-    {"L3_TTL_ERROR", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR},\
-    {"LEARN_CACHE_FULL", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL},\
-    {"MACSA_MULTICAST_RSVD", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD},\
-    {"MATCHED_RULE_BIT_0", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0},\
-    {"MATCHED_RULE_BIT_1", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1},\
-    {"MATCHED_RULE_BIT_2", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2},\
-    {"MATCHED_RULE_BIT_3", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3},\
-    {"MATCHED_RULE_BIT_4", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4},\
-    {"MATCHED_RULE_BIT_5", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5},\
-    {"MATCHED_RULE_BIT_6", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6},\
-    {"MATCHED_RULE_BIT_7", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7},\
-    {"MEMBERSHIP_CHECK_FAILED", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED},\
-    {"MIRROR_SAMPLER_EGR_SAMPLED", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED},\
-    {"MIRROR_SAMPLER_SAMPLED", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED},\
-    {"MPLS_CTRL_PKT_TO_CPU", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU},\
-    {"NO_COPY_TO_CPU", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU},\
-    {"PKT_INTEGRITY_CHECK_FAILED", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED},\
-    {"PROTOCOL_PKT", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT},\
-    {"SER_DROP", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_SER_DROP},\
-    {"SER_DROP_EPIPE", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_SER_DROP_EPIPE},\
-    {"SPANNING_TREE_CHECK_FAILED", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED},\
-    {"SRV6", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_SRV6},\
-    {"SVP", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_SVP},\
-    {"TRACE_DOP", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP},\
-    {"TRACE_DO_NOT_COPY_TO_CPU", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU},\
-    {"TRACE_DO_NOT_MIRROR", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR},\
-    {"URPF_CHECK_FAILED", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED},\
-    {"VFP", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_VFP},\
-    {"flex reason count", BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_COUNT}
-
-#endif /* BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_bcmpkt_rxpmd_match_id_defs.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_bcmpkt_rxpmd_match_id_defs.h
deleted file mode 100644
index edd826cbfda3..000000000000
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_bcmpkt_rxpmd_match_id_defs.h
+++ /dev/null
@@ -1,515 +0,0 @@
-/*****************************************************************
- *
- * DO NOT EDIT THIS FILE!
- * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) bcm78800_a0_dna_6_5_30_3_1_sf_match_id_info.yml
- * for device bcm78800_a0 and variant dna_6_5_30_3_1.
- * Edits to this file will be lost when it is regenerated.
- *
- * $Id: $
- * Copyright 2018-2024 Broadcom. All rights reserved.
- * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License version 2 (GPLv2) can
- * be found in the LICENSES folder.
- * All Rights Reserved.$
- *
- * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
- *
- ****************************************************************/
-
-#ifndef BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_MATCH_ID_DEFS_H
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_MATCH_ID_DEFS_H
-
-#include <bcmpkt/bcmpkt_rxpmd_match_id.h>
-
-/*!
- * \brief Get the Match ID DataBase information.
- *
- * \retval bcmpkt_rxpmd_match_id_db_info_t Match ID DataBase information.
-*/
-extern bcmpkt_rxpmd_match_id_db_info_t *
-    bcm78800_a0_dna_6_5_30_3_1_rxpmd_match_id_db_info_get(void);
-
-/*!
- * \brief Get the Match ID Mapping information.
- *
- * \retval bcmpkt_rxpmd_match_id_map_info_t Match ID Mapping information.
-*/
-extern bcmpkt_rxpmd_match_id_map_info_t *
-    bcm78800_a0_dna_6_5_30_3_1_rxpmd_match_id_map_info_get(void);
-
-/*!
-  \name RXPMD Match IDs
-*/
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_CNTAG  0
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_GBP_ETHERNET_SHIM  1
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_BASE  2
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0  3
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG  4
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2  5
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE  6
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG  7
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC  8
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP  9
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1  10
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2  11
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD  12
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DCN  13
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_1  14
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_2  15
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT  16
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE  17
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1  18
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2  19
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE  20
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE  21
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM  22
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY  23
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT  24
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ  25
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_1  26
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_2  27
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP  28
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_HEADER  29
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA_BASE  30
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP  31
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IOAM_E2E  32
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4  33
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6  34
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0  35
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1  36
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2  37
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3  38
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4  39
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5  40
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6  41
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH  42
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW  43
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE  44
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588  45
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_1  46
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_2  47
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP  48
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_1  49
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_2  50
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_SEG_ROUT_EXT_1  51
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES  52
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES  53
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP  54
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3  55
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4  56
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5  57
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN  58
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_1  59
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_2  60
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH  61
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK  62
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE  63
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_CNTAG  64
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_GBP_ETHERNET_SHIM  65
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE  66
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0  67
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG  68
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2  69
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE  70
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG  71
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC  72
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP  73
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1  74
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2  75
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD  76
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DCN  77
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_1  78
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_2  79
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT  80
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE  81
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1  82
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2  83
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE  84
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE  85
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM  86
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY  87
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT  88
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ  89
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_1  90
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_2  91
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP  92
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_HEADER  93
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA_BASE  94
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP  95
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IOAM_E2E  96
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4  97
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6  98
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0  99
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1  100
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2  101
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3  102
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4  103
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5  104
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6  105
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH  106
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW  107
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE  108
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588  109
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_1  110
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_2  111
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP  112
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_1  113
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_2  114
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_SEG_ROUT_EXT_1  115
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES  116
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES  117
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP  118
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3  119
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4  120
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5  121
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN  122
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_1  123
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_2  124
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_CNTAG  125
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG  126
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2  127
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE  128
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG  129
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC  130
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP  131
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1  132
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2  133
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD  134
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_1  135
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_2  136
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT  137
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE  138
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1  139
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2  140
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_1  141
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_2  142
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP  143
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_HEADER  144
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA_BASE  145
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP  146
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4  147
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6  148
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE  149
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588  150
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_1  151
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_2  152
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP  153
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_1  154
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_2  155
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES  156
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES  157
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP  158
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3  159
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4  160
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5  161
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_1  162
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_2  163
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_CNTAG  164
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_GBP_ETHERNET_SHIM  165
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_BASE  166
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0  167
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG  168
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2  169
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE  170
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG  171
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC  172
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP  173
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1  174
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2  175
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD  176
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DCN  177
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_1  178
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_2  179
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT  180
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE  181
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1  182
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2  183
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE  184
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE  185
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM  186
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY  187
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT  188
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ  189
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_1  190
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_2  191
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP  192
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_HEADER  193
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA_BASE  194
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP  195
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IOAM_E2E  196
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4  197
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6  198
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0  199
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1  200
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2  201
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3  202
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4  203
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5  204
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6  205
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH  206
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW  207
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE  208
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588  209
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_1  210
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_2  211
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP  212
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_1  213
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_2  214
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_SEG_ROUT_EXT_1  215
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES  216
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES  217
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP  218
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3  219
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4  220
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5  221
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN  222
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_1  223
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_2  224
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH  225
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK  226
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE  227
-#define BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_COUNT  228
-
-#define BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT \
-    {"EGRESS_PKT_FWD_L2_HDR_CNTAG", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_CNTAG}, \
-    {"EGRESS_PKT_FWD_L2_HDR_GBP_ETHERNET_SHIM", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_GBP_ETHERNET_SHIM}, \
-    {"EGRESS_PKT_FWD_L2_HDR_HG3_BASE", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_BASE}, \
-    {"EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0}, \
-    {"EGRESS_PKT_FWD_L2_HDR_ITAG", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG}, \
-    {"EGRESS_PKT_FWD_L2_HDR_L2", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2}, \
-    {"EGRESS_PKT_FWD_L2_HDR_NONE", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE}, \
-    {"EGRESS_PKT_FWD_L2_HDR_OTAG", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG}, \
-    {"EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ARP", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_BFD", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_DCN", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DCN}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_1", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_2", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_2}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GPE", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_1", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_2", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_2}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ICMP", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IFA_HEADER", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_HEADER}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA_BASE", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA_BASE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IGMP", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IOAM_E2E", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IOAM_E2E}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV4", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV6", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS0", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS1", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS2", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS3", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS4", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS5", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS6", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_NONE", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_P_1588", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_1", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_2", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_2}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_RARP", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_1", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_2", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_2}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_SEG_ROUT_EXT_1", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_SEG_ROUT_EXT_1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UDP", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_VXLAN", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_1", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_1}, \
-    {"EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_2", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_2}, \
-    {"EGRESS_PKT_SYS_HDR_EP_NIH", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH}, \
-    {"EGRESS_PKT_SYS_HDR_LOOPBACK", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK}, \
-    {"EGRESS_PKT_SYS_HDR_NONE", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_CNTAG", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_CNTAG}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_GBP_ETHERNET_SHIM", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_GBP_ETHERNET_SHIM}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_ITAG", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_L2", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_NONE", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_OTAG", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG}, \
-    {"EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_DCN", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DCN}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_1", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_2", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_2}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_1", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_2", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_2}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_HEADER", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_HEADER}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA_BASE", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA_BASE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IOAM_E2E", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IOAM_E2E}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_1", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_2", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_2}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_1", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_2", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_2}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_SEG_ROUT_EXT_1", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_SEG_ROUT_EXT_1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_1", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_1}, \
-    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_2", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_2}, \
-    {"INGRESS_PKT_INNER_L2_HDR_CNTAG", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_CNTAG}, \
-    {"INGRESS_PKT_INNER_L2_HDR_ITAG", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG}, \
-    {"INGRESS_PKT_INNER_L2_HDR_L2", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2}, \
-    {"INGRESS_PKT_INNER_L2_HDR_NONE", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE}, \
-    {"INGRESS_PKT_INNER_L2_HDR_OTAG", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG}, \
-    {"INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ARP", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_BFD", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_1", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_1}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_2", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_2}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_1", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_1}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_2", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_2}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ICMP", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_IFA_HEADER", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_HEADER}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA_BASE", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA_BASE}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_IGMP", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV4", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV6", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_NONE", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_P_1588", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_1", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_1}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_2", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_2}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_RARP", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_1", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_1}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_2", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_2}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UDP", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_1", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_1}, \
-    {"INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_2", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_2}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_CNTAG", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_CNTAG}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_GBP_ETHERNET_SHIM", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_GBP_ETHERNET_SHIM}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_HG3_BASE", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_BASE}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_ITAG", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_L2", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_NONE", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_OTAG", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG}, \
-    {"INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ARP", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_BFD", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_DCN", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DCN}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_1", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_2", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_2}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GPE", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_1", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_2", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_2}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ICMP", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IFA_HEADER", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_HEADER}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA_BASE", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA_BASE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IGMP", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IOAM_E2E", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IOAM_E2E}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV4", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV6", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_NONE", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_P_1588", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_1", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_2", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_2}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_RARP", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_1", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_2", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_2}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_SEG_ROUT_EXT_1", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_SEG_ROUT_EXT_1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UDP", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_1", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_1}, \
-    {"INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_2", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_2}, \
-    {"INGRESS_PKT_SYS_HDR_EP_NIH", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH}, \
-    {"INGRESS_PKT_SYS_HDR_LOOPBACK", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK}, \
-    {"INGRESS_PKT_SYS_HDR_NONE", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE}, \
-    {"rxpmd_match_id_count", BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_COUNT}
-
-#endif /*! BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_MATCH_ID_DEFS_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_bcmpkt_flexhdr.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_bcmpkt_flexhdr.h
new file mode 100644
index 000000000000..7917aa9ca929
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_bcmpkt_flexhdr.h
@@ -0,0 +1,174 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) header.yml.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_FLEXHDR_H
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_FLEXHDR_H
+
+#include <bcmpkt/bcmpkt_flexhdr_internal.h>
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ARP_T                      0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_AUTHEN_T                   1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T                      2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CNTAG_T                    3
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_0_T         4
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_1_T         5
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_DCN_T                      6
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_DEST_OPTION_T              7
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_EP_NIH_HEADER_T            8
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_FIXED_HDR_T        9
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_SUBHDR_5_T         10
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ESP_T                      11
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ETHERTYPE_T                12
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_FRAG_T                     13
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GBP_ETHERNET_SHIM_T        14
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T         15
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GPE_T                      16
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_CHKSUM_T               17
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_KEY_T                  18
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_ROUT_T                 19
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_SEQ_T                  20
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_T                      21
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T                 22
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_EXTENSION_0_T          23
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HOP_BY_HOP_T               24
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ICMP_T                     25
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_HEADER_T               26
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_A_T           27
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_B_T           28
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_BASE_T        29
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IGMP_T                     30
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IOAM_E2E_T                 31
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPFIX_T                    32
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV4_T                     33
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV6_T                     34
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_L2_T                       35
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MIRROR_ERSPAN_SN_T         36
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MIRROR_TRANSPORT_T         37
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_ACH_T                 38
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_BV_T                  39
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_CW_T                  40
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_T                     41
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_P_1588_T                   42
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PROG_EXT_HDR_T             43
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_0_T                  44
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_1_T                  45
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T   46
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T   47
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_0_T         48
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_1_T         49
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RARP_T                     50
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ROUTING_T                  51
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RSPAN_T                    52
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_0_T             53
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_1_T             54
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_2_T             55
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SNAP_LLC_T                 56
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_TCP_FIRST_4BYTES_T         57
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_TCP_LAST_16BYTES_T         58
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UDP_T                      59
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L3_T               60
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L4_T               61
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L5_T               62
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_VLAN_T                     63
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_VXLAN_T                    64
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_WESP_T                     65
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_T               66
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_FLEXHDR_COUNT    67
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_FLEXHDR_NAME_MAP_INIT \
+    {"arp_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ARP_T},\
+    {"authen_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_AUTHEN_T},\
+    {"bfd_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T},\
+    {"cntag_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CNTAG_T},\
+    {"cpu_composites_0_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_0_T},\
+    {"cpu_composites_1_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_1_T},\
+    {"dcn_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_DCN_T},\
+    {"dest_option_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_DEST_OPTION_T},\
+    {"ep_nih_header_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_EP_NIH_HEADER_T},\
+    {"erspan3_fixed_hdr_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_FIXED_HDR_T},\
+    {"erspan3_subhdr_5_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_SUBHDR_5_T},\
+    {"esp_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ESP_T},\
+    {"ethertype_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ETHERTYPE_T},\
+    {"frag_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_FRAG_T},\
+    {"gbp_ethernet_shim_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GBP_ETHERNET_SHIM_T},\
+    {"generic_loopback_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T},\
+    {"gpe_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GPE_T},\
+    {"gre_chksum_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_CHKSUM_T},\
+    {"gre_key_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_KEY_T},\
+    {"gre_rout_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_ROUT_T},\
+    {"gre_seq_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_SEQ_T},\
+    {"gre_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_T},\
+    {"hg3_base_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T},\
+    {"hg3_extension_0_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_EXTENSION_0_T},\
+    {"hop_by_hop_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HOP_BY_HOP_T},\
+    {"icmp_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ICMP_T},\
+    {"ifa_header_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_HEADER_T},\
+    {"ifa_metadata_a_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_A_T},\
+    {"ifa_metadata_b_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_B_T},\
+    {"ifa_metadata_base_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_BASE_T},\
+    {"igmp_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IGMP_T},\
+    {"ioam_e2e_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IOAM_E2E_T},\
+    {"ipfix_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPFIX_T},\
+    {"ipv4_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV4_T},\
+    {"ipv6_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV6_T},\
+    {"l2_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_L2_T},\
+    {"mirror_erspan_sn_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MIRROR_ERSPAN_SN_T},\
+    {"mirror_transport_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MIRROR_TRANSPORT_T},\
+    {"mpls_ach_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_ACH_T},\
+    {"mpls_bv_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_BV_T},\
+    {"mpls_cw_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_CW_T},\
+    {"mpls_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_T},\
+    {"p_1588_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_P_1588_T},\
+    {"prog_ext_hdr_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PROG_EXT_HDR_T},\
+    {"psamp_0_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_0_T},\
+    {"psamp_1_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_1_T},\
+    {"psamp_mirror_on_drop_0_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T},\
+    {"psamp_mirror_on_drop_3_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T},\
+    {"psamp_postcard_0_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_0_T},\
+    {"psamp_postcard_1_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_1_T},\
+    {"rarp_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RARP_T},\
+    {"routing_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ROUTING_T},\
+    {"rspan_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RSPAN_T},\
+    {"sflow_shim_0_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_0_T},\
+    {"sflow_shim_1_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_1_T},\
+    {"sflow_shim_2_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_2_T},\
+    {"snap_llc_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SNAP_LLC_T},\
+    {"tcp_first_4bytes_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_TCP_FIRST_4BYTES_T},\
+    {"tcp_last_16bytes_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_TCP_LAST_16BYTES_T},\
+    {"udp_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UDP_T},\
+    {"unknown_l3_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L3_T},\
+    {"unknown_l4_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L4_T},\
+    {"unknown_l5_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L5_T},\
+    {"vlan_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_VLAN_T},\
+    {"vxlan_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_VXLAN_T},\
+    {"wesp_t", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_WESP_T},\
+    {"RXPMD_FLEX_T", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_T},\
+    {"flexhdr count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_FLEXHDR_COUNT}
+
+#endif /* BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_FLEXHDR_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_bcmpkt_flexhdr_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_bcmpkt_flexhdr_data.h
new file mode 100644
index 000000000000..6f186ac3a1ae
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_bcmpkt_flexhdr_data.h
@@ -0,0 +1,1362 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) header.yml.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_FLEXHDR_DATA_H
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_FLEXHDR_DATA_H
+
+/*!
+ * \name ARP_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ARP_T_HARDWARE_LEN  0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ARP_T_HARDWARE_TYPE 1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ARP_T_OPERATION     2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ARP_T_PROT_ADDR_LEN 3
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ARP_T_PROTOCOL_TYPE 4
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ARP_T_SENDER_HA     5
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ARP_T_SENDER_IP     6
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ARP_T_TARGET_HA     7
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ARP_T_TARGET_IP     8
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ARP_T_FID_COUNT          9
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT \
+    {"HARDWARE_LEN", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ARP_T_HARDWARE_LEN},\
+    {"HARDWARE_TYPE", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ARP_T_HARDWARE_TYPE},\
+    {"OPERATION", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ARP_T_OPERATION},\
+    {"PROT_ADDR_LEN", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ARP_T_PROT_ADDR_LEN},\
+    {"PROTOCOL_TYPE", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ARP_T_PROTOCOL_TYPE},\
+    {"SENDER_HA", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ARP_T_SENDER_HA},\
+    {"SENDER_IP", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ARP_T_SENDER_IP},\
+    {"TARGET_HA", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ARP_T_TARGET_HA},\
+    {"TARGET_IP", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ARP_T_TARGET_IP},\
+    {"arp_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ARP_T_FID_COUNT}
+
+/*!
+ * \name AUTHEN_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_AUTHEN_T_DATA        0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_AUTHEN_T_NEXT_HEADER 1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_AUTHEN_T_PAYLOAD_LEN 2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_AUTHEN_T_RESERVED    3
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_AUTHEN_T_SEQ_NUM     4
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_AUTHEN_T_SPI         5
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_AUTHEN_T_FID_COUNT          6
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_AUTHEN_T_FIELD_NAME_MAP_INIT \
+    {"DATA", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_AUTHEN_T_DATA},\
+    {"NEXT_HEADER", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_AUTHEN_T_NEXT_HEADER},\
+    {"PAYLOAD_LEN", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_AUTHEN_T_PAYLOAD_LEN},\
+    {"RESERVED", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_AUTHEN_T_RESERVED},\
+    {"SEQ_NUM", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_AUTHEN_T_SEQ_NUM},\
+    {"SPI", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_AUTHEN_T_SPI},\
+    {"authen_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_AUTHEN_T_FID_COUNT}
+
+/*!
+ * \name BFD_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_AP            0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_BFD_LENGTH    1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_CPI           2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_DEM           3
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_DESMINTXINTV  4
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_DETECTMULT    5
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_DIAG          6
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_FIN           7
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_MINECHORXINTV 8
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_MPT           9
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_MYDISCRIM     10
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_POLL          11
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_REQMINRXINTV  12
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_STA           13
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_URDISCRIM     14
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_VERSION       15
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_FID_COUNT          16
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_FIELD_NAME_MAP_INIT \
+    {"AP", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_AP},\
+    {"BFD_LENGTH", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_BFD_LENGTH},\
+    {"CPI", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_CPI},\
+    {"DEM", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_DEM},\
+    {"DESMINTXINTV", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_DESMINTXINTV},\
+    {"DETECTMULT", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_DETECTMULT},\
+    {"DIAG", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_DIAG},\
+    {"FIN", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_FIN},\
+    {"MINECHORXINTV", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_MINECHORXINTV},\
+    {"MPT", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_MPT},\
+    {"MYDISCRIM", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_MYDISCRIM},\
+    {"POLL", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_POLL},\
+    {"REQMINRXINTV", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_REQMINRXINTV},\
+    {"STA", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_STA},\
+    {"URDISCRIM", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_URDISCRIM},\
+    {"VERSION", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_VERSION},\
+    {"bfd_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_FID_COUNT}
+
+/*!
+ * \name CNTAG_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CNTAG_T_RPID 0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CNTAG_T_TPID 1
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CNTAG_T_FID_COUNT          2
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CNTAG_T_FIELD_NAME_MAP_INIT \
+    {"RPID", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CNTAG_T_RPID},\
+    {"TPID", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CNTAG_T_TPID},\
+    {"cntag_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CNTAG_T_FID_COUNT}
+
+/*!
+ * \name CPU_COMPOSITES_0_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0 0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1 1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2 2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3 3
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4 4
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5 5
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6 6
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT          7
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT \
+    {"DMA_CONT0", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT0},\
+    {"DMA_CONT1", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT1},\
+    {"DMA_CONT2", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT2},\
+    {"DMA_CONT3", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT3},\
+    {"DMA_CONT4", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT4},\
+    {"DMA_CONT5", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT5},\
+    {"DMA_CONT6", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_0_T_DMA_CONT6},\
+    {"cpu_composites_0_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT}
+
+/*!
+ * \name CPU_COMPOSITES_1_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10 0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11 1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12 2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13 3
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14 4
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15 5
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16 6
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17 7
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7  8
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8  9
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9  10
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT          11
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT \
+    {"DMA_CONT10", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT10},\
+    {"DMA_CONT11", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT11},\
+    {"DMA_CONT12", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT12},\
+    {"DMA_CONT13", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT13},\
+    {"DMA_CONT14", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT14},\
+    {"DMA_CONT15", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT15},\
+    {"DMA_CONT16", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT16},\
+    {"DMA_CONT17", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT17},\
+    {"DMA_CONT7", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT7},\
+    {"DMA_CONT8", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT8},\
+    {"DMA_CONT9", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_1_T_DMA_CONT9},\
+    {"cpu_composites_1_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT}
+
+/*!
+ * \name DCN_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_DCN_T_FLAGS         0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_DCN_T_NEXT_PROTOCOL 1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_DCN_T_RESERVED0     2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_DCN_T_RESERVED1     3
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_DCN_T_RESERVED2     4
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_DCN_T_RESERVED3     5
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_DCN_T_RESERVED4     6
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_DCN_T_FID_COUNT          7
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_DCN_T_FIELD_NAME_MAP_INIT \
+    {"FLAGS", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_DCN_T_FLAGS},\
+    {"NEXT_PROTOCOL", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_DCN_T_NEXT_PROTOCOL},\
+    {"RESERVED0", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_DCN_T_RESERVED0},\
+    {"RESERVED1", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_DCN_T_RESERVED1},\
+    {"RESERVED2", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_DCN_T_RESERVED2},\
+    {"RESERVED3", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_DCN_T_RESERVED3},\
+    {"RESERVED4", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_DCN_T_RESERVED4},\
+    {"dcn_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_DCN_T_FID_COUNT}
+
+/*!
+ * \name DEST_OPTION_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_DEST_OPTION_T_HDR_EXT_LEN 0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_DEST_OPTION_T_NEXT_HEADER 1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_DEST_OPTION_T_OPTION      2
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_DEST_OPTION_T_FID_COUNT          3
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_DEST_OPTION_T_FIELD_NAME_MAP_INIT \
+    {"HDR_EXT_LEN", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_DEST_OPTION_T_HDR_EXT_LEN},\
+    {"NEXT_HEADER", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_DEST_OPTION_T_NEXT_HEADER},\
+    {"OPTION", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_DEST_OPTION_T_OPTION},\
+    {"dest_option_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_DEST_OPTION_T_FID_COUNT}
+
+/*!
+ * \name EP_NIH_HEADER_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_EP_NIH_HEADER_T_HEADER_SUBTYPE       0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_EP_NIH_HEADER_T_HEADER_TYPE          1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_A        2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_B        3
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_C        4
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_A      5
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_B      6
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_C      7
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_EP_NIH_HEADER_T_RECIRC_PROFILE_INDEX 8
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_EP_NIH_HEADER_T_RESERVED_0           9
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_EP_NIH_HEADER_T_START                10
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_EP_NIH_HEADER_T_TIMESTAMP            11
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT          12
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_EP_NIH_HEADER_T_FIELD_NAME_MAP_INIT \
+    {"HEADER_SUBTYPE", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_EP_NIH_HEADER_T_HEADER_SUBTYPE},\
+    {"HEADER_TYPE", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_EP_NIH_HEADER_T_HEADER_TYPE},\
+    {"OPAQUE_CTRL_A", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_A},\
+    {"OPAQUE_CTRL_B", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_B},\
+    {"OPAQUE_CTRL_C", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_CTRL_C},\
+    {"OPAQUE_OBJECT_A", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_A},\
+    {"OPAQUE_OBJECT_B", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_B},\
+    {"OPAQUE_OBJECT_C", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_EP_NIH_HEADER_T_OPAQUE_OBJECT_C},\
+    {"RECIRC_PROFILE_INDEX", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_EP_NIH_HEADER_T_RECIRC_PROFILE_INDEX},\
+    {"RESERVED_0", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_EP_NIH_HEADER_T_RESERVED_0},\
+    {"START", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_EP_NIH_HEADER_T_START},\
+    {"TIMESTAMP", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_EP_NIH_HEADER_T_TIMESTAMP},\
+    {"ep_nih_header_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT}
+
+/*!
+ * \name ERSPAN3_FIXED_HDR_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO               0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_FIXED_HDR_T_COS               1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID           2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O 3
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID        4
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_FIXED_HDR_T_T                 5
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP         6
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VER               7
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN              8
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT          9
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT \
+    {"BSO", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_FIXED_HDR_T_BSO},\
+    {"COS", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_FIXED_HDR_T_COS},\
+    {"GBP_SID", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_FIXED_HDR_T_GBP_SID},\
+    {"P_FT_HWID_D_GRA_O", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_FIXED_HDR_T_P_FT_HWID_D_GRA_O},\
+    {"SESSION_ID", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_FIXED_HDR_T_SESSION_ID},\
+    {"T", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_FIXED_HDR_T_T},\
+    {"TIMESTAMP", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_FIXED_HDR_T_TIMESTAMP},\
+    {"VER", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VER},\
+    {"VLAN", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_FIXED_HDR_T_VLAN},\
+    {"erspan3_fixed_hdr_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT}
+
+/*!
+ * \name ERSPAN3_SUBHDR_5_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID 0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID     1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID   2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP   3
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT          4
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT \
+    {"PLATFORM_ID", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PLATFORM_ID},\
+    {"PORT_ID", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_SUBHDR_5_T_PORT_ID},\
+    {"SWITCH_ID", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_SUBHDR_5_T_SWITCH_ID},\
+    {"TIMESTAMP", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_SUBHDR_5_T_TIMESTAMP},\
+    {"erspan3_subhdr_5_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT}
+
+/*!
+ * \name ESP_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ESP_T_NEXT_HEADER 0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ESP_T_PAD         1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ESP_T_PAD_LEN     2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ESP_T_SEQ_NUM     3
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ESP_T_SPI         4
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ESP_T_FID_COUNT          5
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ESP_T_FIELD_NAME_MAP_INIT \
+    {"NEXT_HEADER", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ESP_T_NEXT_HEADER},\
+    {"PAD", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ESP_T_PAD},\
+    {"PAD_LEN", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ESP_T_PAD_LEN},\
+    {"SEQ_NUM", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ESP_T_SEQ_NUM},\
+    {"SPI", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ESP_T_SPI},\
+    {"esp_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ESP_T_FID_COUNT}
+
+/*!
+ * \name ETHERTYPE_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ETHERTYPE_T_TYPE 0
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ETHERTYPE_T_FID_COUNT          1
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT \
+    {"TYPE", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ETHERTYPE_T_TYPE},\
+    {"ethertype_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ETHERTYPE_T_FID_COUNT}
+
+/*!
+ * \name FRAG_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_FRAG_T_FRAG_INFO   0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_FRAG_T_ID          1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_FRAG_T_NEXT_HEADER 2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_FRAG_T_RESERVED    3
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_FRAG_T_FID_COUNT          4
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_FRAG_T_FIELD_NAME_MAP_INIT \
+    {"FRAG_INFO", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_FRAG_T_FRAG_INFO},\
+    {"ID", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_FRAG_T_ID},\
+    {"NEXT_HEADER", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_FRAG_T_NEXT_HEADER},\
+    {"RESERVED", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_FRAG_T_RESERVED},\
+    {"frag_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_FRAG_T_FID_COUNT}
+
+/*!
+ * \name GBP_ETHERNET_SHIM_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GBP_ETHERNET_SHIM_T_ETHERTYPE 0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GBP_ETHERNET_SHIM_T_FLAGS     1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GBP_ETHERNET_SHIM_T_RESERVED  2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GBP_ETHERNET_SHIM_T_SID       3
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GBP_ETHERNET_SHIM_T_SUBTYPE   4
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GBP_ETHERNET_SHIM_T_VER       5
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GBP_ETHERNET_SHIM_T_FID_COUNT          6
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GBP_ETHERNET_SHIM_T_FIELD_NAME_MAP_INIT \
+    {"ETHERTYPE", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GBP_ETHERNET_SHIM_T_ETHERTYPE},\
+    {"FLAGS", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GBP_ETHERNET_SHIM_T_FLAGS},\
+    {"RESERVED", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GBP_ETHERNET_SHIM_T_RESERVED},\
+    {"SID", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GBP_ETHERNET_SHIM_T_SID},\
+    {"SUBTYPE", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GBP_ETHERNET_SHIM_T_SUBTYPE},\
+    {"VER", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GBP_ETHERNET_SHIM_T_VER},\
+    {"gbp_ethernet_shim_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GBP_ETHERNET_SHIM_T_FID_COUNT}
+
+/*!
+ * \name GENERIC_LOOPBACK_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ    0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE   1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ        2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_FLAGS              3
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE        4
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY     5
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL     6
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ      7
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0  8
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1  9
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ            10
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1         11
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT 12
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_SRC_SUBPORT_NUM    13
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE         14
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT          15
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT \
+    {"DESTINATION_OBJ", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_OBJ},\
+    {"DESTINATION_TYPE", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE},\
+    {"ENTROPY_OBJ", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_ENTROPY_OBJ},\
+    {"FLAGS", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_FLAGS},\
+    {"HEADER_TYPE", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_HEADER_TYPE},\
+    {"INPUT_PRIORITY", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_INPUT_PRIORITY},\
+    {"INTERFACE_CTRL", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_CTRL},\
+    {"INTERFACE_OBJ", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_INTERFACE_OBJ},\
+    {"PROCESSING_CTRL_0", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_0},\
+    {"PROCESSING_CTRL_1", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_PROCESSING_CTRL_1},\
+    {"QOS_OBJ", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_QOS_OBJ},\
+    {"RESERVED_1", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_RESERVED_1},\
+    {"SOURCE_SYSTEM_PORT", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_SOURCE_SYSTEM_PORT},\
+    {"SRC_SUBPORT_NUM", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_SRC_SUBPORT_NUM},\
+    {"START_BYTE", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_START_BYTE},\
+    {"generic_loopback_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT}
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NO_OP         0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2_OIF        1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED      2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__VP            3
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP          4
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__NHOP          5
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L2MC_GROUP    6
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__L3MC_GROUP    7
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__RESERVED_1    8
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__ECMP_MEMBER   9
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__DEVICE_PORT   10
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_DESTINATION_TYPE__UNDERLAY_ECMP 11
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_TYPE__TUNNEL  0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_TYPE__GENERIC 1
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__NOOP   0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__VFI    1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_LOOPBACK_HEADER_INTERFACE_CTRL__L3_IIF 2
+
+/*!
+ * \name GPE_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GPE_T_FLAGS         0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GPE_T_NEXT_PROTOCOL 1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GPE_T_RESERVED0     2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GPE_T_RESERVED1     3
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GPE_T_VNI           4
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GPE_T_FID_COUNT          5
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GPE_T_FIELD_NAME_MAP_INIT \
+    {"FLAGS", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GPE_T_FLAGS},\
+    {"NEXT_PROTOCOL", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GPE_T_NEXT_PROTOCOL},\
+    {"RESERVED0", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GPE_T_RESERVED0},\
+    {"RESERVED1", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GPE_T_RESERVED1},\
+    {"VNI", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GPE_T_VNI},\
+    {"gpe_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GPE_T_FID_COUNT}
+
+/*!
+ * \name GRE_CHKSUM_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_CHKSUM_T_CHECKSUM 0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_CHKSUM_T_OFFSET   1
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT          2
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_CHKSUM_T_FIELD_NAME_MAP_INIT \
+    {"CHECKSUM", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_CHKSUM_T_CHECKSUM},\
+    {"OFFSET", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_CHKSUM_T_OFFSET},\
+    {"gre_chksum_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT}
+
+/*!
+ * \name GRE_KEY_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_KEY_T_KEY 0
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_KEY_T_FID_COUNT          1
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_KEY_T_FIELD_NAME_MAP_INIT \
+    {"KEY", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_KEY_T_KEY},\
+    {"gre_key_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_KEY_T_FID_COUNT}
+
+/*!
+ * \name GRE_ROUT_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_ROUT_T_ROUTING 0
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_ROUT_T_FID_COUNT          1
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_ROUT_T_FIELD_NAME_MAP_INIT \
+    {"ROUTING", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_ROUT_T_ROUTING},\
+    {"gre_rout_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_ROUT_T_FID_COUNT}
+
+/*!
+ * \name GRE_SEQ_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_SEQ_T_SEQUENCE 0
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_SEQ_T_FID_COUNT          1
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_SEQ_T_FIELD_NAME_MAP_INIT \
+    {"SEQUENCE", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_SEQ_T_SEQUENCE},\
+    {"gre_seq_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_SEQ_T_FID_COUNT}
+
+/*!
+ * \name GRE_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_T_C_R_K_S  0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_T_PROTOCOL 1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_T_RESERVED 2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_T_VERSION  3
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_T_FID_COUNT          4
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_T_FIELD_NAME_MAP_INIT \
+    {"C_R_K_S", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_T_C_R_K_S},\
+    {"PROTOCOL", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_T_PROTOCOL},\
+    {"RESERVED", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_T_RESERVED},\
+    {"VERSION", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_T_VERSION},\
+    {"gre_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_T_FID_COUNT}
+
+/*!
+ * \name HG3_BASE_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_CN                      0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_CNG                     1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_ENTROPY                 2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_EXT_HDR_PRESENT         3
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_HG3_RESERVED            4
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_L3_ROUTED               5
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_MIRROR_COPY             6
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_RESERVED_ETYPE          7
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION      8
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION_TYPE 9
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_SYSTEM_SOURCE           10
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_TC                      11
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_VERSION                 12
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_FID_COUNT          13
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_FIELD_NAME_MAP_INIT \
+    {"CN", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_CN},\
+    {"CNG", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_CNG},\
+    {"ENTROPY", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_ENTROPY},\
+    {"EXT_HDR_PRESENT", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_EXT_HDR_PRESENT},\
+    {"HG3_RESERVED", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_HG3_RESERVED},\
+    {"L3_ROUTED", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_L3_ROUTED},\
+    {"MIRROR_COPY", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_MIRROR_COPY},\
+    {"RESERVED_ETYPE", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_RESERVED_ETYPE},\
+    {"SYSTEM_DESTINATION", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION},\
+    {"SYSTEM_DESTINATION_TYPE", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_SYSTEM_DESTINATION_TYPE},\
+    {"SYSTEM_SOURCE", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_SYSTEM_SOURCE},\
+    {"TC", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_TC},\
+    {"VERSION", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_VERSION},\
+    {"hg3_base_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_FID_COUNT}
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__NO_OP         0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__L2_OIF        1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__RESERVED      2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__VP            3
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__ECMP          4
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__NHOP          5
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__L2MC_GROUP    6
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__L3MC_GROUP    7
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__RESERVED_1    8
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__ECMP_MEMBER   9
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__DEVICE_PORT   10
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_DESTINATION_TYPE__UNDERLAY_ECMP 11
+
+/*!
+ * \name HG3_EXTENSION_0_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_LSB      0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_MSB      1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_EXTENSION_0_T_DVP_OR_L3_IIF     2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_EXTENSION_0_T_FLAGS             3
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_EXTENSION_0_T_FORWARDING_DOMAIN 4
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_EXTENSION_0_T_SVP               5
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT          6
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_EXTENSION_0_T_FIELD_NAME_MAP_INIT \
+    {"CLASS_ID_LSB", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_LSB},\
+    {"CLASS_ID_MSB", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_EXTENSION_0_T_CLASS_ID_MSB},\
+    {"DVP_OR_L3_IIF", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_EXTENSION_0_T_DVP_OR_L3_IIF},\
+    {"FLAGS", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_EXTENSION_0_T_FLAGS},\
+    {"FORWARDING_DOMAIN", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_EXTENSION_0_T_FORWARDING_DOMAIN},\
+    {"SVP", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_EXTENSION_0_T_SVP},\
+    {"hg3_extension_0_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT}
+
+/*!
+ * \name HOP_BY_HOP_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HOP_BY_HOP_T_HDR_EXT_LEN 0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HOP_BY_HOP_T_NEXT_HEADER 1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HOP_BY_HOP_T_OPTION      2
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT          3
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HOP_BY_HOP_T_FIELD_NAME_MAP_INIT \
+    {"HDR_EXT_LEN", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HOP_BY_HOP_T_HDR_EXT_LEN},\
+    {"NEXT_HEADER", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HOP_BY_HOP_T_NEXT_HEADER},\
+    {"OPTION", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HOP_BY_HOP_T_OPTION},\
+    {"hop_by_hop_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT}
+
+/*!
+ * \name ICMP_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ICMP_T_CHECKSUM  0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ICMP_T_CODE      1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ICMP_T_ICMP_TYPE 2
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ICMP_T_FID_COUNT          3
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT \
+    {"CHECKSUM", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ICMP_T_CHECKSUM},\
+    {"CODE", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ICMP_T_CODE},\
+    {"ICMP_TYPE", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ICMP_T_ICMP_TYPE},\
+    {"icmp_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ICMP_T_FID_COUNT}
+
+/*!
+ * \name IFA_HEADER_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_HEADER_T_FLAGS      0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_HEADER_T_GNS        1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_HEADER_T_MAX_LENGTH 2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_HEADER_T_NEXT_HDR   3
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_HEADER_T_VER        4
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_HEADER_T_FID_COUNT          5
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_HEADER_T_FIELD_NAME_MAP_INIT \
+    {"FLAGS", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_HEADER_T_FLAGS},\
+    {"GNS", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_HEADER_T_GNS},\
+    {"MAX_LENGTH", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_HEADER_T_MAX_LENGTH},\
+    {"NEXT_HDR", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_HEADER_T_NEXT_HDR},\
+    {"VER", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_HEADER_T_VER},\
+    {"ifa_header_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_HEADER_T_FID_COUNT}
+
+/*!
+ * \name IFA_METADATA_A_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_A_T_CN               0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_A_T_FWD_HDR_TTL      1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_A_T_LNS_DEVICE_ID    2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_A_T_PORT_SPEED       3
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_A_T_QUEUE_ID         4
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_A_T_RX_TIMESTAMP_SEC 5
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_A_T_FID_COUNT          6
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_A_T_FIELD_NAME_MAP_INIT \
+    {"CN", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_A_T_CN},\
+    {"FWD_HDR_TTL", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_A_T_FWD_HDR_TTL},\
+    {"LNS_DEVICE_ID", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_A_T_LNS_DEVICE_ID},\
+    {"PORT_SPEED", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_A_T_PORT_SPEED},\
+    {"QUEUE_ID", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_A_T_QUEUE_ID},\
+    {"RX_TIMESTAMP_SEC", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_A_T_RX_TIMESTAMP_SEC},\
+    {"ifa_metadata_a_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_A_T_FID_COUNT}
+
+/*!
+ * \name IFA_METADATA_B_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_B_T_EGRESS_PORT_ID         0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_B_T_INGRESS_PORT_ID        1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_B_T_MMU_STAT_0             2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_B_T_MMU_STAT_1             3
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_B_T_RESIDENCE_TIME_NANOSEC 4
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_B_T_RX_TIMESTAMP_NANOSEC   5
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_B_T_TX_QUEUE_BYTE_COUNT    6
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_B_T_FID_COUNT          7
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_B_T_FIELD_NAME_MAP_INIT \
+    {"EGRESS_PORT_ID", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_B_T_EGRESS_PORT_ID},\
+    {"INGRESS_PORT_ID", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_B_T_INGRESS_PORT_ID},\
+    {"MMU_STAT_0", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_B_T_MMU_STAT_0},\
+    {"MMU_STAT_1", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_B_T_MMU_STAT_1},\
+    {"RESIDENCE_TIME_NANOSEC", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_B_T_RESIDENCE_TIME_NANOSEC},\
+    {"RX_TIMESTAMP_NANOSEC", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_B_T_RX_TIMESTAMP_NANOSEC},\
+    {"TX_QUEUE_BYTE_COUNT", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_B_T_TX_QUEUE_BYTE_COUNT},\
+    {"ifa_metadata_b_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_B_T_FID_COUNT}
+
+/*!
+ * \name IFA_METADATA_BASE_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_BASE_T_ACTION_VECTOR            0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_BASE_T_HOP_LIMIT_CURRENT_LENGTH 1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_BASE_T_REQUEST_VECTOR           2
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_BASE_T_FID_COUNT          3
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_BASE_T_FIELD_NAME_MAP_INIT \
+    {"ACTION_VECTOR", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_BASE_T_ACTION_VECTOR},\
+    {"HOP_LIMIT_CURRENT_LENGTH", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_BASE_T_HOP_LIMIT_CURRENT_LENGTH},\
+    {"REQUEST_VECTOR", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_BASE_T_REQUEST_VECTOR},\
+    {"ifa_metadata_base_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_BASE_T_FID_COUNT}
+
+/*!
+ * \name IGMP_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IGMP_T_CHECKSUM      0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IGMP_T_GROUP_ADDRESS 1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IGMP_T_IGMP_TYPE     2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IGMP_T_MAX_RESP_TIME 3
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IGMP_T_FID_COUNT          4
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IGMP_T_FIELD_NAME_MAP_INIT \
+    {"CHECKSUM", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IGMP_T_CHECKSUM},\
+    {"GROUP_ADDRESS", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IGMP_T_GROUP_ADDRESS},\
+    {"IGMP_TYPE", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IGMP_T_IGMP_TYPE},\
+    {"MAX_RESP_TIME", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IGMP_T_MAX_RESP_TIME},\
+    {"igmp_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IGMP_T_FID_COUNT}
+
+/*!
+ * \name IOAM_E2E_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IOAM_E2E_T_IOAM_E2E_DATA 0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IOAM_E2E_T_IOAM_E2E_TYPE 1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IOAM_E2E_T_IOAM_HDR_LEN  2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IOAM_E2E_T_NAMESPACE_ID  3
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IOAM_E2E_T_NEXT_PROTOCOL 4
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IOAM_E2E_T_RESERVED      5
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IOAM_E2E_T_TYPE          6
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IOAM_E2E_T_FID_COUNT          7
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IOAM_E2E_T_FIELD_NAME_MAP_INIT \
+    {"IOAM_E2E_DATA", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IOAM_E2E_T_IOAM_E2E_DATA},\
+    {"IOAM_E2E_TYPE", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IOAM_E2E_T_IOAM_E2E_TYPE},\
+    {"IOAM_HDR_LEN", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IOAM_E2E_T_IOAM_HDR_LEN},\
+    {"NAMESPACE_ID", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IOAM_E2E_T_NAMESPACE_ID},\
+    {"NEXT_PROTOCOL", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IOAM_E2E_T_NEXT_PROTOCOL},\
+    {"RESERVED", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IOAM_E2E_T_RESERVED},\
+    {"TYPE", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IOAM_E2E_T_TYPE},\
+    {"ioam_e2e_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IOAM_E2E_T_FID_COUNT}
+
+/*!
+ * \name IPFIX_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPFIX_T_EXPORT_TIME   0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPFIX_T_LENGTH        1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPFIX_T_OBS_DOMAIN_ID 2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPFIX_T_SEQUENCE_NUM  3
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPFIX_T_VERSION       4
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPFIX_T_FID_COUNT          5
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT \
+    {"EXPORT_TIME", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPFIX_T_EXPORT_TIME},\
+    {"LENGTH", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPFIX_T_LENGTH},\
+    {"OBS_DOMAIN_ID", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPFIX_T_OBS_DOMAIN_ID},\
+    {"SEQUENCE_NUM", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPFIX_T_SEQUENCE_NUM},\
+    {"VERSION", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPFIX_T_VERSION},\
+    {"ipfix_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPFIX_T_FID_COUNT}
+
+/*!
+ * \name IPV4_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV4_T_DA                0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET 1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV4_T_HDR_CHECKSUM      2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV4_T_ID                3
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV4_T_OPTION            4
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV4_T_PROTOCOL          5
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV4_T_SA                6
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV4_T_TOS               7
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV4_T_TOTAL_LENGTH      8
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV4_T_TTL               9
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV4_T_VERSION_HDR_LEN   10
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV4_T_FID_COUNT          11
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT \
+    {"DA", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV4_T_DA},\
+    {"FLAGS_FRAG_OFFSET", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV4_T_FLAGS_FRAG_OFFSET},\
+    {"HDR_CHECKSUM", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV4_T_HDR_CHECKSUM},\
+    {"ID", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV4_T_ID},\
+    {"OPTION", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV4_T_OPTION},\
+    {"PROTOCOL", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV4_T_PROTOCOL},\
+    {"SA", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV4_T_SA},\
+    {"TOS", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV4_T_TOS},\
+    {"TOTAL_LENGTH", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV4_T_TOTAL_LENGTH},\
+    {"TTL", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV4_T_TTL},\
+    {"VERSION_HDR_LEN", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV4_T_VERSION_HDR_LEN},\
+    {"ipv4_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV4_T_FID_COUNT}
+
+/*!
+ * \name IPV6_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV6_T_DA             0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV6_T_FLOW_LABEL     1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV6_T_HOP_LIMIT      2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV6_T_NEXT_HEADER    3
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV6_T_PAYLOAD_LENGTH 4
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV6_T_SA             5
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV6_T_TRAFFIC_CLASS  6
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV6_T_VERSION        7
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV6_T_FID_COUNT          8
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT \
+    {"DA", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV6_T_DA},\
+    {"FLOW_LABEL", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV6_T_FLOW_LABEL},\
+    {"HOP_LIMIT", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV6_T_HOP_LIMIT},\
+    {"NEXT_HEADER", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV6_T_NEXT_HEADER},\
+    {"PAYLOAD_LENGTH", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV6_T_PAYLOAD_LENGTH},\
+    {"SA", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV6_T_SA},\
+    {"TRAFFIC_CLASS", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV6_T_TRAFFIC_CLASS},\
+    {"VERSION", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV6_T_VERSION},\
+    {"ipv6_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV6_T_FID_COUNT}
+
+/*!
+ * \name L2_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_L2_T_MACDA 0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_L2_T_MACSA 1
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_L2_T_FID_COUNT          2
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_L2_T_FIELD_NAME_MAP_INIT \
+    {"MACDA", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_L2_T_MACDA},\
+    {"MACSA", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_L2_T_MACSA},\
+    {"l2_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_L2_T_FID_COUNT}
+
+/*!
+ * \name MIRROR_ERSPAN_SN_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM 0
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT          1
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT \
+    {"SEQ_NUM", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MIRROR_ERSPAN_SN_T_SEQ_NUM},\
+    {"mirror_erspan_sn_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT}
+
+/*!
+ * \name MIRROR_TRANSPORT_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MIRROR_TRANSPORT_T_DATA 0
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT          1
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT \
+    {"DATA", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MIRROR_TRANSPORT_T_DATA},\
+    {"mirror_transport_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT}
+
+/*!
+ * \name MPLS_ACH_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_ACH_T_CHANNEL_TYPE 0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_ACH_T_CW_TYPE      1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_ACH_T_RESERVED     2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_ACH_T_VERSION      3
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_ACH_T_FID_COUNT          4
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_ACH_T_FIELD_NAME_MAP_INIT \
+    {"CHANNEL_TYPE", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_ACH_T_CHANNEL_TYPE},\
+    {"CW_TYPE", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_ACH_T_CW_TYPE},\
+    {"RESERVED", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_ACH_T_RESERVED},\
+    {"VERSION", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_ACH_T_VERSION},\
+    {"mpls_ach_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_ACH_T_FID_COUNT}
+
+/*!
+ * \name MPLS_BV_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_BV_T_VALUE 0
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_BV_T_FID_COUNT          1
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_BV_T_FIELD_NAME_MAP_INIT \
+    {"VALUE", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_BV_T_VALUE},\
+    {"mpls_bv_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_BV_T_FID_COUNT}
+
+/*!
+ * \name MPLS_CW_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_CW_T_CW_TYPE    0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_CW_T_RESERVED   1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_CW_T_SEQ_NUMBER 2
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_CW_T_FID_COUNT          3
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_CW_T_FIELD_NAME_MAP_INIT \
+    {"CW_TYPE", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_CW_T_CW_TYPE},\
+    {"RESERVED", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_CW_T_RESERVED},\
+    {"SEQ_NUMBER", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_CW_T_SEQ_NUMBER},\
+    {"mpls_cw_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_CW_T_FID_COUNT}
+
+/*!
+ * \name MPLS_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_T_BOS   0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_T_EXP   1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_T_LABEL 2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_T_TTL   3
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_T_FID_COUNT          4
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_T_FIELD_NAME_MAP_INIT \
+    {"BOS", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_T_BOS},\
+    {"EXP", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_T_EXP},\
+    {"LABEL", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_T_LABEL},\
+    {"TTL", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_T_TTL},\
+    {"mpls_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_T_FID_COUNT}
+
+/*!
+ * \name P_1588_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_P_1588_T_CNTRL          0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_P_1588_T_CORRECTION     1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_P_1588_T_DOMAIN_NB      2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_P_1588_T_FLAGS          3
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_P_1588_T_LOGMSGINTERVAL 4
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_P_1588_T_MSG_LENGTH     5
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_P_1588_T_MSG_TYPE       6
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_P_1588_T_RESERVED1      7
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_P_1588_T_RESERVED2      8
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_P_1588_T_RESERVED3      9
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_P_1588_T_SEQ_ID         10
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_P_1588_T_SRCPORTID      11
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_P_1588_T_TRANSPORTSPEC  12
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_P_1588_T_VERSION        13
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_P_1588_T_FID_COUNT          14
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_P_1588_T_FIELD_NAME_MAP_INIT \
+    {"CNTRL", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_P_1588_T_CNTRL},\
+    {"CORRECTION", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_P_1588_T_CORRECTION},\
+    {"DOMAIN_NB", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_P_1588_T_DOMAIN_NB},\
+    {"FLAGS", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_P_1588_T_FLAGS},\
+    {"LOGMSGINTERVAL", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_P_1588_T_LOGMSGINTERVAL},\
+    {"MSG_LENGTH", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_P_1588_T_MSG_LENGTH},\
+    {"MSG_TYPE", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_P_1588_T_MSG_TYPE},\
+    {"RESERVED1", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_P_1588_T_RESERVED1},\
+    {"RESERVED2", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_P_1588_T_RESERVED2},\
+    {"RESERVED3", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_P_1588_T_RESERVED3},\
+    {"SEQ_ID", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_P_1588_T_SEQ_ID},\
+    {"SRCPORTID", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_P_1588_T_SRCPORTID},\
+    {"TRANSPORTSPEC", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_P_1588_T_TRANSPORTSPEC},\
+    {"VERSION", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_P_1588_T_VERSION},\
+    {"p_1588_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_P_1588_T_FID_COUNT}
+
+/*!
+ * \name PROG_EXT_HDR_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PROG_EXT_HDR_T_HDR_EXT_LEN 0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PROG_EXT_HDR_T_NEXT_HEADER 1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PROG_EXT_HDR_T_OPTION      2
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT          3
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PROG_EXT_HDR_T_FIELD_NAME_MAP_INIT \
+    {"HDR_EXT_LEN", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PROG_EXT_HDR_T_HDR_EXT_LEN},\
+    {"NEXT_HEADER", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PROG_EXT_HDR_T_NEXT_HEADER},\
+    {"OPTION", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PROG_EXT_HDR_T_OPTION},\
+    {"prog_ext_hdr_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_0_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_0_T_FLOWSET        0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_0_T_LENGTH         1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_0_T_NEXT_HOP_INDEX 2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_0_T_OBS_TIME_NS    3
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_0_T_OBS_TIME_S     4
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_0_T_TEMPLATE_ID    5
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_0_T_FID_COUNT          6
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_0_T_FIELD_NAME_MAP_INIT \
+    {"FLOWSET", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_0_T_FLOWSET},\
+    {"LENGTH", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_0_T_LENGTH},\
+    {"NEXT_HOP_INDEX", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_0_T_NEXT_HOP_INDEX},\
+    {"OBS_TIME_NS", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_0_T_OBS_TIME_NS},\
+    {"OBS_TIME_S", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_0_T_OBS_TIME_S},\
+    {"TEMPLATE_ID", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_0_T_TEMPLATE_ID},\
+    {"psamp_0_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_0_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_1_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_1_T_DLB_ID         0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_1_T_EGRESS_PORT    1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_1_T_EPOCH          2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_1_T_INGRESS_PORT   3
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_1_T_SAMPLED_LENGTH 4
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_1_T_USER_META_DATA 5
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_1_T_VARIABLE_FLAG  6
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_1_T_FID_COUNT          7
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_1_T_FIELD_NAME_MAP_INIT \
+    {"DLB_ID", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_1_T_DLB_ID},\
+    {"EGRESS_PORT", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_1_T_EGRESS_PORT},\
+    {"EPOCH", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_1_T_EPOCH},\
+    {"INGRESS_PORT", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_1_T_INGRESS_PORT},\
+    {"SAMPLED_LENGTH", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_1_T_SAMPLED_LENGTH},\
+    {"USER_META_DATA", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_1_T_USER_META_DATA},\
+    {"VARIABLE_FLAG", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_1_T_VARIABLE_FLAG},\
+    {"psamp_1_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_1_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_MIRROR_ON_DROP_0_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT 0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT    1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH          2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS     3
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S      4
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID       5
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID     6
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT          7
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT \
+    {"EGRESS_MOD_PORT", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_EGRESS_MOD_PORT},\
+    {"INGRESS_PORT", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_INGRESS_PORT},\
+    {"LENGTH", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_LENGTH},\
+    {"OBS_TIME_NS", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_NS},\
+    {"OBS_TIME_S", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_OBS_TIME_S},\
+    {"SWITCH_ID", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_SWITCH_ID},\
+    {"TEMPLATE_ID", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_TEMPLATE_ID},\
+    {"psamp_mirror_on_drop_0_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_MIRROR_ON_DROP_3_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_DROP_REASON             0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_RESERVED_0              1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SAMPLED_LENGTH          2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SMOD_STATE              3
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_UC_COS__COLOR__PROB_IDX 4
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_USER_META_DATA          5
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_VAR_LEN_INDICATOR       6
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT          7
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FIELD_NAME_MAP_INIT \
+    {"DROP_REASON", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_DROP_REASON},\
+    {"RESERVED_0", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_RESERVED_0},\
+    {"SAMPLED_LENGTH", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SAMPLED_LENGTH},\
+    {"SMOD_STATE", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_SMOD_STATE},\
+    {"UC_COS__COLOR__PROB_IDX", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_UC_COS__COLOR__PROB_IDX},\
+    {"USER_META_DATA", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_USER_META_DATA},\
+    {"VAR_LEN_INDICATOR", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_VAR_LEN_INDICATOR},\
+    {"psamp_mirror_on_drop_3_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_POSTCARD_0_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_0_T_EGRESS_MOD_PORT 0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_0_T_INGRESS_PORT    1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_0_T_OBS_TIME_NS     2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_0_T_OBS_TIME_S      3
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_0_T_PSAMP_LENGTH    4
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_0_T_TEMPLATE_ID     5
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_0_T_FID_COUNT          6
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_0_T_FIELD_NAME_MAP_INIT \
+    {"EGRESS_MOD_PORT", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_0_T_EGRESS_MOD_PORT},\
+    {"INGRESS_PORT", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_0_T_INGRESS_PORT},\
+    {"OBS_TIME_NS", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_0_T_OBS_TIME_NS},\
+    {"OBS_TIME_S", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_0_T_OBS_TIME_S},\
+    {"PSAMP_LENGTH", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_0_T_PSAMP_LENGTH},\
+    {"TEMPLATE_ID", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_0_T_TEMPLATE_ID},\
+    {"psamp_postcard_0_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_0_T_FID_COUNT}
+
+/*!
+ * \name PSAMP_POSTCARD_1_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_1_T_COLOR_IDX_COS_DROPLOC 0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_1_T_DROP_REASON_CODE      1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_1_T_MMU_STAT_0            2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_1_T_MMU_STAT_1            3
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_1_T_QUEUE_ID              4
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_1_T_RESERVED_1            5
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_1_T_RESIDENCE_TIME        6
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_1_T_SAMPLED_LENGTH        7
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_1_T_VAR_LEN_INDICATOR     8
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_1_T_FID_COUNT          9
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_1_T_FIELD_NAME_MAP_INIT \
+    {"COLOR_IDX_COS_DROPLOC", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_1_T_COLOR_IDX_COS_DROPLOC},\
+    {"DROP_REASON_CODE", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_1_T_DROP_REASON_CODE},\
+    {"MMU_STAT_0", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_1_T_MMU_STAT_0},\
+    {"MMU_STAT_1", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_1_T_MMU_STAT_1},\
+    {"QUEUE_ID", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_1_T_QUEUE_ID},\
+    {"RESERVED_1", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_1_T_RESERVED_1},\
+    {"RESIDENCE_TIME", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_1_T_RESIDENCE_TIME},\
+    {"SAMPLED_LENGTH", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_1_T_SAMPLED_LENGTH},\
+    {"VAR_LEN_INDICATOR", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_1_T_VAR_LEN_INDICATOR},\
+    {"psamp_postcard_1_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_1_T_FID_COUNT}
+
+/*!
+ * \name RARP_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RARP_T_HARDWARE_LEN  0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RARP_T_HARDWARE_TYPE 1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RARP_T_OPERATION     2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RARP_T_PROT_ADDR_LEN 3
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RARP_T_PROTOCOL_TYPE 4
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RARP_T_SENDER_HA     5
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RARP_T_SENDER_IP     6
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RARP_T_TARGET_HA     7
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RARP_T_TARGET_IP     8
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RARP_T_FID_COUNT          9
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT \
+    {"HARDWARE_LEN", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RARP_T_HARDWARE_LEN},\
+    {"HARDWARE_TYPE", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RARP_T_HARDWARE_TYPE},\
+    {"OPERATION", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RARP_T_OPERATION},\
+    {"PROT_ADDR_LEN", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RARP_T_PROT_ADDR_LEN},\
+    {"PROTOCOL_TYPE", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RARP_T_PROTOCOL_TYPE},\
+    {"SENDER_HA", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RARP_T_SENDER_HA},\
+    {"SENDER_IP", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RARP_T_SENDER_IP},\
+    {"TARGET_HA", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RARP_T_TARGET_HA},\
+    {"TARGET_IP", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RARP_T_TARGET_IP},\
+    {"rarp_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RARP_T_FID_COUNT}
+
+/*!
+ * \name ROUTING_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ROUTING_T_DATA          0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ROUTING_T_HDR_EXT_LEN   1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ROUTING_T_NEXT_HEADER   2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ROUTING_T_ROUTING_TYPE  3
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ROUTING_T_SEGMENTS_LEFT 4
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ROUTING_T_FID_COUNT          5
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ROUTING_T_FIELD_NAME_MAP_INIT \
+    {"DATA", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ROUTING_T_DATA},\
+    {"HDR_EXT_LEN", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ROUTING_T_HDR_EXT_LEN},\
+    {"NEXT_HEADER", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ROUTING_T_NEXT_HEADER},\
+    {"ROUTING_TYPE", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ROUTING_T_ROUTING_TYPE},\
+    {"SEGMENTS_LEFT", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ROUTING_T_SEGMENTS_LEFT},\
+    {"routing_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ROUTING_T_FID_COUNT}
+
+/*!
+ * \name RSPAN_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RSPAN_T_TAG  0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RSPAN_T_TPID 1
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RSPAN_T_FID_COUNT          2
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RSPAN_T_FIELD_NAME_MAP_INIT \
+    {"TAG", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RSPAN_T_TAG},\
+    {"TPID", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RSPAN_T_TPID},\
+    {"rspan_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RSPAN_T_FID_COUNT}
+
+/*!
+ * \name SFLOW_SHIM_0_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_0_T_SYS_DESTINATION 0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_0_T_SYS_SOURCE      1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_0_T_VERSION         2
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT          3
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_0_T_FIELD_NAME_MAP_INIT \
+    {"SYS_DESTINATION", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_0_T_SYS_DESTINATION},\
+    {"SYS_SOURCE", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_0_T_SYS_SOURCE},\
+    {"VERSION", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_0_T_VERSION},\
+    {"sflow_shim_0_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT}
+
+/*!
+ * \name SFLOW_SHIM_1_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DEST_SAMPLE 0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DISCARDED   1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_FLEX_SAMPLE 2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_MCAST       3
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_SRC_SAMPLE  4
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_TRUNCATED   5
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_1_T_RESERVED         6
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_1_T_SYS_OPCODE       7
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT          8
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_1_T_FIELD_NAME_MAP_INIT \
+    {"FLAG_DEST_SAMPLE", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DEST_SAMPLE},\
+    {"FLAG_DISCARDED", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_DISCARDED},\
+    {"FLAG_FLEX_SAMPLE", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_FLEX_SAMPLE},\
+    {"FLAG_MCAST", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_MCAST},\
+    {"FLAG_SRC_SAMPLE", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_SRC_SAMPLE},\
+    {"FLAG_TRUNCATED", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_1_T_FLAG_TRUNCATED},\
+    {"RESERVED", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_1_T_RESERVED},\
+    {"SYS_OPCODE", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_1_T_SYS_OPCODE},\
+    {"sflow_shim_1_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT}
+
+/*!
+ * \name SFLOW_SHIM_2_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_2_T_SEQUENCE_NUM   0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_2_T_USER_META_DATA 1
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT          2
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_2_T_FIELD_NAME_MAP_INIT \
+    {"SEQUENCE_NUM", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_2_T_SEQUENCE_NUM},\
+    {"USER_META_DATA", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_2_T_USER_META_DATA},\
+    {"sflow_shim_2_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT}
+
+/*!
+ * \name SNAP_LLC_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SNAP_LLC_T_LENGTH   0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SNAP_LLC_T_SNAP_LLC 1
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SNAP_LLC_T_FID_COUNT          2
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SNAP_LLC_T_FIELD_NAME_MAP_INIT \
+    {"LENGTH", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SNAP_LLC_T_LENGTH},\
+    {"SNAP_LLC", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SNAP_LLC_T_SNAP_LLC},\
+    {"snap_llc_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SNAP_LLC_T_FID_COUNT}
+
+/*!
+ * \name TCP_FIRST_4BYTES_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT 0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT 1
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT          2
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT \
+    {"DST_PORT", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_TCP_FIRST_4BYTES_T_DST_PORT},\
+    {"SRC_PORT", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_TCP_FIRST_4BYTES_T_SRC_PORT},\
+    {"tcp_first_4bytes_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT}
+
+/*!
+ * \name TCP_LAST_16BYTES_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM           0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM          1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS 2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM           3
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR        4
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE          5
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT          6
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT \
+    {"ACK_NUM", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_TCP_LAST_16BYTES_T_ACK_NUM},\
+    {"CHECKSUM", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_TCP_LAST_16BYTES_T_CHECKSUM},\
+    {"HDR_LEN_AND_FLAGS", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_TCP_LAST_16BYTES_T_HDR_LEN_AND_FLAGS},\
+    {"SEQ_NUM", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_TCP_LAST_16BYTES_T_SEQ_NUM},\
+    {"URGENT_PTR", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_TCP_LAST_16BYTES_T_URGENT_PTR},\
+    {"WIN_SIZE", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_TCP_LAST_16BYTES_T_WIN_SIZE},\
+    {"tcp_last_16bytes_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT}
+
+/*!
+ * \name UDP_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UDP_T_CHECKSUM   0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UDP_T_DST_PORT   1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UDP_T_SRC_PORT   2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UDP_T_UDP_LENGTH 3
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UDP_T_FID_COUNT          4
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT \
+    {"CHECKSUM", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UDP_T_CHECKSUM},\
+    {"DST_PORT", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UDP_T_DST_PORT},\
+    {"SRC_PORT", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UDP_T_SRC_PORT},\
+    {"UDP_LENGTH", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UDP_T_UDP_LENGTH},\
+    {"udp_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UDP_T_FID_COUNT}
+
+/*!
+ * \name UNKNOWN_L3_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD 0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD  1
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT          2
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT \
+    {"FIRST_16BYTES_OF_L3_PAYLOAD", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L3_T_FIRST_16BYTES_OF_L3_PAYLOAD},\
+    {"NEXT_16BYTES_OF_L3_PAYLOAD", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L3_T_NEXT_16BYTES_OF_L3_PAYLOAD},\
+    {"unknown_l3_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT}
+
+/*!
+ * \name UNKNOWN_L4_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD 0
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT          1
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT \
+    {"FIRST_4BYTES_OF_L4_PAYLOAD", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L4_T_FIRST_4BYTES_OF_L4_PAYLOAD},\
+    {"unknown_l4_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT}
+
+/*!
+ * \name UNKNOWN_L5_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1 0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3 1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7 2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_8_9 3
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT          4
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT \
+    {"L5_BYTES_0_1", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_0_1},\
+    {"L5_BYTES_2_3", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_2_3},\
+    {"L5_BYTES_4_7", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_4_7},\
+    {"L5_BYTES_8_9", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L5_T_L5_BYTES_8_9},\
+    {"unknown_l5_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT}
+
+/*!
+ * \name VLAN_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_VLAN_T_CFI  0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_VLAN_T_PCP  1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_VLAN_T_TPID 2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_VLAN_T_VID  3
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_VLAN_T_FID_COUNT          4
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT \
+    {"CFI", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_VLAN_T_CFI},\
+    {"PCP", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_VLAN_T_PCP},\
+    {"TPID", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_VLAN_T_TPID},\
+    {"VID", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_VLAN_T_VID},\
+    {"vlan_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_VLAN_T_FID_COUNT}
+
+/*!
+ * \name VXLAN_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_VXLAN_T_FLAGS_RESERVED_1 0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_VXLAN_T_RESERVED2        1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_VXLAN_T_VN_ID            2
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_VXLAN_T_FID_COUNT          3
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT \
+    {"FLAGS_RESERVED_1", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_VXLAN_T_FLAGS_RESERVED_1},\
+    {"RESERVED2", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_VXLAN_T_RESERVED2},\
+    {"VN_ID", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_VXLAN_T_VN_ID},\
+    {"vxlan_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_VXLAN_T_FID_COUNT}
+
+/*!
+ * \name WESP_T field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_WESP_T_FLAGS       0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_WESP_T_HEADER_LEN  1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_WESP_T_NEXT_HEADER 2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_WESP_T_SEQ_NUM     3
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_WESP_T_SPI         4
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_WESP_T_TRAILER_LEN 5
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_WESP_T_WESP_IV     6
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_WESP_T_FID_COUNT          7
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_WESP_T_FIELD_NAME_MAP_INIT \
+    {"FLAGS", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_WESP_T_FLAGS},\
+    {"HEADER_LEN", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_WESP_T_HEADER_LEN},\
+    {"NEXT_HEADER", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_WESP_T_NEXT_HEADER},\
+    {"SEQ_NUM", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_WESP_T_SEQ_NUM},\
+    {"SPI", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_WESP_T_SPI},\
+    {"TRAILER_LEN", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_WESP_T_TRAILER_LEN},\
+    {"WESP_IV", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_WESP_T_WESP_IV},\
+    {"wesp_t fid count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_WESP_T_FID_COUNT}
+
+
+#endif /* BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_FLEXHDR_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_bcmpkt_rxpmd_flex_data.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_bcmpkt_rxpmd_flex_data.h
new file mode 100644
index 000000000000..917492f1e1f1
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_bcmpkt_rxpmd_flex_data.h
@@ -0,0 +1,186 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) map.yml.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_DATA_H
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_DATA_H
+
+/*!
+ * \name RX flex metadata field IDs.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_ALLOW_NAT_3_0                                  0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_DLB_ECMP_DESTINATION_15_0                      1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_DNAT_CTRL_3_0                                  2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0                                 3
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_DVP_15_0                                       4
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_AND_SNAT_CTRL_15_0               5
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_EM_FT_OPAQUE_OBJ_OR_IFP_OPAQUE_OBJ_15_0        6
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_HIGH_3_0                         7
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0                         8
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_EP_NIH_DROP_CODE_OR_IFP_OPAQUE_OBJ_15_0        9
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_RECIRC_CODE_3_0                     10
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_15_0                      11
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_31_16                     12
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_15_0                        13
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_16                       14
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32                       15
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0                              16
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_IFP_IOAM_GBP_ACTION_3_0                        17
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_IFP_TS_CONTROL_ACTION_3_0                      18
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_15_0                             19
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_16                            20
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_INGRESS_PP_PORT_7_0                            21
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0 22
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0                    23
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_INT_PRI_3_0                                    24
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_L2_IIF_11_0                                    25
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_L2_OIF_11_0                                    26
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_L3_DNAT_INDEX_15_0                             27
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_L3_IIF_13_0                                    28
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0                                  29
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_L3_SNAT_INDEX_15_0                             30
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_MAC_DA_23_20_3_0                               31
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_MPLS_LABEL_DECAP_COUNT_3_0                     32
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0              33
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_15_0                              34
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0                            35
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0                            36
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_SVP_15_0                                       37
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0                   38
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0                        39
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0                              40
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_SYSTEM_SOURCE_15_0                             41
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_TIMESTAMP_CTRL_3_0                             42
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0                43
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_VFI_15_0                                       44
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_VLAN_TAG_PRESERVE_CTRL_SVP_MIRROR_ENABLE_3_0   45
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_FID_COUNT                       46
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_COUNT                    47
+
+/*!
+ * \name Packet Flex Reason Types.
+ */
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE                         0
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS                               1
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED 2
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED                    3
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED  4
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED                     5
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP                                  6
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT                                   7
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_IDEV_CONFIG_TO_CPU                      8
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_IFP                                     9
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER                               10
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED      11
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT                                   12
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP                           13
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS                      14
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE                      15
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP                           16
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS                      17
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR                            18
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF                        19
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR                            20
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL                        21
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD                    22
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0                      23
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1                      24
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2                      25
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3                      26
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4                      27
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5                      28
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6                      29
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7                      30
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED                 31
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED              32
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED                  33
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU                    34
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU                          35
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED              36
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT                            37
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP                                38
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED              39
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_SRV6                                    40
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_SVP                                     41
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP                               42
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU                43
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR                     44
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED                       45
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_VFP                                     46
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT \
+    {"CB_STATION_MOVE", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE},\
+    {"CML_FLAGS", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS},\
+    {"DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED},\
+    {"DLB_ECMP_PKT_SAMPLED", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED},\
+    {"DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED},\
+    {"DLB_LAG_PKT_SAMPLED", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED},\
+    {"DST_FP", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP},\
+    {"EM_FT", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT},\
+    {"IDEV_CONFIG_TO_CPU", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_IDEV_CONFIG_TO_CPU},\
+    {"IFP", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_IFP},\
+    {"IFP_METER", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER},\
+    {"IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED},\
+    {"IVXLT", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT},\
+    {"L2_DST_LOOKUP", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP},\
+    {"L2_DST_LOOKUP_MISS", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS},\
+    {"L2_SRC_STATIC_MOVE", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE},\
+    {"L3_DST_LOOKUP", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP},\
+    {"L3_DST_LOOKUP_MISS", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS},\
+    {"L3_HDR_ERROR", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR},\
+    {"L3_IIF_EQ_L3_OIF", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF},\
+    {"L3_TTL_ERROR", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR},\
+    {"LEARN_CACHE_FULL", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL},\
+    {"MACSA_MULTICAST_RSVD", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD},\
+    {"MATCHED_RULE_BIT_0", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0},\
+    {"MATCHED_RULE_BIT_1", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1},\
+    {"MATCHED_RULE_BIT_2", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2},\
+    {"MATCHED_RULE_BIT_3", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3},\
+    {"MATCHED_RULE_BIT_4", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4},\
+    {"MATCHED_RULE_BIT_5", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5},\
+    {"MATCHED_RULE_BIT_6", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6},\
+    {"MATCHED_RULE_BIT_7", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7},\
+    {"MEMBERSHIP_CHECK_FAILED", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED},\
+    {"MIRROR_SAMPLER_EGR_SAMPLED", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED},\
+    {"MIRROR_SAMPLER_SAMPLED", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED},\
+    {"MPLS_CTRL_PKT_TO_CPU", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU},\
+    {"NO_COPY_TO_CPU", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU},\
+    {"PKT_INTEGRITY_CHECK_FAILED", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED},\
+    {"PROTOCOL_PKT", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT},\
+    {"SER_DROP", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP},\
+    {"SPANNING_TREE_CHECK_FAILED", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED},\
+    {"SRV6", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_SRV6},\
+    {"SVP", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_SVP},\
+    {"TRACE_DOP", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP},\
+    {"TRACE_DO_NOT_COPY_TO_CPU", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU},\
+    {"TRACE_DO_NOT_MIRROR", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR},\
+    {"URPF_CHECK_FAILED", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED},\
+    {"VFP", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_VFP},\
+    {"flex reason count", BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_COUNT}
+
+#endif /* BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_DATA_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_bcmpkt_rxpmd_match_id_defs.h b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_bcmpkt_rxpmd_match_id_defs.h
new file mode 100644
index 000000000000..153181c728c9
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/include/bcmpkt/xfcr/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_bcmpkt_rxpmd_match_id_defs.h
@@ -0,0 +1,509 @@
+/*****************************************************************
+ *
+ * DO NOT EDIT THIS FILE!
+ * This file is auto-generated by xfc_map_parser
+ * from the NPL output file(s) bcm78800_a0_dna_6_5_31_5_0_sf_match_id_info.yml
+ * for device bcm78800_a0 and variant dna_6_5_31_5_0.
+ * Edits to this file will be lost when it is regenerated.
+ *
+ * $Id: $
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ * All Rights Reserved.$
+ *
+ * Tool Path: $SDK/INTERNAL/fltg/xfc_map_parser
+ *
+ ****************************************************************/
+
+#ifndef BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H
+
+#include <bcmpkt/bcmpkt_rxpmd_match_id.h>
+
+/*!
+ * \brief Get the Match ID DataBase information.
+ *
+ * \retval bcmpkt_rxpmd_match_id_db_info_t Match ID DataBase information.
+*/
+extern bcmpkt_rxpmd_match_id_db_info_t *
+    bcm78800_a0_dna_6_5_31_5_0_rxpmd_match_id_db_info_get(void);
+
+/*!
+ * \brief Get the Match ID Mapping information.
+ *
+ * \retval bcmpkt_rxpmd_match_id_map_info_t Match ID Mapping information.
+*/
+extern bcmpkt_rxpmd_match_id_map_info_t *
+    bcm78800_a0_dna_6_5_31_5_0_rxpmd_match_id_map_info_get(void);
+
+/*!
+  \name RXPMD Match IDs
+*/
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_CNTAG  0
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_GBP_ETHERNET_SHIM  1
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_BASE  2
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0  3
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG  4
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2  5
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE  6
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG  7
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC  8
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP  9
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1  10
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2  11
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD  12
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DCN  13
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_1  14
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_2  15
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT  16
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE  17
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1  18
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2  19
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE  20
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE  21
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM  22
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY  23
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT  24
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ  25
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_1  26
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_2  27
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP  28
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_HEADER  29
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA_BASE  30
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP  31
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IOAM_E2E  32
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4  33
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6  34
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0  35
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1  36
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2  37
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3  38
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4  39
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5  40
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6  41
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH  42
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW  43
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE  44
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588  45
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_1  46
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_2  47
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP  48
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_1  49
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_2  50
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES  51
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES  52
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP  53
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3  54
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4  55
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5  56
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN  57
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_1  58
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_2  59
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH  60
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK  61
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE  62
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_CNTAG  63
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_GBP_ETHERNET_SHIM  64
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE  65
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0  66
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG  67
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2  68
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE  69
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG  70
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC  71
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP  72
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1  73
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2  74
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD  75
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DCN  76
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_1  77
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_2  78
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT  79
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE  80
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1  81
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2  82
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE  83
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE  84
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM  85
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY  86
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT  87
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ  88
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_1  89
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_2  90
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP  91
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_HEADER  92
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA_BASE  93
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP  94
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IOAM_E2E  95
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4  96
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6  97
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0  98
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1  99
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2  100
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3  101
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4  102
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5  103
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6  104
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH  105
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW  106
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE  107
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588  108
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_1  109
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_2  110
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP  111
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_1  112
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_2  113
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES  114
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES  115
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP  116
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3  117
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4  118
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5  119
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN  120
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_1  121
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_2  122
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_CNTAG  123
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG  124
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2  125
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE  126
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG  127
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC  128
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP  129
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1  130
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2  131
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD  132
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_1  133
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_2  134
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT  135
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE  136
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1  137
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2  138
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_1  139
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_2  140
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP  141
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_HEADER  142
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA_BASE  143
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP  144
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4  145
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6  146
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE  147
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588  148
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_1  149
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_2  150
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP  151
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_1  152
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_2  153
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES  154
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES  155
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP  156
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3  157
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4  158
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5  159
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_1  160
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_2  161
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_CNTAG  162
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_GBP_ETHERNET_SHIM  163
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_BASE  164
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0  165
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG  166
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2  167
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE  168
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG  169
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC  170
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP  171
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1  172
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2  173
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD  174
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DCN  175
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_1  176
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_2  177
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT  178
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE  179
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1  180
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2  181
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE  182
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE  183
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM  184
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY  185
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT  186
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ  187
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_1  188
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_2  189
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP  190
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_HEADER  191
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA_BASE  192
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP  193
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IOAM_E2E  194
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4  195
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6  196
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0  197
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1  198
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2  199
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3  200
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4  201
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5  202
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6  203
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH  204
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW  205
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE  206
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588  207
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_1  208
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_2  209
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP  210
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_1  211
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_2  212
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES  213
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES  214
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP  215
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3  216
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4  217
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5  218
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN  219
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_1  220
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_2  221
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH  222
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK  223
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE  224
+#define BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_COUNT  225
+
+#define BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT \
+    {"EGRESS_PKT_FWD_L2_HDR_CNTAG", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_CNTAG}, \
+    {"EGRESS_PKT_FWD_L2_HDR_GBP_ETHERNET_SHIM", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_GBP_ETHERNET_SHIM}, \
+    {"EGRESS_PKT_FWD_L2_HDR_HG3_BASE", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_BASE}, \
+    {"EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0}, \
+    {"EGRESS_PKT_FWD_L2_HDR_ITAG", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG}, \
+    {"EGRESS_PKT_FWD_L2_HDR_L2", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2}, \
+    {"EGRESS_PKT_FWD_L2_HDR_NONE", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE}, \
+    {"EGRESS_PKT_FWD_L2_HDR_OTAG", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG}, \
+    {"EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ARP", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_BFD", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_DCN", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DCN}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_1", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_2", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_2}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GPE", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_1", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_2", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_2}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ICMP", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IFA_HEADER", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_HEADER}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA_BASE", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA_BASE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IGMP", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IOAM_E2E", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IOAM_E2E}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV4", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_IPV6", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS0", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS1", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS2", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS3", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS4", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS5", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS6", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_NONE", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_P_1588", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_1", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_2", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_2}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_RARP", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_1", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_2", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_2}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UDP", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_VXLAN", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_1", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_1}, \
+    {"EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_2", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_2}, \
+    {"EGRESS_PKT_SYS_HDR_EP_NIH", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH}, \
+    {"EGRESS_PKT_SYS_HDR_LOOPBACK", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK}, \
+    {"EGRESS_PKT_SYS_HDR_NONE", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_CNTAG", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_CNTAG}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_GBP_ETHERNET_SHIM", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_GBP_ETHERNET_SHIM}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_ITAG", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_L2", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_NONE", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_OTAG", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG}, \
+    {"EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_DCN", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DCN}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_1", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_2", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_2}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_1", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_2", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_2}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_HEADER", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_HEADER}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA_BASE", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA_BASE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IOAM_E2E", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IOAM_E2E}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_1", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_2", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_2}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_1", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_2", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_2}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_1", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_1}, \
+    {"EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_2", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_2}, \
+    {"INGRESS_PKT_INNER_L2_HDR_CNTAG", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_CNTAG}, \
+    {"INGRESS_PKT_INNER_L2_HDR_ITAG", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG}, \
+    {"INGRESS_PKT_INNER_L2_HDR_L2", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2}, \
+    {"INGRESS_PKT_INNER_L2_HDR_NONE", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE}, \
+    {"INGRESS_PKT_INNER_L2_HDR_OTAG", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG}, \
+    {"INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ARP", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_BFD", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_1", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_1}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_2", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_2}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_1", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_1}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_2", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_2}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ICMP", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_IFA_HEADER", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_HEADER}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA_BASE", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA_BASE}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_IGMP", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV4", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_IPV6", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_NONE", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_P_1588", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_1", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_1}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_2", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_2}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_RARP", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_1", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_1}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_2", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_2}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UDP", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_1", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_1}, \
+    {"INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_2", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_2}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_CNTAG", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_CNTAG}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_GBP_ETHERNET_SHIM", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_GBP_ETHERNET_SHIM}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_HG3_BASE", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_BASE}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_ITAG", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_L2", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_NONE", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_OTAG", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG}, \
+    {"INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ARP", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_BFD", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_DCN", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DCN}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_1", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_2", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_2}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GPE", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_1", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_2", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_2}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ICMP", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IFA_HEADER", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_HEADER}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA_BASE", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA_BASE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IGMP", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IOAM_E2E", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IOAM_E2E}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV4", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_IPV6", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_NONE", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_P_1588", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_1", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_2", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_2}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_RARP", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_1", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_2", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_2}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UDP", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_1", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_1}, \
+    {"INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_2", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_2}, \
+    {"INGRESS_PKT_SYS_HDR_EP_NIH", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH}, \
+    {"INGRESS_PKT_SYS_HDR_LOOPBACK", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK}, \
+    {"INGRESS_PKT_SYS_HDR_NONE", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE}, \
+    {"rxpmd_match_id_count", BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_COUNT}
+
+#endif /*! BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_MATCH_ID_DEFS_H */
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_bcmpkt_rxpmd_match_id.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_bcmpkt_rxpmd_match_id.c
similarity index 56%
rename from platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_bcmpkt_rxpmd_match_id.c
rename to platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_bcmpkt_rxpmd_match_id.c
index 4c975bc2cbc6..dcfb0a09bb87 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_bcmpkt_rxpmd_match_id.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_bcmpkt_rxpmd_match_id.c
@@ -2,8 +2,8 @@
  *
  * DO NOT EDIT THIS FILE!
  * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) bcm56690_a0_dna_6_5_29_0_1_sf_match_id_info.yml
- * for device bcm56690_a0 and variant dna_6_5_29_0_1.
+ * from the NPL output file(s) bcm56690_a0_dna_6_5_31_7_0_sf_match_id_info.yml
+ * for device bcm56690_a0 and variant dna_6_5_31_7_0.
  * Edits to this file will be lost when it is regenerated.
  *
  * $Id: $
@@ -29,50 +29,51 @@
 
 
 #include <bcmpkt/bcmpkt_rxpmd_match_id.h>
-#include <bcmpkt/xfcr/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_bcmpkt_rxpmd_match_id_defs.h>
+#include <bcmpkt/xfcr/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_bcmpkt_rxpmd_match_id_defs.h>
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l2_hdr_cntag[1] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_cntag[1] =
 {
     0x366c,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l2_hdr_itag[1] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_itag[1] =
 {
     0x78f0,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l2_hdr_l2[1] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_l2[1] =
 {
     0x1fffe,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l2_hdr_otag[1] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_otag[1] =
 {
     0xff00,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l2_hdr_snap_or_llc[1] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_snap_or_llc[1] =
 {
     0x1e4c8,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_arp[1] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_arp[1] =
 {
     0x4,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_auth_ext_1[32] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_auth_ext_1[39] =
 {
     0x10,
-    0x4000,
-    0x2007f8,
+    0x400000,
+    0x1dd8000,
+    0x20,
     0x0,
     0x0,
-    0xfff00000,
-    0xffffffff,
-    0xffffffff,
-    0x1f,
     0x0,
+    0xbfddfddf,
+    0xf77fbbfb,
+    0xddfddf77,
+    0x1,
     0x0,
     0x0,
     0x0,
@@ -86,118 +87,144 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x10000,
-    0x4000000,
-    0x7f8000,
-    0x2,
     0x0,
     0x0,
-    0xffffffff,
-    0xffffffff,
-    0x1ffff,
+    0x0,
+    0x0,
+    0x400000,
+    0x0,
+    0x100,
+    0x800776,
+    0x0,
+    0x0,
+    0x0,
+    0xf77c0000,
+    0xefeeff77,
+    0x7ddfddfe,
+    0x777f7,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_auth_ext_2[45] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_auth_ext_2[55] =
 {
     0x0,
     0x0,
     0x0,
     0x0,
     0x0,
-    0x7fe00000,
     0x0,
     0x0,
-    0x1ff80,
+    0x1dde,
     0x0,
-    0xfe000000,
-    0x7,
     0x0,
-    0x3ff,
+    0x7778,
     0x0,
-    0xffc0000,
     0x0,
+    0x1dde0,
     0x0,
-    0x1ff8,
+    0xbc000000,
+    0x3b,
     0x0,
-    0xf0000000,
-    0x3f,
     0x0,
+    0x3bbc0,
     0x0,
     0x0,
+    0x77780,
     0x0,
     0x0,
+    0x3bbc0000,
     0x0,
     0x0,
-    0x7fe,
     0x0,
-    0x1ff80000,
     0x0,
     0x0,
-    0x7fe0,
     0x0,
-    0x3ff000,
     0x0,
-    0xc0000000,
-    0xff,
     0x0,
-    0x1ff8000,
     0x0,
+    0x77780000,
+    0x0,
+    0x0,
+    0xdde00000,
+    0x1,
+    0x0,
+    0x77800000,
+    0x7,
+    0x0,
+    0xeef000,
+    0x0,
+    0x0,
+    0xef000000,
+    0xe,
     0x0,
-    0x3ff00,
+    0xde000000,
+    0x1d,
+    0x0,
+    0x0,
+    0xeef0,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_bfd[47] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_bfd[57] =
 {
     0x0,
     0x0,
-    0x20000080,
+    0x100000,
+    0x1000000,
     0x0,
     0x0,
-    0x8000010,
-    0x4010020,
-    0x808020,
-    0x802002,
-    0x801004,
-    0x80080202,
-    0x80100200,
-    0x8020200,
-    0x8010040,
-    0x4010020,
-    0x1001004,
-    0x802004,
-    0x40101004,
-    0x40080200,
-    0x20080100,
-    0x808020,
-    0x801004,
-    0x40401002,
-    0x100,
+    0x2000,
+    0x100100,
+    0x4002002,
+    0x10010040,
+    0x400400,
+    0x10008008,
+    0x40040100,
+    0x1001000,
+    0x40040020,
+    0x100100,
+    0x4002002,
+    0x80080040,
+    0x200200,
+    0x2002000,
+    0x80040040,
+    0x200800,
+    0x4004002,
+    0x80080,
+    0x401001,
+    0x2001004,
+    0x40040020,
+    0x800800,
+    0x2002,
     0x0,
-    0x80000,
-    0x200,
     0x0,
-    0x10000,
-    0x10020080,
-    0x8020040,
-    0x2002008,
-    0x1004008,
-    0x80202008,
-    0x200800,
-    0x20200801,
-    0x10040080,
-    0x10020080,
-    0x1004040,
-    0x2004010,
-    0x1004008,
-    0x80200401,
-    0x80100400,
-    0x8020200,
-    0x1004008,
-    0x1002008,
-    0x100404,
+    0x40,
+    0x400,
+    0x0,
+    0x80000000,
+    0x4000000,
+    0x80080040,
+    0x1001000,
+    0x10004004,
+    0x200100,
+    0x4004002,
+    0x40010010,
+    0x800400,
+    0x4010010,
+    0x80080040,
+    0x1001000,
+    0x8020020,
+    0x80000080,
+    0x1000800,
+    0x20020010,
+    0x80080,
+    0x2001001,
+    0x40040020,
+    0x40100100,
+    0x800800,
+    0x20010010,
+    0x80080200,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_dest_opt_ext_1[35] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_dest_opt_ext_1[42] =
 {
     0x0,
     0x0,
@@ -207,11 +234,12 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0xffffffc0,
-    0xffffffff,
-    0x7fffff,
     0x0,
     0x0,
+    0xff77f77c,
+    0xddfeefee,
+    0x77f77ddf,
+    0x7,
     0x0,
     0x0,
     0x0,
@@ -230,139 +258,170 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0xfffc0000,
-    0xffffffff,
-    0xffffffff,
-    0x7,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0xddf00000,
+    0xbfbbfddf,
+    0xf77f77fb,
+    0x1ddfdd,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_dest_opt_ext_2[45] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_dest_opt_ext_2[55] =
 {
     0x0,
     0x0,
     0x0,
     0x0,
     0x0,
-    0x80000000,
-    0x1ff,
     0x0,
-    0x7fe0000,
     0x0,
+    0x1dde000,
     0x0,
-    0x1ff8,
     0x0,
-    0xffc00,
+    0x7778000,
     0x0,
-    0xf0000000,
-    0x3f,
     0x0,
-    0x7fe000,
+    0x1dde0000,
     0x0,
     0x0,
-    0xffc0,
+    0x3bbc0,
     0x0,
     0x0,
+    0x3bbc0000,
     0x0,
     0x0,
+    0x77780000,
     0x0,
     0x0,
+    0xc0000000,
+    0x3bb,
     0x0,
-    0x1ff800,
     0x0,
-    0xe0000000,
-    0x7f,
     0x0,
-    0x1ff8000,
     0x0,
-    0xffc00000,
     0x0,
     0x0,
-    0x3ff00,
     0x0,
-    0xfe000000,
-    0x7,
     0x0,
-    0xffc0000,
+    0x80000000,
+    0x777,
+    0x0,
+    0x0,
+    0x1dde,
+    0x0,
+    0x0,
+    0x7778,
+    0x0,
+    0xef000000,
+    0xe,
+    0x0,
+    0x0,
+    0xeef0,
+    0x0,
+    0x0,
+    0x1dde0,
+    0x0,
+    0x0,
+    0xeef0000,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_esp_ext[45] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_esp_ext[55] =
 {
     0x0,
     0x0,
-    0x400000,
     0x0,
+    0x40,
     0x0,
     0x0,
-    0x200,
+    0x0,
+    0x2000000,
+    0x0,
     0x0,
     0x8000000,
     0x0,
-    0x800000,
-    0x2000,
     0x0,
-    0x100000,
+    0x20000008,
     0x0,
     0x0,
-    0x40,
+    0x40000,
     0x0,
-    0x800000,
     0x0,
+    0x40000000,
     0x0,
-    0x10000,
     0x0,
+    0x80000000,
     0x0,
     0x0,
     0x0,
-    0x4,
+    0x400,
     0x0,
     0x0,
-    0x200000,
     0x0,
     0x0,
-    0x80,
+    0x1000000,
     0x0,
-    0x2000008,
     0x0,
     0x0,
-    0x1,
     0x0,
-    0x40000,
+    0x800,
     0x0,
     0x0,
-    0x8,
+    0x2000,
+    0x0,
+    0x200000,
+    0x8000,
+    0x0,
+    0x0,
+    0x10,
+    0x0,
+    0x0,
+    0x10000,
+    0x0,
+    0x0,
+    0x20000,
+    0x0,
     0x0,
     0x10000000,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ethertype[24] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ethertype[29] =
 {
     0x1e,
-    0x4000,
-    0xffe007f8,
-    0x3,
-    0x800,
-    0xfffc00ff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffdf,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0x6fff,
+    0x400000,
+    0x1dd8000,
+    0x3ddcafe0,
+    0x0,
+    0x8000,
+    0xc003bb00,
+    0xbfddfddf,
+    0xf77fbbfb,
+    0xddfddf77,
+    0xff77f77d,
+    0xddfeefee,
+    0x77f77ddf,
+    0xfddfddff,
+    0x77f77fbb,
+    0xbfddfddf,
+    0xf77fbbfb,
+    0xefeeff77,
+    0x7fbbfbbe,
+    0xfbbfbbe5,
+    0xeff77f77,
+    0xbfbbeefe,
+    0xf77f77fb,
+    0xdfeefeef,
+    0x7f77ddfd,
+    0xfbbfddf7,
+    0x77f77fbb,
+    0xbeefeeff,
+    0x1bbbfb,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_frag_ext_1[37] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_frag_ext_1[45] =
 {
     0x0,
     0x0,
@@ -374,12 +433,12 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0xff000000,
-    0xffffffff,
-    0x7fffffff,
     0x0,
     0x0,
     0x0,
+    0xfddfddf0,
+    0x77f77fbb,
+    0x1ddfddf,
     0x0,
     0x0,
     0x0,
@@ -398,12 +457,20 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0xfffffff0,
-    0xffffffff,
-    0x7ff,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x77c00000,
+    0xfeeff77f,
+    0xf77ddfdd,
+    0x777,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_frag_ext_2[46] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_frag_ext_2[56] =
 {
     0x0,
     0x0,
@@ -411,49 +478,59 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0xffc00,
+    0x0,
+    0xbc000000,
+    0x3b,
     0x0,
     0xf0000000,
-    0x3f,
+    0xee,
     0x0,
     0x0,
     0x0,
-    0x7fe00000,
     0x0,
+    0x77780000,
     0x0,
-    0x1ff80,
     0x0,
-    0xff000000,
-    0x3,
+    0x80000000,
+    0x777,
     0x0,
-    0x7fe0000,
     0x0,
+    0xeef,
     0x0,
     0x0,
+    0x777800,
+    0x0,
     0x0,
     0x0,
     0x0,
     0x0,
-    0xffc00000,
     0x0,
     0x0,
-    0x3ff00,
     0x0,
     0x0,
+    0xeef000,
     0x0,
     0x0,
-    0x7fe,
+    0x3bbc000,
     0x0,
-    0x1ff80000,
     0x0,
     0x0,
-    0x3ff0,
+    0x0,
+    0x0,
+    0x1dde0,
+    0x0,
+    0x0,
+    0x1dde0000,
+    0x0,
+    0x0,
+    0x3bbc0000,
+    0x0,
     0x0,
     0xe0000000,
-    0x7f,
+    0x1dd,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_hop_by_hop_ext_1[39] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_hop_by_hop_ext_1[48] =
 {
     0x0,
     0x0,
@@ -467,13 +544,13 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x80000000,
-    0xffffffff,
-    0xffffffff,
-    0xffff,
     0x0,
     0x0,
     0x0,
+    0xbe000000,
+    0xf77fbbfb,
+    0xefeeff77,
+    0x3bbfbbe,
     0x0,
     0x0,
     0x0,
@@ -491,12 +568,21 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0xfffff800,
-    0xffffffff,
-    0xfffffff,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0xefeef800,
+    0xfddfddfe,
+    0xeefbbfbb,
+    0xeef,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_hop_by_hop_ext_2[46] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_hop_by_hop_ext_2[56] =
 {
     0x0,
     0x0,
@@ -504,107 +590,159 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x3ff00000,
     0x0,
     0x0,
-    0xffc0,
+    0x3bbc0,
+    0x0,
     0x0,
-    0xffc000,
+    0xeef00,
+    0x0,
+    0xc0000000,
+    0x3bb,
     0x0,
     0x80000000,
-    0x1ff,
+    0x777,
     0x0,
-    0x7fe0000,
     0x0,
+    0x777800,
     0x0,
-    0xffc,
     0x0,
-    0xf8000000,
-    0x1f,
+    0xeef000,
     0x0,
     0x0,
+    0x77800000,
+    0x7,
     0x0,
     0x0,
     0x0,
     0x0,
     0x0,
-    0x3ff,
     0x0,
-    0xffc0000,
     0x0,
-    0xfc000000,
-    0xf,
     0x0,
-    0x1ff800,
+    0xef000000,
+    0xe,
+    0x0,
+    0xbc000000,
+    0x3b,
+    0x0,
+    0xeef0000,
+    0x0,
+    0x0,
+    0x1dde0000,
+    0x0,
     0x0,
     0xe0000000,
-    0x7f,
+    0x1dd,
     0x0,
-    0xffc000,
+    0xc0000000,
+    0x3bb,
     0x0,
     0x0,
-    0x1ff80,
+    0x1dde00,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_icmp[47] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_icmp[57] =
 {
     0x0,
-    0x4000,
-    0x800000,
-    0x0,
-    0x800,
     0x400000,
-    0x40200801,
-    0x10000401,
-    0x20040100,
-    0x10050080,
-    0x4004000,
-    0x5008010,
-    0x400010,
-    0x400802,
-    0x200a01,
-    0x20090080,
-    0x28040100,
-    0x2000080,
-    0x2004010,
-    0x1005008,
-    0x20000400,
-    0x10040080,
-    0x200a0,
-    0x8,
-    0x4000000,
     0x0,
-    0x8,
-    0x800000,
+    0x80,
     0x0,
-    0x801004,
-    0x401402,
-    0x40100100,
-    0x50080200,
-    0x4000100,
-    0x8010040,
-    0x10050,
-    0x802004,
-    0xa01004,
-    0x90080002,
-    0x40100200,
-    0x80280,
-    0x4010020,
-    0x5008020,
-    0x400010,
-    0x40080200,
-    0x200a0100,
     0x8000,
+    0x0,
+    0x8004004,
+    0x140080,
+    0x400001,
+    0x20010010,
+    0x500200,
+    0x1000004,
+    0x80040040,
+    0x1001400,
+    0x8004000,
+    0x100080,
+    0x2002801,
+    0x4008000,
+    0x80080,
+    0x2801001,
+    0x8000020,
+    0x100100,
+    0x5002002,
+    0x10000040,
+    0x80080000,
+    0x1001000,
+    0x20028,
+    0x80,
+    0x0,
+    0x100,
+    0x2000000,
+    0x0,
+    0x0,
+    0x2,
+    0x100000,
+    0x2002001,
+    0x40050,
+    0x400100,
+    0x8008004,
+    0x100140,
+    0x1000400,
+    0x50020010,
+    0x400,
+    0x2002001,
+    0xa0040040,
+    0x800,
+    0x2001002,
+    0x40040020,
+    0x800a00,
+    0x4002000,
+    0x80080040,
+    0x1001400,
+    0x4000,
+    0x40020020,
+    0xa00400,
+    0x2000008,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_igmp[29] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ifa_header[48] =
 {
     0x0,
     0x0,
-    0x1200000,
+    0x0,
+    0xaf00,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x78000000,
+    0x5,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0xbc000000,
+    0x2,
+    0x0,
+    0x0,
+    0x0,
     0x0,
     0x0,
-    0x40000,
     0x0,
     0x0,
     0x0,
@@ -614,6 +752,17 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x0,
     0x0,
     0x0,
+    0x15e000,
+};
+
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ifa_metadata_base[48] =
+{
+    0x0,
+    0x0,
+    0x0,
+    0x8800,
+    0x0,
+    0x0,
     0x0,
     0x0,
     0x0,
@@ -625,19 +774,55 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x12,
     0x0,
     0x40000000,
+    0x4,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x20000000,
+    0x2,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x110000,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ipv4[29] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_igmp[36] =
 {
-    0x18,
-    0x4000,
-    0xffe007f8,
-    0x3,
-    0x800,
-    0x400ff,
+    0x0,
+    0x0,
+    0x0,
+    0x40020,
+    0x0,
+    0x0,
+    0x40000000,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
     0x0,
     0x0,
     0x0,
@@ -655,117 +840,233 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x18000,
-    0x4000000,
-    0x7f8000,
-    0x3ffe,
     0x800000,
-    0x400ff000,
+    0x10,
+    0x0,
+    0x0,
+    0x10000,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ipv6[47] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ipv4[36] =
 {
+    0x18,
+    0x400000,
+    0x1dd8000,
+    0x3ddcafe0,
     0x0,
+    0x8000,
+    0x4003bb00,
     0x0,
     0x0,
     0x0,
     0x0,
-    0xfff80000,
-    0xffffffff,
-    0xffffffff,
-    0xffffffdf,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xfff,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x600000,
+    0x0,
+    0x100,
+    0xbf800776,
+    0xf772,
+    0x0,
+    0xec000002,
+    0x1000e,
+};
+
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ipv6[58] =
+{
+    0x0,
+    0x0,
     0x0,
     0x0,
     0x0,
     0x0,
     0x80000000,
-    0xffffffff,
-    0xffffffff,
-    0xfffdffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffff,
+    0xbfddfddf,
+    0xf77fbbfb,
+    0xddfddf77,
+    0xff77f77d,
+    0xddfeefee,
+    0x77f77ddf,
+    0xfddfddff,
+    0x77f77fbb,
+    0xbfddfddf,
+    0xf77fbbfb,
+    0xefeeff77,
+    0x7fbbfbbe,
+    0xfbbfbbe5,
+    0xeff77f77,
+    0xbfbbeefe,
+    0xf77f77fb,
+    0xdfeefeef,
+    0x7f77ddfd,
+    0xfbbfddf7,
+    0x77f77fbb,
+    0xbeefeeff,
+    0x3bbfb,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0xf77e0000,
+    0xefeeff77,
+    0x7ddfddfe,
+    0xddf777f7,
+    0xbfbbfddf,
+    0xf77f77fb,
+    0x77fddfdd,
+    0xfeeff77f,
+    0xf77ddfdd,
+    0xefeeff77,
+    0xfddfddfe,
+    0xeefbbfbb,
+    0xef95feef,
+    0xfddfeefe,
+    0xbbfbbfdd,
+    0xdfeefeef,
+    0xfbbfddfd,
+    0x77f77fbb,
+    0x77ddfddf,
+    0xfeefeeff,
+    0xbbfddfdd,
+    0xefeefbbf,
+    0xe,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_p_1588[47] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_p_1588[58] =
 {
     0x0,
     0x0,
-    0x40000100,
+    0x400000,
+    0x4000000,
+    0x0,
+    0x0,
+    0x8000,
+    0x400400,
+    0x10008008,
+    0x40040100,
+    0x1001000,
+    0x40020020,
+    0x100400,
+    0x4004001,
+    0x100080,
+    0x400401,
+    0x10008008,
+    0x200100,
+    0x800802,
+    0x8008000,
+    0x100100,
+    0x802002,
+    0x10010008,
+    0x200200,
+    0x1004004,
+    0x8004010,
+    0x100080,
+    0x2002001,
+    0x8008,
+    0x0,
+    0x0,
+    0x100,
+    0x1000,
+    0x0,
+    0x0,
+    0x10000002,
+    0x200100,
+    0x4004002,
+    0x40010010,
+    0x800400,
+    0x10010008,
+    0x40040,
+    0x2001001,
+    0x10040040,
+    0x200100,
+    0x4004002,
+    0x20080080,
+    0x200,
+    0x4002002,
+    0x80080040,
+    0x200200,
+    0x8004004,
+    0x100080,
+    0x400401,
+    0x2002001,
+    0x80040040,
+    0x200800,
+    0x2,
+};
+
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_prog_ext_1[51] =
+{
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0xfbbfbbe0,
+    0xeff77f77,
+    0xbfbbeefe,
+    0x3b,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
     0x0,
     0x0,
-    0x10000020,
-    0x8020040,
-    0x1010040,
-    0x1004004,
-    0x1002008,
-    0x100404,
-    0x200401,
-    0x10040401,
-    0x10020080,
-    0x8020040,
-    0x2002008,
-    0x1004008,
-    0x80202008,
-    0x80100400,
-    0x40100200,
-    0x1010040,
-    0x1002008,
-    0x80802004,
-    0x200,
     0x0,
-    0x100000,
-    0x400,
     0x0,
-    0x20000,
-    0x20040100,
-    0x10040080,
-    0x4004010,
-    0x2008010,
-    0x404010,
-    0x401001,
-    0x40401002,
-    0x20080100,
-    0x20040100,
-    0x2008080,
-    0x4008020,
-    0x2008010,
-    0x400802,
-    0x200801,
-    0x10040401,
-    0x2008010,
-    0x2004010,
-    0x200808,
+    0x0,
+    0x0,
+    0x0,
+    0xef800000,
+    0xfddfeefe,
+    0xbbfbbfdd,
+    0xeefeef,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_prog_ext_1[42] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_prog_ext_2[57] =
 {
     0x0,
     0x0,
@@ -775,19 +1076,26 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x0,
     0x0,
     0x0,
+    0x77780000,
     0x0,
     0x0,
+    0xdde00000,
+    0x1,
     0x0,
+    0x777800,
     0x0,
     0x0,
+    0xeef000,
     0x0,
     0x0,
-    0xfffe0000,
-    0xffffffff,
-    0xffffffff,
-    0x3,
+    0xef000000,
+    0xe,
+    0x0,
+    0xde000000,
+    0x1d,
     0x0,
     0x0,
+    0xeef0,
     0x0,
     0x0,
     0x0,
@@ -797,21 +1105,29 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x0,
     0x0,
     0x0,
+    0x1dde0,
     0x0,
     0x0,
+    0x77780,
     0x0,
+    0xe0000000,
+    0x1dd,
     0x0,
+    0xc0000000,
+    0x3bb,
     0x0,
     0x0,
+    0x3bbc00,
     0x0,
     0x0,
-    0xe0000000,
-    0xffffffff,
-    0xffffffff,
-    0x3fff,
+    0x777800,
+    0x0,
+    0x0,
+    0xbbc00000,
+    0x3,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_prog_ext_2[46] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rarp[29] =
 {
     0x0,
     0x0,
@@ -819,23 +1135,13 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x80000000,
-    0x1ff,
     0x0,
-    0x7fe0000,
     0x0,
-    0xfe000000,
-    0x7,
     0x0,
-    0xffc00,
     0x0,
-    0xf0000000,
-    0x3f,
     0x0,
-    0x7fe000,
     0x0,
     0x0,
-    0xffc0,
     0x0,
     0x0,
     0x0,
@@ -843,25 +1149,18 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x1ff800,
     0x0,
-    0xe0000000,
-    0x7f,
     0x0,
-    0x7fe0,
     0x0,
-    0xffc00000,
     0x0,
     0x0,
-    0x3ff00,
     0x0,
-    0xfe000000,
-    0x7,
     0x0,
-    0xffc0000,
+    0x0,
+    0x80000,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rarp[24] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rout_ext_1[54] =
 {
     0x0,
     0x0,
@@ -885,12 +1184,10 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x0,
-    0x2000,
-};
-
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rout_ext_1[44] =
-{
+    0xf77f77c0,
+    0xdfeefeef,
+    0x7f77ddfd,
+    0x77,
     0x0,
     0x0,
     0x0,
@@ -909,15 +1206,20 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0xfffffffc,
-    0xffffffff,
-    0x7ffff,
     0x0,
     0x0,
     0x0,
     0x0,
     0x0,
     0x0,
+    0xdf000000,
+    0xfbbfddfd,
+    0x77f77fbb,
+    0x1ddfddf,
+};
+
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rout_ext_2[57] =
+{
     0x0,
     0x0,
     0x0,
@@ -926,222 +1228,242 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x0,
     0x0,
     0x0,
+    0x80000000,
+    0x777,
     0x0,
     0x0,
+    0x1dde,
     0x0,
+    0x77800000,
+    0x7,
     0x0,
+    0xef000000,
+    0xe,
     0x0,
     0x0,
-    0xffffc000,
-    0xffffffff,
-    0x7fffffff,
-};
-
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rout_ext_2[47] =
-{
+    0xeef0,
     0x0,
     0x0,
+    0x1dde0,
     0x0,
     0x0,
+    0xeef0000,
     0x0,
     0x0,
     0x0,
-    0x7fe00,
     0x0,
-    0xf8000000,
-    0x1f,
     0x0,
-    0x1ff8,
     0x0,
-    0x3ff00000,
     0x0,
     0x0,
-    0xffc0,
     0x0,
-    0xff800000,
-    0x1,
+    0x1dde0000,
     0x0,
-    0x3ff0000,
     0x0,
+    0x77780000,
     0x0,
     0x0,
+    0x1dde00,
     0x0,
     0x0,
+    0x3bbc00,
     0x0,
     0x0,
-    0x7fe00000,
+    0xbbc00000,
+    0x3,
     0x0,
+    0x77800000,
+    0x7,
     0x0,
-    0x1ff80,
     0x0,
-    0x1ff8000,
+    0x3bbc,
+};
+
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_tcp_first_4bytes[57] =
+{
     0x0,
     0x0,
-    0x3ff,
+    0x58000,
+    0x580e00,
     0x0,
-    0xffc0000,
     0x0,
+    0xb00,
+    0xb0058058,
+    0x1600b00,
+    0x5805816,
+    0xc0160160,
+    0x5802c02,
+    0x16016058,
+    0x580580,
+    0x1601600b,
+    0xb0058058,
+    0x1600b00,
+    0x2c02c016,
+    0x700b00b0,
+    0xb00b00,
+    0x2c016016,
+    0xb00b02c0,
+    0x1601600,
+    0x5802c02c,
+    0x60160580,
+    0xb00581,
+    0x1601600b,
+    0xb02c02c0,
+    0xb00,
     0x0,
-    0x1ff8,
     0x0,
-    0xf0000000,
-    0x3f,
+    0x38000016,
+    0x160,
+    0x0,
+    0x2c000000,
+    0x1600000,
+    0x2c02c016,
+    0x60580580,
+    0x5801601,
+    0xb00b0058,
+    0x81601600,
+    0x16005805,
+    0x802c0160,
+    0x1605805,
+    0x2c02c016,
+    0x580580,
+    0x2c0b00b,
+    0x2c01c02c,
+    0x805802c0,
+    0xb00b005,
+    0x5802c02c,
+    0xb00580,
+    0x1601600b,
+    0x16058058,
+    0x802c02c0,
+    0xb005805,
+    0x2c02c0b0,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_tcp_first_4bytes[47] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_tcp_last_16bytes[57] =
 {
     0x0,
     0x0,
-    0xe000038,
-    0x0,
-    0x0,
-    0x3800007,
-    0x1c0700e,
-    0xe038380e,
-    0xc0380e00,
-    0xe0380701,
-    0x380380e0,
-    0x380700e0,
-    0x380e0e0,
-    0x380701c,
-    0xc1c0700e,
-    0xc0700701,
-    0xc0380e01,
-    0x1c070701,
-    0x1c0380e0,
-    0xe038070,
-    0xc038380e,
-    0xe0380701,
-    0x1c1c0700,
-    0x70,
-    0x0,
-    0x38000,
-    0xe0,
-    0x0,
-    0x7000,
-    0x700e038,
-    0x8380e01c,
-    0x80e00e03,
-    0x80701c03,
-    0x380e0e03,
-    0x700e0380,
-    0xe0e0380,
-    0x701c038,
-    0x700e038,
-    0x701c1c,
-    0x80e01c07,
-    0x70701c03,
-    0x380e01c0,
-    0x380701c0,
-    0x8380e0e0,
-    0x80701c03,
-    0xc0700e03,
-    0x701c1,
-};
-
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_tcp_last_16bytes[47] =
-{
+    0x50000,
+    0x500c00,
+    0x0,
+    0x0,
+    0xa00,
+    0xa0050050,
+    0x1400a00,
+    0x5005014,
+    0x80140140,
+    0x5002802,
+    0x14014050,
+    0x500500,
+    0x1401400a,
+    0xa0050050,
+    0x1400a00,
+    0x28028014,
+    0x600a00a0,
+    0xa00a00,
+    0x28014014,
+    0xa00a0280,
+    0x1401400,
+    0x50028028,
+    0x40140500,
+    0xa00501,
+    0x1401400a,
+    0xa0280280,
+    0xa00,
+    0x0,
     0x0,
+    0x30000014,
+    0x140,
     0x0,
-    0xc000030,
-    0x0,
-    0x0,
-    0x3000006,
-    0x180600c,
-    0xc030300c,
-    0x80300c00,
-    0xc0300601,
-    0x300300c0,
-    0x300600c0,
-    0x300c0c0,
-    0x3006018,
-    0x8180600c,
-    0x80600601,
-    0x80300c01,
-    0x18060601,
-    0x180300c0,
-    0xc030060,
-    0x8030300c,
-    0xc0300601,
-    0x18180600,
-    0x60,
-    0x0,
-    0x30000,
-    0xc0,
-    0x0,
-    0x6000,
-    0x600c030,
-    0x300c018,
-    0xc00c03,
-    0x601803,
-    0x300c0c03,
-    0x600c0300,
-    0xc0c0300,
-    0x6018030,
-    0x600c030,
-    0x601818,
-    0xc01806,
-    0x60601803,
-    0x300c0180,
-    0x30060180,
-    0x300c0c0,
-    0x601803,
-    0x80600c03,
-    0x60181,
+    0x28000000,
+    0x1400000,
+    0x28028014,
+    0x40500500,
+    0x5001401,
+    0xa00a0050,
+    0x1401400,
+    0x14005005,
+    0x280140,
+    0x1405005,
+    0x28028014,
+    0x500500,
+    0x280a00a,
+    0x28018028,
+    0x500280,
+    0xa00a005,
+    0x50028028,
+    0xa00500,
+    0x1401400a,
+    0x14050050,
+    0x280280,
+    0xa005005,
+    0x280280a0,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_udp[47] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_udp[58] =
 {
     0x0,
     0x0,
-    0xf00003c0,
-    0x0,
-    0x0,
-    0x3c000078,
-    0x1e0780f0,
-    0x3c3c0f0,
-    0x3c0f00f,
-    0x3c0781e,
-    0xc03c0f0f,
-    0xc0780f03,
-    0x3c0f0f03,
-    0x3c0781e0,
-    0x1e0780f0,
-    0x780781e,
-    0x3c0f01e,
-    0xe078781e,
-    0xe03c0f01,
-    0xf03c0781,
-    0x3c3c0f0,
-    0x3c0781e,
-    0xe1e0780f,
-    0x781,
-    0x0,
-    0x3c0000,
-    0xf00,
-    0x0,
-    0x78000,
-    0x780f03c0,
-    0x3c0f01e0,
-    0xf00f03c,
-    0x781e03c,
-    0xc0f0f03c,
-    0x80f03c03,
-    0xf0f03c07,
-    0x781e03c0,
-    0x780f03c0,
-    0x781e1e0,
-    0xf01e078,
-    0x8781e03c,
-    0xc0f01e07,
-    0xc0781e03,
-    0x3c0f0f03,
-    0x781e03c,
-    0x780f03c,
-    0x781e1e,
+    0xd80000,
+    0xd80a000,
+    0x0,
+    0x0,
+    0x1b000,
+    0xd80d80,
+    0x3601b01b,
+    0xd80d8360,
+    0x3603600,
+    0xd806c06c,
+    0x60360d80,
+    0xd80d803,
+    0x603601b0,
+    0xd80d83,
+    0x3601b01b,
+    0xc06c0360,
+    0x1b01b06,
+    0x1b01b005,
+    0xc0360360,
+    0x1b06c06,
+    0x3603601b,
+    0x806c06c0,
+    0x360d80d,
+    0x1b00d836,
+    0x603601b0,
+    0x6c06c03,
+    0x1b01b,
+    0x0,
+    0x0,
+    0x80000360,
+    0x3602,
+    0x0,
+    0xc0000000,
+    0x36000006,
+    0xc06c0360,
+    0xd80d806,
+    0xd8036036,
+    0x1b00d80,
+    0x3603601b,
+    0x600d80d8,
+    0x6c03603,
+    0x360d80d8,
+    0xc06c0360,
+    0xd80d806,
+    0x6c1b01b0,
+    0xc01406c0,
+    0xd806c06,
+    0xb01b00d8,
+    0x806c06c1,
+    0x1b00d80d,
+    0x603601b0,
+    0x60d80d83,
+    0x6c06c03,
+    0xb00d80d8,
+    0xc06c1b01,
+    0x6,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l3[24] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l3[29] =
 {
     0x0,
     0x0,
@@ -1166,119 +1488,147 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x4000,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x100000,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l4[47] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l4[58] =
 {
     0x0,
     0x0,
-    0x400,
-    0x1,
+    0x1000000,
+    0x10000000,
+    0x0,
     0x0,
-    0x40000080,
-    0x20080100,
-    0x4040100,
+    0x20000,
+    0x1001000,
+    0x40020020,
+    0x100400,
+    0x4004001,
+    0x80080,
+    0x401001,
+    0x10010004,
+    0x400200,
+    0x1001004,
+    0x40020020,
+    0x800400,
+    0x2002008,
+    0x20020000,
+    0x400400,
+    0x2008008,
+    0x40040020,
+    0x800800,
     0x4010010,
-    0x4008020,
-    0x401010,
-    0x801004,
-    0x40101004,
-    0x40080200,
-    0x20080100,
-    0x8008020,
-    0x4010020,
-    0x808020,
-    0x401002,
-    0x400802,
-    0x4040101,
-    0x4008020,
-    0x2008010,
-    0x802,
+    0x20010040,
+    0x400200,
+    0x8008004,
+    0x20020,
     0x0,
-    0x400000,
-    0x1000,
     0x0,
-    0x80000,
-    0x80100400,
-    0x40100200,
-    0x10010040,
-    0x8020040,
-    0x1010040,
-    0x1004004,
-    0x1004008,
-    0x80200401,
-    0x80100400,
-    0x8020200,
-    0x10020080,
-    0x8020040,
-    0x1002008,
-    0x802004,
-    0x40101004,
-    0x8020040,
-    0x8010040,
-    0x802020,
+    0x400,
+    0x4000,
+    0x0,
+    0x0,
+    0x40000008,
+    0x800400,
+    0x10010008,
+    0x40040,
+    0x2001001,
+    0x40040020,
+    0x100100,
+    0x8004004,
+    0x40100100,
+    0x800400,
+    0x10010008,
+    0x80200200,
+    0x800,
+    0x10008008,
+    0x200100,
+    0x800802,
+    0x20010010,
+    0x400200,
+    0x1001004,
+    0x8008004,
+    0x100100,
+    0x802002,
+    0x8,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l5[47] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l5[58] =
 {
     0x0,
     0x0,
-    0x88000220,
-    0x0,
-    0x0,
-    0x22000044,
-    0x11044088,
-    0x82222088,
-    0x2208808,
-    0x82204411,
-    0x20220888,
-    0x20440882,
-    0x22088882,
-    0x22044110,
-    0x11044088,
-    0x4404411,
-    0x2208811,
-    0x10444411,
-    0x10220881,
-    0x88220441,
-    0x2222088,
-    0x82204411,
-    0x11104408,
-    0x441,
-    0x0,
-    0x220000,
-    0x880,
-    0x0,
-    0x44000,
-    0x44088220,
-    0x22088110,
-    0x8808822,
-    0x4411022,
-    0x20888822,
-    0x40882202,
-    0x88882204,
-    0x44110220,
-    0x44088220,
-    0x4411110,
-    0x8811044,
-    0x44411022,
-    0x20881104,
-    0x20441102,
-    0x22088882,
-    0x4411022,
-    0x4408822,
-    0x441111,
+    0x840000,
+    0x8400000,
+    0x0,
+    0x0,
+    0x10800,
+    0x80840840,
+    0x21010810,
+    0x84084210,
+    0x2102100,
+    0x84042042,
+    0x10210840,
+    0x8408402,
+    0x10210108,
+    0x80840842,
+    0x21010810,
+    0x20420210,
+    0x1081084,
+    0x10810800,
+    0x20210210,
+    0x81084204,
+    0x21021010,
+    0x40420420,
+    0x2108408,
+    0x10808421,
+    0x10210108,
+    0x84204202,
+    0x10810,
+    0x0,
+    0x0,
+    0x210,
+    0x2100,
+    0x0,
+    0x20000000,
+    0x21000004,
+    0x20420210,
+    0x8408404,
+    0x84021021,
+    0x81080840,
+    0x21021010,
+    0x10084084,
+    0x4202102,
+    0x21084084,
+    0x20420210,
+    0x8408404,
+    0x42108108,
+    0x20000420,
+    0x8404204,
+    0x8108084,
+    0x40420421,
+    0x10808408,
+    0x10210108,
+    0x10840842,
+    0x4204202,
+    0x8084084,
+    0x20421081,
+    0x4,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_wesp_ext_1[47] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_wesp_ext_1[58] =
 {
     0x0,
     0x0,
     0x0,
-    0x2,
-    0x800,
-    0x400ff,
+    0x20000000,
+    0x0,
+    0x8000,
+    0x4003bb00,
     0x0,
     0x0,
     0x0,
@@ -1293,21 +1643,21 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0xf8000000,
-    0xffffffff,
-    0xffffffff,
-    0xfff,
     0x0,
     0x0,
-    0x2000,
-    0x800000,
-    0x400ff000,
     0x0,
     0x0,
+    0xfbbe0000,
+    0x77f77fbb,
+    0xbeefeeff,
+    0x3bbfb,
     0x0,
     0x0,
     0x0,
+    0x8000,
     0x0,
+    0xec000002,
+    0x1000e,
     0x0,
     0x0,
     0x0,
@@ -1317,12 +1667,22 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0xffffff80,
-    0xffffffff,
-    0xffffff,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0xfeefeef8,
+    0xbbfddfdd,
+    0xefeefbbf,
+    0xe,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_wesp_ext_2[47] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_wesp_ext_2[58] =
 {
     0x0,
     0x0,
@@ -1331,102 +1691,113 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0xf8000000,
-    0x1f,
     0x0,
-    0x7fe000,
     0x0,
-    0x7fe00000,
+    0xdde00000,
+    0x1,
     0x0,
+    0x77800000,
+    0x7,
     0x0,
-    0xffc0,
+    0x1dde000,
     0x0,
-    0xff000000,
-    0x3,
     0x0,
-    0x7fe00,
+    0x3bbc000,
     0x0,
     0x0,
-    0xffc,
+    0xbc000000,
+    0x3b,
+    0x0,
+    0x78000000,
+    0x77,
     0x0,
     0x0,
+    0x3bbc0,
     0x0,
     0x0,
     0x0,
     0x0,
     0x0,
-    0x1ff80,
     0x0,
-    0xfe000000,
-    0x7,
     0x0,
-    0x7fe,
     0x0,
-    0xffc0000,
     0x0,
+    0x77780,
+    0x0,
+    0x0,
+    0x1dde00,
+    0x0,
+    0x80000000,
+    0x777,
+    0x0,
+    0x0,
+    0xeef,
+    0x0,
+    0x0,
+    0xeef000,
     0x0,
-    0x3ff0,
     0x0,
-    0x7fe00000,
+    0x1dde000,
     0x0,
     0x0,
-    0xffc000,
+    0xef000000,
+    0xe,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l2_hdr_cntag[2] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_cntag[2] =
 {
     0x33033198,
     0xcc66066,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l2_hdr_gbp_ethernet_shim[2] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_gbp_ethernet_shim[2] =
 {
     0x44044220,
     0x11088088,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l2_hdr_hg3_base[2] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_hg3_base[2] =
 {
     0xffc00000,
     0xffffffff,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l2_hdr_hg3_ext_0[2] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_hg3_ext_0[2] =
 {
     0x0,
     0xfffff800,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l2_hdr_itag[2] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_itag[2] =
 {
     0xf80f87c0,
     0x3e1f01f0,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l2_hdr_l2[2] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_l2[2] =
 {
     0xfffffffe,
     0xffffffff,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l2_hdr_otag[2] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_otag[2] =
 {
     0x1ff800,
     0x7fe003ff,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l2_hdr_snap_or_llc[2] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_snap_or_llc[2] =
 {
     0xa23a2510,
     0xe8944744,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_arp[1] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_arp[1] =
 {
     0x4,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_auth_ext_1[13] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_auth_ext_1[14] =
 {
     0x10,
     0x0,
@@ -1437,13 +1808,14 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0xfbfdf7c0,
-    0x7dfefbfe,
-    0xbeff7dff,
-    0x7beff7df,
+    0xfbe00000,
+    0x7dff7dfe,
+    0xbeffbeff,
+    0xfbefdf7f,
+    0x3df7,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_auth_ext_2[34] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_auth_ext_2[35] =
 {
     0x0,
     0x0,
@@ -1454,77 +1826,78 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x3df780,
+    0xfbc00000,
+    0x1e,
     0x0,
     0x0,
+    0x7bef0000,
     0x0,
-    0xf7de,
     0x0,
     0x0,
-    0x78000000,
-    0x3df,
+    0x1efbc00,
     0x0,
     0x0,
-    0x7de00000,
-    0xf,
     0x0,
+    0xdf780000,
+    0x3,
     0x0,
-    0xf0000000,
-    0x7be,
     0x0,
+    0xbc000000,
+    0x1ef,
     0x0,
-    0xfbc00000,
-    0x1e,
     0x0,
+    0xdf780000,
+    0x3,
     0x0,
     0x0,
-    0x1efbc00,
+    0xde000000,
+    0xf7,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_bfd[39] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_bfd[39] =
 {
     0x0,
     0x0,
     0x0,
     0x40,
     0x0,
-    0x8,
+    0x40000,
     0x0,
     0x0,
-    0x2000,
-    0x20004000,
-    0x10002000,
-    0x8001000,
-    0x800100,
-    0x800100,
-    0x400080,
-    0x200040,
-    0x20004,
-    0x20004,
-    0x20002,
-    0x10002001,
     0x10000000,
-    0x8000800,
-    0x4000400,
-    0x400200,
-    0x20,
-    0x40008,
-    0x20004,
-    0x20010002,
-    0x20001000,
+    0x20000000,
     0x10001000,
     0x8000800,
     0x800400,
-    0x100040,
-    0x20002,
-    0x80010001,
-    0x40008000,
-    0x4000800,
-    0x41000200,
-    0x4444,
+    0x800040,
+    0x400040,
+    0x200020,
+    0x20010,
+    0x20001,
+    0x10001,
+    0x10008001,
+    0x800,
+    0x4000000,
+    0x2000200,
+    0x1000100,
+    0x100080,
+    0x8,
+    0x10002,
+    0x80008001,
+    0x8004000,
+    0x4000400,
+    0x2000200,
+    0x1000100,
+    0x100080,
+    0x10008,
+    0x80008001,
+    0x40004000,
+    0x4002000,
+    0x88000200,
+    0x88888,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_dest_opt_ext_1[17] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_dest_opt_ext_1[18] =
 {
     0x0,
     0x0,
@@ -1539,13 +1912,14 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0xfbeff7df,
-    0xfdf7fbef,
-    0x7efbfdf7,
-    0x1efbfdf,
+    0xfbef8000,
+    0xfdf7fdf7,
+    0xfefbfefb,
+    0xdfefbf7d,
+    0xf7,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_dest_opt_ext_2[35] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_dest_opt_ext_2[35] =
 {
     0x0,
     0x0,
@@ -1556,35 +1930,35 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0xfbc00000,
-    0x1e,
     0x0,
+    0xf7de0,
     0x0,
-    0x7bef0000,
     0x0,
+    0x80000000,
+    0x3df7,
     0x0,
     0x0,
-    0x1efbc00,
+    0xde000000,
+    0xf7,
     0x0,
     0x0,
     0x0,
-    0x7bef0,
+    0x1efbc,
     0x0,
     0x0,
     0x0,
-    0x3df7800,
+    0xf7de00,
     0x0,
     0x0,
     0x0,
-    0xf7de0,
+    0x1efbc,
     0x0,
     0x0,
     0x0,
-    0xde000000,
-    0xf7,
+    0x7bef00,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_esp_ext[35] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_esp_ext[35] =
 {
     0x0,
     0x0,
@@ -1596,77 +1970,77 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x20,
+    0x100000,
     0x0,
     0x0,
-    0x80000000,
     0x0,
+    0x4000,
     0x0,
-    0x2000000,
-    0x2000000,
     0x0,
+    0x100,
+    0x100,
     0x0,
     0x0,
-    0x80000,
     0x0,
+    0x20000,
     0x0,
     0x0,
-    0x4000000,
     0x0,
+    0x1000000,
     0x0,
     0x0,
-    0x100000,
     0x0,
+    0x20000,
     0x0,
     0x0,
     0x0,
-    0x100,
+    0x800000,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ethertype[39] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ethertype[39] =
 {
     0x1e,
     0x0,
     0x4,
     0xe0003df6,
-    0xe22fffff,
-    0xfbe,
+    0xffffffff,
+    0x7df7117,
     0x0,
-    0x200,
-    0x1efb00,
-    0xfbfdf7f0,
-    0x7dfefbfe,
-    0xbeff7dff,
-    0x7beff7df,
-    0xfbeff7df,
-    0xfdf7fbef,
-    0x7efbfdf7,
-    0x7fefbfdf,
-    0xbfefbfdf,
-    0xdfefbfef,
-    0x7dfefbf7,
-    0x7dffffff,
-    0xbeffbeff,
-    0xdf7fdf7f,
-    0xfdf7efbf,
-    0xf88bfefb,
-    0x7fdf7fbe,
-    0xbfefbfdf,
-    0xfbf7dfef,
-    0xfbff7dfe,
+    0x1000000,
+    0x7d800000,
+    0xfbf8000f,
     0x7dff7dfe,
     0xbeffbeff,
     0xfbefdf7f,
-    0xbf7dfdf7,
-    0xdfefbfef,
-    0xeff7dff7,
-    0xf7fbeffb,
-    0xdf7fbefd,
-    0xffe007fb,
-    0x7ffff,
+    0xfbefbdf7,
+    0xfdf7fdf7,
+    0xfefbfefb,
+    0xdfefbf7d,
+    0xdfefbff7,
+    0xdff7dff7,
+    0x7dfbeff7,
+    0xffffbeff,
+    0xdf7fffff,
+    0xefbfefbf,
+    0xf7dff7df,
+    0xff7dfbef,
+    0xbe22ffbe,
+    0xdff7dfef,
+    0xeffbeff7,
+    0xbefdf7fb,
+    0xdf7fdf7f,
+    0xefbfefbf,
+    0xf7dff7df,
+    0xff7dfbef,
+    0xdff7dfbe,
+    0xeffbeff7,
+    0xf7fdf7fb,
+    0xdf7efbfd,
+    0xfffdefbf,
+    0xffffff,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_frag_ext_1[21] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_frag_ext_1[21] =
 {
     0x0,
     0x0,
@@ -1684,14 +2058,14 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x7c000000,
-    0xbfefbfdf,
-    0xdfefbfef,
-    0x7dfefbf7,
-    0xf,
+    0x0,
+    0xdfefbe00,
+    0xdff7dff7,
+    0x7dfbeff7,
+    0x7beff,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_frag_ext_2[35] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_frag_ext_2[36] =
 {
     0x0,
     0x0,
@@ -1703,81 +2077,83 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x1efbc0,
-    0x0,
+    0x7de00000,
+    0xf,
     0x0,
     0x0,
-    0x7bef,
+    0x3df78000,
     0x0,
     0x0,
     0x0,
     0x0,
     0x0,
     0x0,
-    0xbef00000,
-    0x7,
     0x0,
+    0xefbc0000,
+    0x1,
     0x0,
-    0x78000000,
-    0x3df,
     0x0,
+    0xde000000,
+    0xf7,
     0x0,
-    0x7de00000,
-    0xf,
     0x0,
+    0xefbc0000,
+    0x1,
     0x0,
     0x0,
-    0xf7de00,
+    0xef000000,
+    0x7b,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gpe[37] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gpe[38] =
 {
     0x0,
     0x0,
     0x0,
     0x180,
     0x0,
-    0x30,
+    0x180000,
     0x0,
     0x0,
-    0xc000,
-    0xc0018000,
-    0x6000c000,
-    0x30006000,
-    0x3000600,
-    0x3000600,
-    0x1800300,
-    0xc00180,
-    0xc0018,
-    0xc0018,
-    0xc000c,
-    0x6000c006,
     0x60000000,
-    0x30003000,
-    0x18001800,
-    0x1800c00,
-    0xc0,
-    0x180030,
-    0xc0018,
-    0xc006000c,
-    0xc0006000,
+    0xc0000000,
     0x60006000,
     0x30003000,
     0x3001800,
-    0x600180,
-    0xc000c,
+    0x3000180,
+    0x1800180,
+    0xc000c0,
+    0xc0060,
+    0xc0006,
     0x60006,
-    0x80030003,
-    0x18003001,
+    0x60030006,
+    0x3000,
+    0x18000000,
+    0xc000c00,
+    0x6000600,
+    0x600300,
+    0x30,
+    0x6000c,
+    0x30006,
+    0x30018003,
+    0x18001800,
+    0xc000c00,
+    0x6000600,
+    0x600300,
+    0x60030,
+    0x30006,
+    0x80018003,
+    0x1800c001,
+    0xc00,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre[21] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre[22] =
 {
     0x0,
     0x0,
     0x0,
     0x80000000,
-    0x7fff,
+    0x3fffffff,
     0x0,
     0x0,
     0x0,
@@ -1793,16 +2169,17 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0xffff0,
+    0xfff80000,
+    0x3ffff,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_chksum[21] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_chksum[22] =
 {
     0x0,
     0x0,
     0x0,
     0x0,
-    0x1fe,
+    0x1fffe,
     0x0,
     0x0,
     0x0,
@@ -1818,16 +2195,17 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x3fc0,
+    0xffe00000,
+    0x1f,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_key[21] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_key[22] =
 {
     0x0,
     0x0,
     0x0,
     0x0,
-    0x1e3c,
+    0x1fe03fc,
     0x0,
     0x0,
     0x0,
@@ -1843,16 +2221,17 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x3c780,
+    0x3fc00000,
+    0x1fe0,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_rout[21] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_rout[22] =
 {
     0x0,
     0x0,
     0x0,
     0x0,
-    0x5568,
+    0x31999b30,
     0x0,
     0x0,
     0x0,
@@ -1868,16 +2247,17 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0xaad00,
+    0xb3000000,
+    0x31999,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_seq[21] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_seq[22] =
 {
     0x0,
     0x0,
     0x0,
     0x0,
-    0x79b0,
+    0x3de1e3c0,
     0x0,
     0x0,
     0x0,
@@ -1893,10 +2273,11 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0xf3600,
+    0x3c000000,
+    0x3de1e,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_hop_by_hop_ext_1[25] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_hop_by_hop_ext_1[26] =
 {
     0x0,
     0x0,
@@ -1918,14 +2299,15 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x7df00000,
-    0xbeffbeff,
-    0xdf7fdf7f,
-    0xfdf7efbf,
-    0x1efb,
+    0x0,
+    0xdf7c0000,
+    0xefbfefbf,
+    0xf7dff7df,
+    0xff7dfbef,
+    0x7be,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_hop_by_hop_ext_2[36] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_hop_by_hop_ext_2[36] =
 {
     0x0,
     0x0,
@@ -1937,82 +2319,84 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x7de00000,
-    0xf,
     0x0,
+    0x7bef0,
     0x0,
-    0x3df78000,
     0x0,
+    0xc0000000,
+    0x1efb,
     0x0,
-    0xbc000000,
-    0x1ef,
     0x0,
+    0xf7de00,
     0x0,
     0x0,
-    0x3df78,
     0x0,
     0x0,
+    0xf7de,
     0x0,
-    0x1efbc00,
     0x0,
     0x0,
+    0x7bef00,
     0x0,
-    0x7bef0,
     0x0,
     0x0,
+    0xf7de,
     0x0,
-    0xef000000,
-    0x7b,
+    0x0,
+    0x0,
+    0x3df780,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_icmp[37] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_icmp[38] =
 {
     0x0,
     0x0,
     0x4,
     0x0,
-    0x8000,
+    0x40000000,
     0x0,
     0x0,
-    0x200,
+    0x1000000,
     0x0,
-    0x800100,
-    0x400080,
-    0x200050,
-    0x20000,
-    0x20004,
-    0x40010002,
-    0x8001,
-    0x10000800,
-    0x8000800,
-    0x4000a00,
-    0x400000,
-    0x400000,
-    0x200020,
-    0x140010,
-    0x80000008,
-    0x20002000,
-    0x10001000,
-    0xa000800,
-    0x400,
-    0x800040,
+    0x800000,
     0x400040,
     0x280020,
     0x10,
-    0x1,
+    0x20001,
+    0x80010001,
+    0x4000a000,
+    0x4000000,
     0x4000800,
-    0x2000400,
-    0x1000280,
+    0x5000400,
+    0x200,
+    0x20,
     0x100000,
+    0x80008,
+    0x50004,
+    0x20000002,
+    0x8000800,
+    0x4000400,
+    0x2800200,
+    0x100,
+    0x100010,
+    0x80008,
+    0x50004,
+    0x20000002,
+    0x4000000,
+    0x2000200,
+    0x1400100,
+    0x80,
+    0x8,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ifa_header[25] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ifa_header[26] =
 {
     0x0,
     0x0,
     0x0,
     0x0,
-    0x22f0000,
+    0x80000000,
+    0x117,
     0x0,
     0x0,
     0x0,
@@ -2032,17 +2416,17 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x8bc000,
+    0x22f000,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ifa_metadata[25] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ifa_metadata_base[26] =
 {
     0x0,
     0x0,
     0x0,
     0x0,
-    0x2080000,
     0x0,
+    0x104,
     0x0,
     0x0,
     0x0,
@@ -2061,79 +2445,81 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x820000,
+    0x0,
+    0x208000,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_igmp[10] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_igmp[10] =
 {
     0x0,
     0x0,
     0x0,
     0x20000000,
-    0x20000000,
     0x0,
+    0x1000,
     0x0,
     0x0,
     0x0,
-    0x10,
+    0x80000,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ioam_e2e[37] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ioam_e2e[38] =
 {
     0x0,
     0x0,
     0x0,
     0x100,
     0x0,
-    0x20,
+    0x100000,
     0x0,
     0x0,
-    0x8000,
-    0x80010000,
-    0x40008000,
-    0x20004000,
-    0x2000400,
-    0x2000400,
-    0x1000200,
-    0x800100,
-    0x80010,
-    0x80010,
-    0x80008,
-    0x40008004,
     0x40000000,
-    0x20002000,
-    0x10001000,
-    0x1000800,
-    0x80,
-    0x100020,
-    0x80010,
-    0x80040008,
-    0x80004000,
+    0x80000000,
     0x40004000,
     0x20002000,
     0x2001000,
-    0x400100,
-    0x80008,
+    0x2000100,
+    0x1000100,
+    0x800080,
+    0x80040,
+    0x80004,
     0x40004,
-    0x20002,
-    0x10002001,
+    0x40020004,
+    0x2000,
+    0x10000000,
+    0x8000800,
+    0x4000400,
+    0x400200,
+    0x20,
+    0x40008,
+    0x20004,
+    0x20010002,
+    0x10001000,
+    0x8000800,
+    0x4000400,
+    0x400200,
+    0x40020,
+    0x20004,
+    0x10002,
+    0x10008001,
+    0x800,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ipv4[10] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ipv4[10] =
 {
     0x18,
     0x0,
     0x4,
     0xe0003df6,
-    0xe22fffff,
-    0xfbe,
+    0xffffffff,
+    0x7df7117,
     0x0,
-    0x200,
-    0x1efb00,
-    0x10,
+    0x1000000,
+    0x7d800000,
+    0x8000f,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ipv6[38] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ipv6[38] =
 {
     0x0,
     0x0,
@@ -2144,38 +2530,38 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0xfbfdf7e0,
-    0x7dfefbfe,
-    0xbeff7dff,
-    0x7beff7df,
-    0xfbeff7df,
-    0xfdf7fbef,
-    0x7efbfdf7,
-    0x7fefbfdf,
-    0xbfefbfdf,
-    0xdfefbfef,
-    0x7dfefbf7,
-    0x7dffffff,
-    0xbeffbeff,
-    0xdf7fdf7f,
-    0xfdf7efbf,
-    0xf88bfefb,
-    0x7fdf7fbe,
-    0xbfefbfdf,
-    0xfbf7dfef,
-    0xfbff7dfe,
+    0xfbf00000,
     0x7dff7dfe,
     0xbeffbeff,
     0xfbefdf7f,
-    0xbf7dfdf7,
-    0xdfefbfef,
-    0xeff7dff7,
-    0xf7fbeffb,
-    0xdf7fbefd,
-    0x3,
+    0xfbefbdf7,
+    0xfdf7fdf7,
+    0xfefbfefb,
+    0xdfefbf7d,
+    0xdfefbff7,
+    0xdff7dff7,
+    0x7dfbeff7,
+    0xffffbeff,
+    0xdf7fffff,
+    0xefbfefbf,
+    0xf7dff7df,
+    0xff7dfbef,
+    0xbe22ffbe,
+    0xdff7dfef,
+    0xeffbeff7,
+    0xbefdf7fb,
+    0xdf7fdf7f,
+    0xefbfefbf,
+    0xf7dff7df,
+    0xff7dfbef,
+    0xdff7dfbe,
+    0xeffbeff7,
+    0xf7fdf7fb,
+    0xdf7efbfd,
+    0x1efbf,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls0[39] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls0[39] =
 {
     0x0,
     0x0,
@@ -2214,11 +2600,11 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0xffe007f8,
-    0xffff,
+    0xfffc0000,
+    0x1fffff,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls1[39] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls1[39] =
 {
     0x0,
     0x0,
@@ -2257,11 +2643,11 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0xffe007f0,
-    0xfff,
+    0xfff80000,
+    0x1ffff,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls2[39] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls2[39] =
 {
     0x0,
     0x0,
@@ -2300,11 +2686,11 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0xffe007e0,
-    0xff,
+    0xfff00000,
+    0x1fff,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls3[39] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls3[39] =
 {
     0x0,
     0x0,
@@ -2343,11 +2729,11 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0xffe007c0,
-    0xf,
+    0xffe00000,
+    0x1ff,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls4[39] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls4[39] =
 {
     0x0,
     0x0,
@@ -2386,11 +2772,11 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0xffe00000,
-    0xf,
+    0xffc00000,
+    0x1f,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls5[39] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls5[39] =
 {
     0x0,
     0x0,
@@ -2429,11 +2815,11 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0xfc000000,
-    0xf,
+    0xff800000,
+    0x1,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls6[38] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls6[38] =
 {
     0x0,
     0x0,
@@ -2472,10 +2858,10 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0xf8000000,
+    0x1f000000,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls_ach[39] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls_ach[39] =
 {
     0x0,
     0x0,
@@ -2514,11 +2900,11 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x61800300,
-    0x6666,
+    0xcc000000,
+    0xccccc,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls_cw[39] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls_cw[39] =
 {
     0x0,
     0x0,
@@ -2557,54 +2943,54 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x82000400,
-    0x8888,
+    0x10000000,
+    0x111111,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_p_1588[39] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_p_1588[39] =
 {
     0x0,
     0x0,
     0x0,
     0x400,
     0x0,
-    0x80,
+    0x400000,
+    0x0,
     0x0,
     0x0,
-    0x20000,
-    0x40000,
-    0x20002,
-    0x80010001,
-    0x8001000,
-    0x8001000,
-    0x4000800,
-    0x2000400,
-    0x200040,
-    0x200040,
-    0x200020,
-    0x20010,
     0x1,
-    0x80008001,
-    0x40004000,
-    0x4002000,
-    0x200,
-    0x400080,
-    0x200040,
-    0x100020,
-    0x10002,
     0x10002,
     0x80008001,
     0x8004000,
-    0x1000400,
-    0x200020,
+    0x8000400,
+    0x4000400,
+    0x2000200,
+    0x200100,
+    0x200010,
     0x100010,
-    0x80008,
-    0x40008004,
-    0x0,
-    0x10000,
+    0x80010,
+    0x8001,
+    0x40000000,
+    0x20002000,
+    0x10001000,
+    0x1000800,
+    0x80,
+    0x100020,
+    0x80010,
+    0x80040008,
+    0x40004000,
+    0x20002000,
+    0x10001000,
+    0x1000800,
+    0x100080,
+    0x80010,
+    0x40008,
+    0x40020004,
+    0x2000,
+    0x200000,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_prog_ext_1[29] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_prog_ext_1[30] =
 {
     0x0,
     0x0,
@@ -2630,14 +3016,15 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0xf8000000,
-    0x7fdf7fbe,
-    0xbfefbfdf,
-    0xfbf7dfef,
-    0xf7dfe,
+    0x0,
+    0xbe000000,
+    0xdff7dfef,
+    0xeffbeff7,
+    0xbefdf7fb,
+    0x3df7f,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_prog_ext_2[36] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_prog_ext_2[37] =
 {
     0x0,
     0x0,
@@ -2650,63 +3037,36 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0xf7de0,
-    0x0,
-    0x0,
-    0x80000000,
-    0x3df7,
-    0x0,
-    0x0,
-    0x1efbc00,
-    0x0,
-    0x0,
-    0x0,
-    0xdf780000,
-    0x3,
-    0x0,
-    0x0,
-    0xbc000000,
-    0x1ef,
-    0x0,
-    0x0,
     0xbef00000,
     0x7,
     0x0,
     0x0,
-    0x0,
-    0x7bef00,
-};
-
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rarp[39] =
-{
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
+    0x1efbc000,
     0x0,
     0x0,
+    0xde000000,
+    0xf7,
     0x0,
     0x0,
     0x0,
+    0xf7de0000,
     0x0,
     0x0,
     0x0,
+    0xef000000,
+    0x7b,
     0x0,
     0x0,
+    0xf7de0000,
     0x0,
     0x0,
     0x0,
+    0xf7800000,
+    0x3d,
+};
+
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rarp[39] =
+{
     0x0,
     0x0,
     0x0,
@@ -2717,11 +3077,6 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x20000,
-};
-
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rout_ext_1[33] =
-{
     0x0,
     0x0,
     0x0,
@@ -2750,14 +3105,10 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0xfbe00000,
-    0x7dff7dfe,
-    0xbeffbeff,
-    0xfbefdf7f,
-    0x3df7,
+    0x400000,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rout_ext_2[37] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rout_ext_1[34] =
 {
     0x0,
     0x0,
@@ -2770,35 +3121,32 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0xbef00000,
-    0x7,
     0x0,
     0x0,
-    0x1efbc000,
     0x0,
     0x0,
-    0xde000000,
-    0xf7,
     0x0,
     0x0,
     0x0,
-    0x1efbc,
     0x0,
     0x0,
     0x0,
-    0xf7de00,
     0x0,
     0x0,
     0x0,
-    0x3df78,
     0x0,
     0x0,
     0x0,
-    0xf7800000,
-    0x3d,
+    0x0,
+    0x0,
+    0xdf7c0000,
+    0xefbfefbf,
+    0xf7dff7df,
+    0xff7dfbef,
+    0x7be,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_seg_rout_ext_1[33] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rout_ext_2[37] =
 {
     0x0,
     0x0,
@@ -2812,154 +3160,160 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
+    0x3df78,
     0x0,
     0x0,
+    0xe0000000,
+    0xf7d,
     0x0,
     0x0,
+    0x7bef00,
     0x0,
     0x0,
     0x0,
     0x0,
+    0x7bef,
     0x0,
     0x0,
     0x0,
+    0x3df780,
     0x0,
     0x0,
     0x0,
+    0x7bef,
     0x0,
     0x0,
     0x0,
-    0x0,
-    0x0,
-    0x0,
-    0xf7dc000,
+    0x1efbc0,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_tcp_first_4bytes[37] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_tcp_first_4bytes[38] =
 {
     0x0,
     0x0,
     0x0,
     0x16,
-    0xc00e0000,
-    0x2,
+    0x0,
+    0x16007,
     0x0,
     0x0,
-    0xb00,
-    0xb001600,
-    0x5800b00,
-    0x2c00580,
-    0x2c0058,
-    0x2c0058,
-    0x16002c,
-    0x600b0016,
-    0x6000b001,
-    0xb000b001,
-    0x5800b000,
-    0x5800b00,
     0x5800000,
-    0x2c002c0,
-    0x1600160,
-    0x1600b0,
-    0xc003800b,
-    0x60016002,
-    0xb000b001,
-    0xb005800,
-    0xb000580,
+    0xb000000,
     0x5800580,
     0x2c002c0,
     0x2c0160,
-    0xb0058016,
+    0x2c0016,
+    0x160016,
+    0x800b000b,
+    0x5800b005,
     0x5800b000,
-    0x2c005800,
-    0x16002c00,
-    0x16002c0,
+    0x58005800,
+    0x5802c00,
+    0x2c0,
+    0x1600000,
+    0xb000b0,
+    0x580058,
+    0xc005802c,
+    0xb000e002,
+    0x58005800,
+    0x2c002c00,
+    0x2c01600,
+    0x1600160,
+    0xb000b0,
+    0x580058,
+    0xc005802c,
+    0x58005802,
+    0x2c002c00,
+    0x16001600,
+    0x1600b00,
+    0xb0,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_tcp_last_16bytes[37] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_tcp_last_16bytes[38] =
 {
     0x0,
     0x0,
     0x0,
     0x14,
-    0x800c0000,
-    0x2,
+    0x0,
+    0x14006,
     0x0,
     0x0,
-    0xa00,
-    0xa001400,
-    0x5000a00,
-    0x2800500,
-    0x280050,
-    0x280050,
-    0x140028,
-    0x400a0014,
-    0x4000a001,
-    0xa000a001,
-    0x5000a000,
-    0x5000a00,
     0x5000000,
-    0x2800280,
-    0x1400140,
-    0x1400a0,
-    0x8003000a,
-    0x40014002,
-    0xa000a001,
-    0xa005000,
-    0xa000500,
+    0xa000000,
     0x5000500,
     0x2800280,
     0x280140,
-    0xa0050014,
+    0x280014,
+    0x140014,
+    0xa000a,
+    0x5000a005,
     0x5000a000,
-    0x28005000,
-    0x14002800,
-    0x1400280,
+    0x50005000,
+    0x5002800,
+    0x280,
+    0x1400000,
+    0xa000a0,
+    0x500050,
+    0x80050028,
+    0xa000c002,
+    0x50005000,
+    0x28002800,
+    0x2801400,
+    0x1400140,
+    0xa000a0,
+    0x500050,
+    0x80050028,
+    0x50005002,
+    0x28002800,
+    0x14001400,
+    0x1400a00,
+    0xa0,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_udp[38] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_udp[38] =
 {
     0x0,
     0x0,
     0x0,
     0x1de0,
-    0x2200000,
-    0x3bc,
-    0x0,
-    0x0,
-    0xef000,
-    0xf01de000,
-    0x780ef00e,
-    0xbc077807,
-    0x3bc07783,
-    0x3bc07780,
-    0x1de03bc0,
-    0xef01de0,
-    0xef01de,
-    0xef01de,
-    0x80ef00ef,
-    0x780ef077,
-    0x78000007,
-    0xbc03bc07,
-    0xde01de03,
-    0x1de0ef01,
-    0x880ef0,
-    0x1de03bc,
-    0xef01de,
-    0xf07780ef,
-    0xf007780e,
+    0x0,
+    0x1de0110,
+    0x0,
+    0x0,
+    0x78000000,
+    0xf0000007,
     0x7807780e,
     0xbc03bc07,
     0x3bc1de03,
-    0x7781de0,
-    0x80ef00ef,
-    0xc0778077,
-    0xe03bc03b,
-    0xde03bc1d,
-    0x1,
+    0x3bc01de0,
+    0x1de01de0,
+    0xef00ef0,
+    0x80ef0778,
+    0x80ef0077,
+    0x80778077,
+    0x783bc077,
+    0x3bc07,
+    0xde000000,
+    0xef00ef01,
+    0x77807780,
+    0x7783bc0,
+    0x2203bc,
+    0x807780ef,
+    0xc03bc077,
+    0xbc1de03b,
+    0xde01de03,
+    0xef00ef01,
+    0x77807780,
+    0x7783bc0,
+    0x807783bc,
+    0xc03bc077,
+    0xe01de03b,
+    0xde0ef01d,
+    0xef01,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l3[39] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l3[39] =
 {
     0x0,
     0x0,
@@ -2999,146 +3353,147 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x40000,
+    0x800000,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l4[38] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l4[38] =
 {
     0x0,
     0x0,
     0x0,
     0x2000,
     0x0,
-    0x400,
+    0x2000000,
+    0x0,
     0x0,
     0x0,
-    0x100000,
-    0x200000,
-    0x100010,
-    0x80008,
-    0x40008004,
-    0x40008000,
-    0x20004000,
-    0x10002000,
-    0x1000200,
-    0x1000200,
-    0x1000100,
-    0x100080,
     0x8,
-    0x40008,
-    0x20004,
-    0x20010002,
-    0x1000,
-    0x2000400,
-    0x1000200,
-    0x800100,
-    0x80010,
     0x80010,
     0x40008,
     0x40020004,
-    0x8002000,
-    0x1000100,
+    0x40002000,
+    0x20002000,
+    0x10001000,
+    0x1000800,
+    0x1000080,
     0x800080,
-    0x400040,
-    0x40020,
-    0x2,
+    0x400080,
+    0x40008,
+    0x0,
+    0x10002,
+    0x80008001,
+    0x8004000,
+    0x400,
+    0x800100,
+    0x400080,
+    0x200040,
+    0x20004,
+    0x10002,
+    0x80008001,
+    0x8004000,
+    0x800400,
+    0x400080,
+    0x200040,
+    0x100020,
+    0x10002,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l5[37] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l5[38] =
 {
     0x0,
     0x0,
     0x0,
     0x810,
     0x0,
-    0x102,
-    0x0,
-    0x0,
-    0x40800,
-    0x8081000,
-    0x4040804,
-    0x2020402,
-    0x10202041,
-    0x10202040,
-    0x8101020,
-    0x4080810,
-    0x408081,
-    0x80408081,
-    0x40408040,
-    0x4040820,
-    0x4000002,
-    0x2010202,
-    0x81008101,
-    0x8104080,
-    0x408,
-    0x810102,
-    0x80408081,
-    0x8204040,
-    0x8020404,
+    0x810000,
+    0x0,
+    0x0,
+    0x4000000,
+    0x8000002,
     0x4020404,
     0x2010202,
     0x10208101,
-    0x82040810,
-    0x40408040,
-    0x20204020,
-    0x10102010,
-    0x81010208,
+    0x10200810,
+    0x8100810,
+    0x4080408,
+    0x40408204,
+    0x40408020,
+    0x40204020,
+    0x4102020,
+    0x10202,
+    0x81000000,
+    0x40804080,
+    0x20402040,
+    0x2041020,
+    0x80000102,
+    0x40204040,
+    0x20102020,
+    0x2081010,
+    0x81008101,
+    0x40804080,
+    0x20402040,
+    0x2041020,
+    0x40204102,
+    0x20102020,
+    0x10081010,
+    0x81040808,
+    0x4080,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_vxlan[38] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_vxlan[38] =
 {
     0x0,
     0x0,
     0x0,
     0x1000,
     0x0,
-    0x200,
+    0x1000000,
+    0x0,
     0x0,
     0x0,
-    0x80000,
-    0x100000,
-    0x80008,
-    0x40004,
-    0x20004002,
-    0x20004000,
-    0x10002000,
-    0x8001000,
-    0x800100,
-    0x800100,
-    0x800080,
-    0x80040,
     0x4,
-    0x20004,
-    0x10002,
-    0x10008001,
-    0x800,
-    0x1000200,
-    0x800100,
-    0x400080,
-    0x40008,
     0x40008,
     0x20004,
     0x20010002,
-    0x4001000,
-    0x800080,
+    0x20001000,
+    0x10001000,
+    0x8000800,
+    0x800400,
+    0x800040,
     0x400040,
-    0x200020,
-    0x20010,
-    0x1,
+    0x200040,
+    0x20004,
+    0x0,
+    0x80008001,
+    0x40004000,
+    0x4002000,
+    0x200,
+    0x400080,
+    0x200040,
+    0x100020,
+    0x10002,
+    0x80008001,
+    0x40004000,
+    0x4002000,
+    0x400200,
+    0x200040,
+    0x100020,
+    0x80010,
+    0x8001,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_wesp_ext_1[38] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_wesp_ext_1[38] =
 {
     0x0,
     0x0,
     0x0,
     0x0,
     0x0,
-    0x800,
+    0x4000000,
     0x0,
-    0x200,
-    0x1efb00,
-    0x10,
+    0x1000000,
+    0x7d800000,
+    0x8000f,
     0x0,
     0x0,
     0x0,
@@ -3162,14 +3517,14 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0xdfefbe00,
-    0xeff7dff7,
-    0xf7fbeffb,
-    0xdf7fbefd,
-    0x3,
+    0xdf000000,
+    0xeffbeff7,
+    0xf7fdf7fb,
+    0xdf7efbfd,
+    0x1efbf,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_wesp_ext_2[38] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_wesp_ext_2[38] =
 {
     0x0,
     0x0,
@@ -3183,889 +3538,875 @@ static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x7bef0000,
+    0x80000000,
+    0x3df7,
     0x0,
     0x0,
+    0xde000000,
+    0xf7,
     0x0,
-    0x1efbc00,
     0x0,
+    0x7bef0,
     0x0,
-    0x7de00000,
-    0xf,
     0x0,
     0x0,
-    0xc0000000,
-    0x1efb,
+    0xf0000000,
+    0x7be,
     0x0,
     0x0,
     0x0,
-    0xf7de0,
+    0x3df78,
     0x0,
     0x0,
-    0x80000000,
-    0x3df7,
+    0xf0000000,
+    0x7be,
     0x0,
     0x0,
     0x0,
-    0xdf780000,
-    0x3,
+    0x1efbc,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_sys_hdr_ep_nih[1] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_sys_hdr_ep_nih[1] =
 {
     0x4,
 };
 
-static uint32_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_sys_hdr_loopback[1] =
+static uint32_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_sys_hdr_loopback[1] =
 {
     0x8,
 };
 
 
 static bcmpkt_rxpmd_match_id_db_t
-bcm56690_a0_dna_6_5_29_0_1_rxpmd_match_id_db[BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_COUNT] = {
+bcm56690_a0_dna_6_5_31_7_0_rxpmd_match_id_db[BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_COUNT] = {
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_CNTAG */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_CNTAG */
         .name         = "EGRESS_PKT_FWD_L2_HDR_CNTAG",
         .match        = 0x80,
         .match_mask   = 0xc0,
-        .match_maxbit = 35,
-        .match_minbit = 28,
+        .match_maxbit = 36,
+        .match_minbit = 29,
         .maxbit       = 7,
         .minbit       = 6,
         .value        = 0x2,
-        .pmaxbit      = 35,
-        .pminbit      = 28,
+        .pmaxbit      = 36,
+        .pminbit      = 29,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_GBP_ETHERNET_SHIM */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_GBP_ETHERNET_SHIM */
         .name         = "EGRESS_PKT_FWD_L2_HDR_GBP_ETHERNET_SHIM",
         .match        = 0x40,
         .match_mask   = 0xc0,
-        .match_maxbit = 35,
-        .match_minbit = 28,
+        .match_maxbit = 36,
+        .match_minbit = 29,
         .maxbit       = 7,
         .minbit       = 6,
         .value        = 0x1,
-        .pmaxbit      = 35,
-        .pminbit      = 28,
+        .pmaxbit      = 36,
+        .pminbit      = 29,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_BASE */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_BASE */
         .name         = "EGRESS_PKT_FWD_L2_HDR_HG3_BASE",
         .match        = 0x2,
         .match_mask   = 0x2,
-        .match_maxbit = 35,
-        .match_minbit = 28,
+        .match_maxbit = 36,
+        .match_minbit = 29,
         .maxbit       = 1,
         .minbit       = 1,
         .value        = 0x1,
-        .pmaxbit      = 35,
-        .pminbit      = 28,
+        .pmaxbit      = 36,
+        .pminbit      = 29,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0 */
         .name         = "EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0",
         .match        = 0x8,
         .match_mask   = 0x8,
-        .match_maxbit = 35,
-        .match_minbit = 28,
+        .match_maxbit = 36,
+        .match_minbit = 29,
         .maxbit       = 3,
         .minbit       = 3,
         .value        = 0x1,
-        .pmaxbit      = 35,
-        .pminbit      = 28,
+        .pmaxbit      = 36,
+        .pminbit      = 29,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG */
         .name         = "EGRESS_PKT_FWD_L2_HDR_ITAG",
         .match        = 0x20,
         .match_mask   = 0x20,
-        .match_maxbit = 35,
-        .match_minbit = 28,
+        .match_maxbit = 36,
+        .match_minbit = 29,
         .maxbit       = 5,
         .minbit       = 5,
         .value        = 0x1,
-        .pmaxbit      = 35,
-        .pminbit      = 28,
+        .pmaxbit      = 36,
+        .pminbit      = 29,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2 */
         .name         = "EGRESS_PKT_FWD_L2_HDR_L2",
         .match        = 0x1,
         .match_mask   = 0x1,
-        .match_maxbit = 35,
-        .match_minbit = 28,
+        .match_maxbit = 36,
+        .match_minbit = 29,
         .maxbit       = 0,
         .minbit       = 0,
         .value        = 0x1,
-        .pmaxbit      = 35,
-        .pminbit      = 28,
+        .pmaxbit      = 36,
+        .pminbit      = 29,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE */
         .name         = "EGRESS_PKT_FWD_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0xff,
-        .match_maxbit = 35,
-        .match_minbit = 28,
+        .match_maxbit = 36,
+        .match_minbit = 29,
         .maxbit       = 7,
         .minbit       = 0,
         .value        = 0x0,
-        .pmaxbit      = 35,
-        .pminbit      = 28,
+        .pmaxbit      = 36,
+        .pminbit      = 29,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG */
         .name         = "EGRESS_PKT_FWD_L2_HDR_OTAG",
         .match        = 0x10,
         .match_mask   = 0x10,
-        .match_maxbit = 35,
-        .match_minbit = 28,
+        .match_maxbit = 36,
+        .match_minbit = 29,
         .maxbit       = 4,
         .minbit       = 4,
         .value        = 0x1,
-        .pmaxbit      = 35,
-        .pminbit      = 28,
+        .pmaxbit      = 36,
+        .pminbit      = 29,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC */
         .name         = "EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC",
         .match        = 0x4,
         .match_mask   = 0x4,
-        .match_maxbit = 35,
-        .match_minbit = 28,
+        .match_maxbit = 36,
+        .match_minbit = 29,
         .maxbit       = 2,
         .minbit       = 2,
         .value        = 0x1,
-        .pmaxbit      = 35,
-        .pminbit      = 28,
+        .pmaxbit      = 36,
+        .pminbit      = 29,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ARP",
         .match        = 0x4000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match_mask   = 0x7c006,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1",
-        .match        = 0x24000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match        = 0x10000,
+        .match_mask   = 0x1c000,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x9,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x4,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2",
         .match        = 0x140,
         .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x5,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_BFD",
         .match        = 0x3000,
         .match_mask   = 0x3800,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x6,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_1 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_1",
-        .match        = 0x2c000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match        = 0xc004,
+        .match_mask   = 0x1c406,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0xb,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x3,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_2 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_2",
         .match        = 0x200,
         .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x8,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT",
         .match        = 0x40,
         .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 0,
         .minbit       = 0,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1",
-        .match        = 0x30000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match        = 0x18000,
+        .match_mask   = 0x1c000,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0xc,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x6,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2",
         .match        = 0x240,
         .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x9,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GPE",
         .match        = 0x30,
         .match_mask   = 0x438,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 5,
         .minbit       = 5,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE",
-        .match        = 0x18,
-        .match_mask   = 0x418,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 4,
-        .minbit       = 3,
-        .value        = 0x3,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .match        = 0x40000,
+        .match_mask   = 0x40000,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 18,
+        .minbit       = 18,
+        .value        = 0x1,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM",
         .match        = 0x80,
         .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x2,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY",
         .match        = 0x1800,
         .match_mask   = 0x3800,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x3,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT",
-        .match        = 0x10000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match        = 0x44000,
+        .match_mask   = 0x5c000,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x4,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x1,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ",
-        .match        = 0x38,
-        .match_mask   = 0x438,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match        = 0x40020,
+        .match_mask   = 0x40020,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 5,
         .minbit       = 5,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_1 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_1",
-        .match        = 0x8000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match        = 0x4004,
+        .match_mask   = 0x7c406,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x2,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x1,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_2 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_2",
         .match        = 0xc0,
         .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x3,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ICMP",
         .match        = 0x800,
         .match_mask   = 0x3818,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_HEADER */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_HEADER */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IFA_HEADER",
-        .match        = 0x2c0,
-        .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 9,
-        .minbit       = 6,
-        .value        = 0xb,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .match        = 0x20000,
+        .match_mask   = 0x20000,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 17,
+        .minbit       = 17,
+        .value        = 0x1,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA */
-        .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA",
-        .match        = 0xc000,
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA_BASE */
+        .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA_BASE",
+        .match        = 0x24000,
         .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x3,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x1,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IGMP",
         .match        = 0x100,
         .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x4,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IOAM_E2E */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IOAM_E2E */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IOAM_E2E",
         .match        = 0x1000,
         .match_mask   = 0x3800,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x2,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IPV4",
         .match        = 0x2,
         .match_mask   = 0x406,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 2,
         .minbit       = 1,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IPV6",
         .match        = 0x4,
         .match_mask   = 0x406,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 2,
         .minbit       = 1,
         .value        = 0x2,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS0",
         .match        = 0x400,
         .match_mask   = 0x400,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 10,
         .minbit       = 10,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS1",
         .match        = 0x402,
         .match_mask   = 0x402,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 1,
         .minbit       = 1,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS2",
         .match        = 0x404,
         .match_mask   = 0x404,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 2,
         .minbit       = 2,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS3",
         .match        = 0x408,
         .match_mask   = 0x408,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 3,
         .minbit       = 3,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS4",
         .match        = 0x410,
         .match_mask   = 0x410,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 4,
         .minbit       = 4,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS5",
         .match        = 0x420,
         .match_mask   = 0x420,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 5,
         .minbit       = 5,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS6",
         .match        = 0x440,
         .match_mask   = 0x440,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 6,
         .minbit       = 6,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH",
         .match        = 0x480,
         .match_mask   = 0x480,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 7,
         .minbit       = 7,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW",
         .match        = 0x500,
         .match_mask   = 0x500,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 8,
         .minbit       = 8,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_NONE",
         .match        = 0x0,
-        .match_mask   = 0x3ffff,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match_mask   = 0x7ffff,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 18,
         .minbit       = 0,
         .value        = 0x0,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_P_1588",
         .match        = 0x2800,
         .match_mask   = 0x3800,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x5,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_1 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_1",
-        .match        = 0x34000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match        = 0x1c000,
+        .match_mask   = 0x1c000,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0xd,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x7,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_2 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_2",
         .match        = 0x280,
         .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0xa,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_RARP",
-        .match        = 0x14000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match        = 0x8000,
+        .match_mask   = 0x1c006,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x5,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x2,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_1 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_1",
-        .match        = 0x20000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match        = 0x8004,
+        .match_mask   = 0x1c406,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x8,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x2,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_2 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_2",
         .match        = 0x1c0,
         .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x7,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
-
-    },
-    {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_SEG_ROUT_EXT_1 */
-        .name         = "EGRESS_PKT_FWD_L3_L4_HDR_SEG_ROUT_EXT_1",
-        .match        = 0x18000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
-        .minbit       = 14,
-        .value        = 0x6,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x8,
         .match_mask   = 0x418,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 4,
         .minbit       = 3,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x28,
         .match_mask   = 0x438,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 5,
         .minbit       = 5,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UDP",
         .match        = 0x10,
         .match_mask   = 0x418,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 4,
         .minbit       = 3,
         .value        = 0x2,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3",
-        .match        = 0x1c000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match        = 0xc000,
+        .match_mask   = 0x1c006,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x7,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x3,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x2000,
         .match_mask   = 0x3800,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x4,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x3800,
         .match_mask   = 0x3800,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x7,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_VXLAN",
         .match        = 0x810,
         .match_mask   = 0x3c18,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_1 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_1",
-        .match        = 0x28000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match        = 0x14000,
+        .match_mask   = 0x1c000,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0xa,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x5,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_2 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_2",
         .match        = 0x180,
         .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x6,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH */
         .name         = "EGRESS_PKT_SYS_HDR_EP_NIH",
         .match        = 0x2,
         .match_mask   = 0x3,
@@ -4079,7 +4420,7 @@ bcm56690_a0_dna_6_5_29_0_1_rxpmd_match_id_db[BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MA
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK */
         .name         = "EGRESS_PKT_SYS_HDR_LOOPBACK",
         .match        = 0x1,
         .match_mask   = 0x3,
@@ -4093,7 +4434,7 @@ bcm56690_a0_dna_6_5_29_0_1_rxpmd_match_id_db[BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MA
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE */
         .name         = "EGRESS_PKT_SYS_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3,
@@ -4107,7 +4448,7 @@ bcm56690_a0_dna_6_5_29_0_1_rxpmd_match_id_db[BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MA
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_CNTAG */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_CNTAG */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_CNTAG",
         .match        = 0x80,
         .match_mask   = 0xc0,
@@ -4121,7 +4462,7 @@ bcm56690_a0_dna_6_5_29_0_1_rxpmd_match_id_db[BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MA
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_GBP_ETHERNET_SHIM */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_GBP_ETHERNET_SHIM */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_GBP_ETHERNET_SHIM",
         .match        = 0x40,
         .match_mask   = 0xc0,
@@ -4135,7 +4476,7 @@ bcm56690_a0_dna_6_5_29_0_1_rxpmd_match_id_db[BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MA
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE",
         .match        = 0x2,
         .match_mask   = 0x2,
@@ -4149,7 +4490,7 @@ bcm56690_a0_dna_6_5_29_0_1_rxpmd_match_id_db[BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MA
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0 */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0",
         .match        = 0x8,
         .match_mask   = 0x8,
@@ -4163,7 +4504,7 @@ bcm56690_a0_dna_6_5_29_0_1_rxpmd_match_id_db[BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MA
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_ITAG",
         .match        = 0x20,
         .match_mask   = 0x20,
@@ -4177,7 +4518,7 @@ bcm56690_a0_dna_6_5_29_0_1_rxpmd_match_id_db[BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MA
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2 */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_L2",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -4191,7 +4532,7 @@ bcm56690_a0_dna_6_5_29_0_1_rxpmd_match_id_db[BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MA
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0xff,
@@ -4205,7 +4546,7 @@ bcm56690_a0_dna_6_5_29_0_1_rxpmd_match_id_db[BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MA
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_OTAG",
         .match        = 0x10,
         .match_mask   = 0x10,
@@ -4219,7 +4560,7 @@ bcm56690_a0_dna_6_5_29_0_1_rxpmd_match_id_db[BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MA
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC",
         .match        = 0x4,
         .match_mask   = 0x4,
@@ -4233,1383 +4574,1405 @@ bcm56690_a0_dna_6_5_29_0_1_rxpmd_match_id_db[BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MA
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP",
         .match        = 0x4000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match_mask   = 0x7c006,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1",
-        .match        = 0x24000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0x10000,
+        .match_mask   = 0x1c000,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x9,
-        .pmaxbit      = 27,
+        .value        = 0x4,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2",
         .match        = 0x140,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x5,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD",
         .match        = 0x3000,
         .match_mask   = 0x3800,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x6,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_1 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_1",
-        .match        = 0x2c000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0xc004,
+        .match_mask   = 0x1c406,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0xb,
-        .pmaxbit      = 27,
+        .value        = 0x3,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_2 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_2",
         .match        = 0x200,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x8,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT",
         .match        = 0x40,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 0,
         .minbit       = 0,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1",
-        .match        = 0x30000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0x18000,
+        .match_mask   = 0x1c000,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0xc,
-        .pmaxbit      = 27,
+        .value        = 0x6,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2",
         .match        = 0x240,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x9,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE",
         .match        = 0x30,
         .match_mask   = 0x438,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 5,
         .minbit       = 5,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE",
-        .match        = 0x18,
-        .match_mask   = 0x418,
-        .match_maxbit = 27,
+        .match        = 0x40000,
+        .match_mask   = 0x40000,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 4,
-        .minbit       = 3,
-        .value        = 0x3,
-        .pmaxbit      = 27,
+        .maxbit       = 18,
+        .minbit       = 18,
+        .value        = 0x1,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM",
         .match        = 0x80,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x2,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY",
         .match        = 0x1800,
         .match_mask   = 0x3800,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x3,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT",
-        .match        = 0x10000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0x44000,
+        .match_mask   = 0x5c000,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x4,
-        .pmaxbit      = 27,
+        .value        = 0x1,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ",
-        .match        = 0x38,
-        .match_mask   = 0x438,
-        .match_maxbit = 27,
+        .match        = 0x40020,
+        .match_mask   = 0x40020,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 5,
         .minbit       = 5,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_1 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_1",
-        .match        = 0x8000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0x4004,
+        .match_mask   = 0x7c406,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x2,
-        .pmaxbit      = 27,
+        .value        = 0x1,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_2 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_2",
         .match        = 0xc0,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x3,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP",
         .match        = 0x800,
         .match_mask   = 0x3818,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_HEADER */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_HEADER */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_HEADER",
-        .match        = 0x2c0,
-        .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match        = 0x20000,
+        .match_mask   = 0x20000,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 9,
-        .minbit       = 6,
-        .value        = 0xb,
-        .pmaxbit      = 27,
+        .maxbit       = 17,
+        .minbit       = 17,
+        .value        = 0x1,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA */
-        .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA",
-        .match        = 0xc000,
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA_BASE */
+        .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA_BASE",
+        .match        = 0x24000,
         .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x3,
-        .pmaxbit      = 27,
+        .value        = 0x1,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP",
         .match        = 0x100,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x4,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IOAM_E2E */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IOAM_E2E */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IOAM_E2E",
         .match        = 0x1000,
         .match_mask   = 0x3800,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x2,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4",
         .match        = 0x2,
         .match_mask   = 0x406,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 2,
         .minbit       = 1,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6",
         .match        = 0x4,
         .match_mask   = 0x406,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 2,
         .minbit       = 1,
         .value        = 0x2,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0",
         .match        = 0x400,
         .match_mask   = 0x400,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 10,
         .minbit       = 10,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1",
         .match        = 0x402,
         .match_mask   = 0x402,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 1,
         .minbit       = 1,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2",
         .match        = 0x404,
         .match_mask   = 0x404,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 2,
         .minbit       = 2,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3",
         .match        = 0x408,
         .match_mask   = 0x408,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 3,
         .minbit       = 3,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4",
         .match        = 0x410,
         .match_mask   = 0x410,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 4,
         .minbit       = 4,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5",
         .match        = 0x420,
         .match_mask   = 0x420,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 5,
         .minbit       = 5,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6",
         .match        = 0x440,
         .match_mask   = 0x440,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 6,
         .minbit       = 6,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH",
         .match        = 0x480,
         .match_mask   = 0x480,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 7,
         .minbit       = 7,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW",
         .match        = 0x500,
         .match_mask   = 0x500,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 8,
         .minbit       = 8,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE",
         .match        = 0x0,
-        .match_mask   = 0x3ffff,
-        .match_maxbit = 27,
+        .match_mask   = 0x7ffff,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 18,
         .minbit       = 0,
         .value        = 0x0,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588",
         .match        = 0x2800,
         .match_mask   = 0x3800,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x5,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_1 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_1",
-        .match        = 0x34000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0x1c000,
+        .match_mask   = 0x1c000,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0xd,
-        .pmaxbit      = 27,
+        .value        = 0x7,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_2 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_2",
         .match        = 0x280,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0xa,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP",
-        .match        = 0x14000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0x8000,
+        .match_mask   = 0x1c006,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x5,
-        .pmaxbit      = 27,
+        .value        = 0x2,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_1 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_1",
-        .match        = 0x20000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0x8004,
+        .match_mask   = 0x1c406,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x8,
-        .pmaxbit      = 27,
+        .value        = 0x2,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_2 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_2",
         .match        = 0x1c0,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x7,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_SEG_ROUT_EXT_1 */
-        .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_SEG_ROUT_EXT_1",
-        .match        = 0x18000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
-        .match_minbit = 10,
-        .maxbit       = 17,
-        .minbit       = 14,
-        .value        = 0x6,
-        .pmaxbit      = 27,
-        .pminbit      = 10,
-
-    },
-    {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x8,
         .match_mask   = 0x418,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 4,
         .minbit       = 3,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x28,
         .match_mask   = 0x438,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 5,
         .minbit       = 5,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP",
         .match        = 0x10,
         .match_mask   = 0x418,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 4,
         .minbit       = 3,
         .value        = 0x2,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3",
-        .match        = 0x1c000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0xc000,
+        .match_mask   = 0x1c006,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x7,
-        .pmaxbit      = 27,
+        .value        = 0x3,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x2000,
         .match_mask   = 0x3800,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x4,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x3800,
         .match_mask   = 0x3800,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x7,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN",
         .match        = 0x810,
         .match_mask   = 0x3c18,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_1 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_1",
-        .match        = 0x28000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0x14000,
+        .match_mask   = 0x1c000,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0xa,
-        .pmaxbit      = 27,
+        .value        = 0x5,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_2 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_2",
         .match        = 0x180,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x6,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_CNTAG */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_CNTAG */
         .name         = "INGRESS_PKT_INNER_L2_HDR_CNTAG",
         .match        = 0x80,
         .match_mask   = 0xc0,
-        .match_maxbit = 35,
-        .match_minbit = 28,
+        .match_maxbit = 36,
+        .match_minbit = 29,
         .maxbit       = 7,
         .minbit       = 6,
         .value        = 0x2,
-        .pmaxbit      = 35,
-        .pminbit      = 28,
+        .pmaxbit      = 36,
+        .pminbit      = 29,
         .zone_minbit  = 19,
         .arc_id_mask  = 0xf80000,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l2_hdr_cntag,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_cntag,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG */
         .name         = "INGRESS_PKT_INNER_L2_HDR_ITAG",
         .match        = 0x20,
         .match_mask   = 0x20,
-        .match_maxbit = 35,
-        .match_minbit = 28,
+        .match_maxbit = 36,
+        .match_minbit = 29,
         .maxbit       = 5,
         .minbit       = 5,
         .value        = 0x1,
-        .pmaxbit      = 35,
-        .pminbit      = 28,
+        .pmaxbit      = 36,
+        .pminbit      = 29,
         .zone_minbit  = 19,
         .arc_id_mask  = 0xf80000,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l2_hdr_itag,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_itag,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2 */
         .name         = "INGRESS_PKT_INNER_L2_HDR_L2",
         .match        = 0x1,
         .match_mask   = 0x1,
-        .match_maxbit = 35,
-        .match_minbit = 28,
+        .match_maxbit = 36,
+        .match_minbit = 29,
         .maxbit       = 0,
         .minbit       = 0,
         .value        = 0x1,
-        .pmaxbit      = 35,
-        .pminbit      = 28,
+        .pmaxbit      = 36,
+        .pminbit      = 29,
         .zone_minbit  = 19,
         .arc_id_mask  = 0xf80000,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l2_hdr_l2,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_l2,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE */
         .name         = "INGRESS_PKT_INNER_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0xff,
-        .match_maxbit = 35,
-        .match_minbit = 28,
+        .match_maxbit = 36,
+        .match_minbit = 29,
         .maxbit       = 7,
         .minbit       = 0,
         .value        = 0x0,
-        .pmaxbit      = 35,
-        .pminbit      = 28,
+        .pmaxbit      = 36,
+        .pminbit      = 29,
         .zone_minbit  = 19,
         .arc_id_mask  = 0xf80000,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG */
         .name         = "INGRESS_PKT_INNER_L2_HDR_OTAG",
         .match        = 0x10,
         .match_mask   = 0x10,
-        .match_maxbit = 35,
-        .match_minbit = 28,
+        .match_maxbit = 36,
+        .match_minbit = 29,
         .maxbit       = 4,
         .minbit       = 4,
         .value        = 0x1,
-        .pmaxbit      = 35,
-        .pminbit      = 28,
+        .pmaxbit      = 36,
+        .pminbit      = 29,
         .zone_minbit  = 19,
         .arc_id_mask  = 0xf80000,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l2_hdr_otag,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_otag,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC */
         .name         = "INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC",
         .match        = 0x4,
         .match_mask   = 0x4,
-        .match_maxbit = 35,
-        .match_minbit = 28,
+        .match_maxbit = 36,
+        .match_minbit = 29,
         .maxbit       = 2,
         .minbit       = 2,
         .value        = 0x1,
-        .pmaxbit      = 35,
-        .pminbit      = 28,
+        .pmaxbit      = 36,
+        .pminbit      = 29,
         .zone_minbit  = 19,
         .arc_id_mask  = 0xf80000,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l2_hdr_snap_or_llc,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_snap_or_llc,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ARP",
         .match        = 0x4000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match_mask   = 0x7c006,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 24,
         .arc_id_mask  = 0x7ff000000,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_arp,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_arp,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1",
-        .match        = 0x24000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match        = 0x10000,
+        .match_mask   = 0x1c000,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x9,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x4,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 24,
         .arc_id_mask  = 0x7ff000000,
-        .num_zone_bmp_words = 32,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_auth_ext_1,
+        .num_zone_bmp_words = 39,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_auth_ext_1,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2",
         .match        = 0x140,
         .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x5,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 24,
         .arc_id_mask  = 0x7ff000000,
-        .num_zone_bmp_words = 45,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_auth_ext_2,
+        .num_zone_bmp_words = 55,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_auth_ext_2,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_BFD",
         .match        = 0x3000,
         .match_mask   = 0x3800,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x6,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 24,
         .arc_id_mask  = 0x7ff000000,
-        .num_zone_bmp_words = 47,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_bfd,
+        .num_zone_bmp_words = 57,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_bfd,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_1 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_1 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_1",
-        .match        = 0x2c000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match        = 0xc004,
+        .match_mask   = 0x1c406,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0xb,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x3,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 24,
         .arc_id_mask  = 0x7ff000000,
-        .num_zone_bmp_words = 35,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_dest_opt_ext_1,
+        .num_zone_bmp_words = 42,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_dest_opt_ext_1,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_2 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_2 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_2",
         .match        = 0x200,
         .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x8,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 24,
         .arc_id_mask  = 0x7ff000000,
-        .num_zone_bmp_words = 45,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_dest_opt_ext_2,
+        .num_zone_bmp_words = 55,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_dest_opt_ext_2,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT",
         .match        = 0x40,
         .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 24,
         .arc_id_mask  = 0x7ff000000,
-        .num_zone_bmp_words = 45,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_esp_ext,
+        .num_zone_bmp_words = 55,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_esp_ext,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 0,
         .minbit       = 0,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 24,
         .arc_id_mask  = 0x7ff000000,
-        .num_zone_bmp_words = 24,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ethertype,
+        .num_zone_bmp_words = 29,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ethertype,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1",
-        .match        = 0x30000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match        = 0x18000,
+        .match_mask   = 0x1c000,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0xc,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x6,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 24,
         .arc_id_mask  = 0x7ff000000,
-        .num_zone_bmp_words = 37,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_frag_ext_1,
+        .num_zone_bmp_words = 45,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_frag_ext_1,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2",
         .match        = 0x240,
         .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x9,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 24,
         .arc_id_mask  = 0x7ff000000,
-        .num_zone_bmp_words = 46,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_frag_ext_2,
+        .num_zone_bmp_words = 56,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_frag_ext_2,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_1 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_1 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_1",
-        .match        = 0x8000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match        = 0x4004,
+        .match_mask   = 0x7c406,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x2,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x1,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 24,
         .arc_id_mask  = 0x7ff000000,
-        .num_zone_bmp_words = 39,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_hop_by_hop_ext_1,
+        .num_zone_bmp_words = 48,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_hop_by_hop_ext_1,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_2 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_2 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_2",
         .match        = 0xc0,
         .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x3,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 24,
         .arc_id_mask  = 0x7ff000000,
-        .num_zone_bmp_words = 46,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_hop_by_hop_ext_2,
+        .num_zone_bmp_words = 56,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_hop_by_hop_ext_2,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ICMP",
         .match        = 0x800,
         .match_mask   = 0x3818,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
+        .zone_minbit  = 24,
+        .arc_id_mask  = 0x7ff000000,
+        .num_zone_bmp_words = 57,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_icmp,
+
+    },
+    {
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_HEADER */
+        .name         = "INGRESS_PKT_INNER_L3_L4_HDR_IFA_HEADER",
+        .match        = 0x20000,
+        .match_mask   = 0x20000,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 17,
+        .minbit       = 17,
+        .value        = 0x1,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
+        .zone_minbit  = 24,
+        .arc_id_mask  = 0x7ff000000,
+        .num_zone_bmp_words = 48,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ifa_header,
+
+    },
+    {
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA_BASE */
+        .name         = "INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA_BASE",
+        .match        = 0x24000,
+        .match_mask   = 0x3c000,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
+        .minbit       = 14,
+        .value        = 0x1,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 24,
         .arc_id_mask  = 0x7ff000000,
-        .num_zone_bmp_words = 47,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_icmp,
+        .num_zone_bmp_words = 48,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ifa_metadata_base,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_IGMP",
         .match        = 0x100,
         .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x4,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 24,
         .arc_id_mask  = 0x7ff000000,
-        .num_zone_bmp_words = 29,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_igmp,
+        .num_zone_bmp_words = 36,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_igmp,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_IPV4",
         .match        = 0x2,
         .match_mask   = 0x406,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 2,
         .minbit       = 1,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 24,
         .arc_id_mask  = 0x7ff000000,
-        .num_zone_bmp_words = 29,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ipv4,
+        .num_zone_bmp_words = 36,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ipv4,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_IPV6",
         .match        = 0x4,
         .match_mask   = 0x406,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 2,
         .minbit       = 1,
         .value        = 0x2,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 24,
         .arc_id_mask  = 0x7ff000000,
-        .num_zone_bmp_words = 47,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ipv6,
+        .num_zone_bmp_words = 58,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ipv6,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_NONE",
         .match        = 0x0,
-        .match_mask   = 0x3ffff,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match_mask   = 0x7ffff,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 18,
         .minbit       = 0,
         .value        = 0x0,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 24,
         .arc_id_mask  = 0x7ff000000,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_P_1588",
         .match        = 0x2800,
         .match_mask   = 0x3800,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x5,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 24,
         .arc_id_mask  = 0x7ff000000,
-        .num_zone_bmp_words = 47,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_p_1588,
+        .num_zone_bmp_words = 58,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_p_1588,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_1 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_1 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_1",
-        .match        = 0x34000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match        = 0x1c000,
+        .match_mask   = 0x1c000,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0xd,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x7,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 24,
         .arc_id_mask  = 0x7ff000000,
-        .num_zone_bmp_words = 42,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_prog_ext_1,
+        .num_zone_bmp_words = 51,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_prog_ext_1,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_2 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_2 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_2",
         .match        = 0x280,
         .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0xa,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 24,
         .arc_id_mask  = 0x7ff000000,
-        .num_zone_bmp_words = 46,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_prog_ext_2,
+        .num_zone_bmp_words = 57,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_prog_ext_2,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_RARP",
-        .match        = 0x14000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match        = 0x8000,
+        .match_mask   = 0x1c006,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x5,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x2,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 24,
         .arc_id_mask  = 0x7ff000000,
-        .num_zone_bmp_words = 24,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rarp,
+        .num_zone_bmp_words = 29,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rarp,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_1 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_1 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_1",
-        .match        = 0x20000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match        = 0x8004,
+        .match_mask   = 0x1c406,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x8,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x2,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 24,
         .arc_id_mask  = 0x7ff000000,
-        .num_zone_bmp_words = 44,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rout_ext_1,
+        .num_zone_bmp_words = 54,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rout_ext_1,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_2 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_2 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_2",
         .match        = 0x1c0,
         .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x7,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 24,
         .arc_id_mask  = 0x7ff000000,
-        .num_zone_bmp_words = 47,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rout_ext_2,
+        .num_zone_bmp_words = 57,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rout_ext_2,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x8,
         .match_mask   = 0x418,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 4,
         .minbit       = 3,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 24,
         .arc_id_mask  = 0x7ff000000,
-        .num_zone_bmp_words = 47,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_tcp_first_4bytes,
+        .num_zone_bmp_words = 57,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_tcp_first_4bytes,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x28,
         .match_mask   = 0x438,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 5,
         .minbit       = 5,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 24,
         .arc_id_mask  = 0x7ff000000,
-        .num_zone_bmp_words = 47,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_tcp_last_16bytes,
+        .num_zone_bmp_words = 57,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_tcp_last_16bytes,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UDP",
         .match        = 0x10,
         .match_mask   = 0x418,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 4,
         .minbit       = 3,
         .value        = 0x2,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 24,
         .arc_id_mask  = 0x7ff000000,
-        .num_zone_bmp_words = 47,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_udp,
+        .num_zone_bmp_words = 58,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_udp,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3",
-        .match        = 0x1c000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match        = 0xc000,
+        .match_mask   = 0x1c006,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x7,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x3,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 24,
         .arc_id_mask  = 0x7ff000000,
-        .num_zone_bmp_words = 24,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l3,
+        .num_zone_bmp_words = 29,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l3,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x2000,
         .match_mask   = 0x3800,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x4,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 24,
         .arc_id_mask  = 0x7ff000000,
-        .num_zone_bmp_words = 47,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l4,
+        .num_zone_bmp_words = 58,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l4,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x3800,
         .match_mask   = 0x3800,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x7,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 24,
         .arc_id_mask  = 0x7ff000000,
-        .num_zone_bmp_words = 47,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l5,
+        .num_zone_bmp_words = 58,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l5,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_1 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_1 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_1",
-        .match        = 0x28000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match        = 0x14000,
+        .match_mask   = 0x1c000,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0xa,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x5,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 24,
         .arc_id_mask  = 0x7ff000000,
-        .num_zone_bmp_words = 47,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_wesp_ext_1,
+        .num_zone_bmp_words = 58,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_wesp_ext_1,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_2 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_2 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_2",
         .match        = 0x180,
         .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x6,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 24,
         .arc_id_mask  = 0x7ff000000,
-        .num_zone_bmp_words = 47,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_wesp_ext_2,
+        .num_zone_bmp_words = 58,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_wesp_ext_2,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_CNTAG */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_CNTAG */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_CNTAG",
         .match        = 0x80,
         .match_mask   = 0xc0,
@@ -5623,11 +5986,11 @@ bcm56690_a0_dna_6_5_29_0_1_rxpmd_match_id_db[BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MA
         .zone_minbit  = 2,
         .arc_id_mask  = 0xfc,
         .num_zone_bmp_words = 2,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l2_hdr_cntag,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_cntag,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_GBP_ETHERNET_SHIM */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_GBP_ETHERNET_SHIM */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_GBP_ETHERNET_SHIM",
         .match        = 0x40,
         .match_mask   = 0xc0,
@@ -5641,11 +6004,11 @@ bcm56690_a0_dna_6_5_29_0_1_rxpmd_match_id_db[BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MA
         .zone_minbit  = 2,
         .arc_id_mask  = 0xfc,
         .num_zone_bmp_words = 2,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l2_hdr_gbp_ethernet_shim,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_gbp_ethernet_shim,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_BASE */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_BASE */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_HG3_BASE",
         .match        = 0x2,
         .match_mask   = 0x2,
@@ -5659,11 +6022,11 @@ bcm56690_a0_dna_6_5_29_0_1_rxpmd_match_id_db[BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MA
         .zone_minbit  = 2,
         .arc_id_mask  = 0xfc,
         .num_zone_bmp_words = 2,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l2_hdr_hg3_base,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_hg3_base,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0 */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0",
         .match        = 0x8,
         .match_mask   = 0x8,
@@ -5677,11 +6040,11 @@ bcm56690_a0_dna_6_5_29_0_1_rxpmd_match_id_db[BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MA
         .zone_minbit  = 2,
         .arc_id_mask  = 0xfc,
         .num_zone_bmp_words = 2,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l2_hdr_hg3_ext_0,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_hg3_ext_0,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_ITAG",
         .match        = 0x20,
         .match_mask   = 0x20,
@@ -5695,11 +6058,11 @@ bcm56690_a0_dna_6_5_29_0_1_rxpmd_match_id_db[BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MA
         .zone_minbit  = 2,
         .arc_id_mask  = 0xfc,
         .num_zone_bmp_words = 2,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l2_hdr_itag,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_itag,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2 */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_L2",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -5713,11 +6076,11 @@ bcm56690_a0_dna_6_5_29_0_1_rxpmd_match_id_db[BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MA
         .zone_minbit  = 2,
         .arc_id_mask  = 0xfc,
         .num_zone_bmp_words = 2,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l2_hdr_l2,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_l2,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0xff,
@@ -5733,7 +6096,7 @@ bcm56690_a0_dna_6_5_29_0_1_rxpmd_match_id_db[BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MA
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_OTAG",
         .match        = 0x10,
         .match_mask   = 0x10,
@@ -5747,11 +6110,11 @@ bcm56690_a0_dna_6_5_29_0_1_rxpmd_match_id_db[BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MA
         .zone_minbit  = 2,
         .arc_id_mask  = 0xfc,
         .num_zone_bmp_words = 2,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l2_hdr_otag,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_otag,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC",
         .match        = 0x4,
         .match_mask   = 0x4,
@@ -5765,927 +6128,909 @@ bcm56690_a0_dna_6_5_29_0_1_rxpmd_match_id_db[BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MA
         .zone_minbit  = 2,
         .arc_id_mask  = 0xfc,
         .num_zone_bmp_words = 2,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l2_hdr_snap_or_llc,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_snap_or_llc,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ARP",
         .match        = 0x4000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match_mask   = 0x7c006,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_arp,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_arp,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1",
-        .match        = 0x24000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0x10000,
+        .match_mask   = 0x1c000,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x9,
-        .pmaxbit      = 27,
+        .value        = 0x4,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
-        .num_zone_bmp_words = 13,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_auth_ext_1,
+        .num_zone_bmp_words = 14,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_auth_ext_1,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2",
         .match        = 0x140,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x5,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
-        .num_zone_bmp_words = 34,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_auth_ext_2,
+        .num_zone_bmp_words = 35,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_auth_ext_2,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_BFD",
         .match        = 0x3000,
         .match_mask   = 0x3800,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x6,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
         .num_zone_bmp_words = 39,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_bfd,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_bfd,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_1 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_1",
-        .match        = 0x2c000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0xc004,
+        .match_mask   = 0x1c406,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0xb,
-        .pmaxbit      = 27,
+        .value        = 0x3,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
-        .num_zone_bmp_words = 17,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_dest_opt_ext_1,
+        .num_zone_bmp_words = 18,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_dest_opt_ext_1,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_2 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_2",
         .match        = 0x200,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x8,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
         .num_zone_bmp_words = 35,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_dest_opt_ext_2,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_dest_opt_ext_2,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT",
         .match        = 0x40,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
         .num_zone_bmp_words = 35,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_esp_ext,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_esp_ext,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 0,
         .minbit       = 0,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
         .num_zone_bmp_words = 39,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ethertype,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ethertype,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1",
-        .match        = 0x30000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0x18000,
+        .match_mask   = 0x1c000,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0xc,
-        .pmaxbit      = 27,
+        .value        = 0x6,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
         .num_zone_bmp_words = 21,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_frag_ext_1,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_frag_ext_1,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2",
         .match        = 0x240,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x9,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
-        .num_zone_bmp_words = 35,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_frag_ext_2,
+        .num_zone_bmp_words = 36,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_frag_ext_2,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GPE",
         .match        = 0x30,
         .match_mask   = 0x438,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 5,
         .minbit       = 5,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
-        .num_zone_bmp_words = 37,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gpe,
+        .num_zone_bmp_words = 38,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gpe,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE",
-        .match        = 0x18,
-        .match_mask   = 0x418,
-        .match_maxbit = 27,
+        .match        = 0x40000,
+        .match_mask   = 0x40000,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 4,
-        .minbit       = 3,
-        .value        = 0x3,
-        .pmaxbit      = 27,
+        .maxbit       = 18,
+        .minbit       = 18,
+        .value        = 0x1,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
-        .num_zone_bmp_words = 21,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre,
+        .num_zone_bmp_words = 22,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM",
         .match        = 0x80,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x2,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
-        .num_zone_bmp_words = 21,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_chksum,
+        .num_zone_bmp_words = 22,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_chksum,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY",
         .match        = 0x1800,
         .match_mask   = 0x3800,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x3,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
-        .num_zone_bmp_words = 21,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_key,
+        .num_zone_bmp_words = 22,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_key,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT",
-        .match        = 0x10000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0x44000,
+        .match_mask   = 0x5c000,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x4,
-        .pmaxbit      = 27,
+        .value        = 0x1,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
-        .num_zone_bmp_words = 21,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_rout,
+        .num_zone_bmp_words = 22,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_rout,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ",
-        .match        = 0x38,
-        .match_mask   = 0x438,
-        .match_maxbit = 27,
+        .match        = 0x40020,
+        .match_mask   = 0x40020,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 5,
         .minbit       = 5,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
-        .num_zone_bmp_words = 21,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_seq,
+        .num_zone_bmp_words = 22,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_seq,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_1 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_1",
-        .match        = 0x8000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0x4004,
+        .match_mask   = 0x7c406,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x2,
-        .pmaxbit      = 27,
+        .value        = 0x1,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
-        .num_zone_bmp_words = 25,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_hop_by_hop_ext_1,
+        .num_zone_bmp_words = 26,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_hop_by_hop_ext_1,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_2 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_2",
         .match        = 0xc0,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x3,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
         .num_zone_bmp_words = 36,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_hop_by_hop_ext_2,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_hop_by_hop_ext_2,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ICMP",
         .match        = 0x800,
         .match_mask   = 0x3818,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
-        .num_zone_bmp_words = 37,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_icmp,
+        .num_zone_bmp_words = 38,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_icmp,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_HEADER */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_HEADER */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IFA_HEADER",
-        .match        = 0x2c0,
-        .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match        = 0x20000,
+        .match_mask   = 0x20000,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 9,
-        .minbit       = 6,
-        .value        = 0xb,
-        .pmaxbit      = 27,
+        .maxbit       = 17,
+        .minbit       = 17,
+        .value        = 0x1,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
-        .num_zone_bmp_words = 25,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ifa_header,
+        .num_zone_bmp_words = 26,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ifa_header,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA */
-        .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA",
-        .match        = 0xc000,
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA_BASE */
+        .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA_BASE",
+        .match        = 0x24000,
         .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x3,
-        .pmaxbit      = 27,
+        .value        = 0x1,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
-        .num_zone_bmp_words = 25,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ifa_metadata,
+        .num_zone_bmp_words = 26,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ifa_metadata_base,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IGMP",
         .match        = 0x100,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x4,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
         .num_zone_bmp_words = 10,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_igmp,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_igmp,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IOAM_E2E */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IOAM_E2E */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IOAM_E2E",
         .match        = 0x1000,
         .match_mask   = 0x3800,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x2,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
-        .num_zone_bmp_words = 37,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ioam_e2e,
+        .num_zone_bmp_words = 38,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ioam_e2e,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IPV4",
         .match        = 0x2,
         .match_mask   = 0x406,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 2,
         .minbit       = 1,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
         .num_zone_bmp_words = 10,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ipv4,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ipv4,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IPV6",
         .match        = 0x4,
         .match_mask   = 0x406,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 2,
         .minbit       = 1,
         .value        = 0x2,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
         .num_zone_bmp_words = 38,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ipv6,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ipv6,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0",
         .match        = 0x400,
         .match_mask   = 0x400,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 10,
         .minbit       = 10,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
         .num_zone_bmp_words = 39,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls0,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls0,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1",
         .match        = 0x402,
         .match_mask   = 0x402,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 1,
         .minbit       = 1,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
         .num_zone_bmp_words = 39,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls1,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls1,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2",
         .match        = 0x404,
         .match_mask   = 0x404,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 2,
         .minbit       = 2,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
         .num_zone_bmp_words = 39,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls2,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls2,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3",
         .match        = 0x408,
         .match_mask   = 0x408,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 3,
         .minbit       = 3,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
         .num_zone_bmp_words = 39,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls3,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls3,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4",
         .match        = 0x410,
         .match_mask   = 0x410,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 4,
         .minbit       = 4,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
         .num_zone_bmp_words = 39,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls4,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls4,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5",
         .match        = 0x420,
         .match_mask   = 0x420,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 5,
         .minbit       = 5,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
         .num_zone_bmp_words = 39,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls5,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls5,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6",
         .match        = 0x440,
         .match_mask   = 0x440,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 6,
         .minbit       = 6,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
         .num_zone_bmp_words = 38,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls6,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls6,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH",
         .match        = 0x480,
         .match_mask   = 0x480,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 7,
         .minbit       = 7,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
         .num_zone_bmp_words = 39,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls_ach,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls_ach,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW",
         .match        = 0x500,
         .match_mask   = 0x500,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 8,
         .minbit       = 8,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
         .num_zone_bmp_words = 39,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls_cw,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls_cw,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_NONE",
         .match        = 0x0,
-        .match_mask   = 0x3ffff,
-        .match_maxbit = 27,
+        .match_mask   = 0x7ffff,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 18,
         .minbit       = 0,
         .value        = 0x0,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_P_1588",
         .match        = 0x2800,
         .match_mask   = 0x3800,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x5,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
         .num_zone_bmp_words = 39,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_p_1588,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_p_1588,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_1 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_1",
-        .match        = 0x34000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0x1c000,
+        .match_mask   = 0x1c000,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0xd,
-        .pmaxbit      = 27,
+        .value        = 0x7,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
-        .num_zone_bmp_words = 29,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_prog_ext_1,
+        .num_zone_bmp_words = 30,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_prog_ext_1,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_2 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_2",
         .match        = 0x280,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0xa,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
-        .num_zone_bmp_words = 36,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_prog_ext_2,
+        .num_zone_bmp_words = 37,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_prog_ext_2,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_RARP",
-        .match        = 0x14000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0x8000,
+        .match_mask   = 0x1c006,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x5,
-        .pmaxbit      = 27,
+        .value        = 0x2,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
         .num_zone_bmp_words = 39,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rarp,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rarp,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_1 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_1",
-        .match        = 0x20000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0x8004,
+        .match_mask   = 0x1c406,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x8,
-        .pmaxbit      = 27,
+        .value        = 0x2,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
-        .num_zone_bmp_words = 33,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rout_ext_1,
+        .num_zone_bmp_words = 34,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rout_ext_1,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_2 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_2",
         .match        = 0x1c0,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x7,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
         .num_zone_bmp_words = 37,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rout_ext_2,
-
-    },
-    {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_SEG_ROUT_EXT_1 */
-        .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_SEG_ROUT_EXT_1",
-        .match        = 0x18000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
-        .match_minbit = 10,
-        .maxbit       = 17,
-        .minbit       = 14,
-        .value        = 0x6,
-        .pmaxbit      = 27,
-        .pminbit      = 10,
-        .zone_minbit  = 8,
-        .arc_id_mask  = 0x7ff00,
-        .num_zone_bmp_words = 33,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_seg_rout_ext_1,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rout_ext_2,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x8,
         .match_mask   = 0x418,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 4,
         .minbit       = 3,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
-        .num_zone_bmp_words = 37,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_tcp_first_4bytes,
+        .num_zone_bmp_words = 38,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_tcp_first_4bytes,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x28,
         .match_mask   = 0x438,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 5,
         .minbit       = 5,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
-        .num_zone_bmp_words = 37,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_tcp_last_16bytes,
+        .num_zone_bmp_words = 38,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_tcp_last_16bytes,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UDP",
         .match        = 0x10,
         .match_mask   = 0x418,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 4,
         .minbit       = 3,
         .value        = 0x2,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
         .num_zone_bmp_words = 38,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_udp,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_udp,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3",
-        .match        = 0x1c000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0xc000,
+        .match_mask   = 0x1c006,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x7,
-        .pmaxbit      = 27,
+        .value        = 0x3,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
         .num_zone_bmp_words = 39,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l3,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l3,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x2000,
         .match_mask   = 0x3800,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x4,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
         .num_zone_bmp_words = 38,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l4,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l4,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x3800,
         .match_mask   = 0x3800,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x7,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
-        .num_zone_bmp_words = 37,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l5,
+        .num_zone_bmp_words = 38,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l5,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN",
         .match        = 0x810,
         .match_mask   = 0x3c18,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
         .num_zone_bmp_words = 38,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_vxlan,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_vxlan,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_1 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_1",
-        .match        = 0x28000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0x14000,
+        .match_mask   = 0x1c000,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0xa,
-        .pmaxbit      = 27,
+        .value        = 0x5,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
         .num_zone_bmp_words = 38,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_wesp_ext_1,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_wesp_ext_1,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_2 */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_2",
         .match        = 0x180,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x6,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 8,
         .arc_id_mask  = 0x7ff00,
         .num_zone_bmp_words = 38,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_wesp_ext_2,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_wesp_ext_2,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH */
         .name         = "INGRESS_PKT_SYS_HDR_EP_NIH",
         .match        = 0x2,
         .match_mask   = 0x3,
@@ -6699,11 +7044,11 @@ bcm56690_a0_dna_6_5_29_0_1_rxpmd_match_id_db[BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MA
         .zone_minbit  = 0,
         .arc_id_mask  = 0x3,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_sys_hdr_ep_nih,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_sys_hdr_ep_nih,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK */
         .name         = "INGRESS_PKT_SYS_HDR_LOOPBACK",
         .match        = 0x1,
         .match_mask   = 0x3,
@@ -6717,11 +7062,11 @@ bcm56690_a0_dna_6_5_29_0_1_rxpmd_match_id_db[BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MA
         .zone_minbit  = 0,
         .arc_id_mask  = 0x3,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56690_a0_dna_6_5_29_0_1_rxpmd_arc_ingress_pkt_sys_hdr_loopback,
+        .zone_bmp = bcm56690_a0_dna_6_5_31_7_0_rxpmd_arc_ingress_pkt_sys_hdr_loopback,
 
     },
     {
-        /* BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE */
+        /* BCM56690_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE */
         .name         = "INGRESS_PKT_SYS_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3,
@@ -6738,23 +7083,23 @@ bcm56690_a0_dna_6_5_29_0_1_rxpmd_match_id_db[BCM56690_A0_DNA_6_5_29_0_1_RXPMD_MA
     },
 };
 
-static bcmpkt_rxpmd_match_id_db_info_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_match_id_db_info = {
-    .num_entries = 223,
-    .db = bcm56690_a0_dna_6_5_29_0_1_rxpmd_match_id_db
+static bcmpkt_rxpmd_match_id_db_info_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_match_id_db_info = {
+    .num_entries = 222,
+    .db = bcm56690_a0_dna_6_5_31_7_0_rxpmd_match_id_db
 };
-bcmpkt_rxpmd_match_id_db_info_t * bcm56690_a0_dna_6_5_29_0_1_rxpmd_match_id_db_info_get(void) {
-    return &bcm56690_a0_dna_6_5_29_0_1_rxpmd_match_id_db_info;
+bcmpkt_rxpmd_match_id_db_info_t * bcm56690_a0_dna_6_5_31_7_0_rxpmd_match_id_db_info_get(void) {
+    return &bcm56690_a0_dna_6_5_31_7_0_rxpmd_match_id_db_info;
 }
 
-static shr_enum_map_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_match_id_map[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT
+static shr_enum_map_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_match_id_map[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_rxpmd_match_id_map_info_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_match_id_map_info = {
-    .num_entries = 223,
-    .map = bcm56690_a0_dna_6_5_29_0_1_rxpmd_match_id_map
+static bcmpkt_rxpmd_match_id_map_info_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_match_id_map_info = {
+    .num_entries = 222,
+    .map = bcm56690_a0_dna_6_5_31_7_0_rxpmd_match_id_map
 };
 
-bcmpkt_rxpmd_match_id_map_info_t * bcm56690_a0_dna_6_5_29_0_1_rxpmd_match_id_map_info_get(void) {
-    return &bcm56690_a0_dna_6_5_29_0_1_rxpmd_match_id_map_info;
+bcmpkt_rxpmd_match_id_map_info_t * bcm56690_a0_dna_6_5_31_7_0_rxpmd_match_id_map_info_get(void) {
+    return &bcm56690_a0_dna_6_5_31_7_0_rxpmd_match_id_map_info;
 }
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_pkt_flexhdr.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_pkt_flexhdr.c
similarity index 58%
rename from platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_pkt_flexhdr.c
rename to platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_pkt_flexhdr.c
index d77e56124704..e39a952cf40e 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_pkt_flexhdr.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_pkt_flexhdr.c
@@ -3,7 +3,7 @@
  * DO NOT EDIT THIS FILE!
  * This file is auto-generated by xfc_map_parser
  * from the NPL output file(s) map.yml
- * for device bcm78800_a0 and variant dna_6_5_30_3_1.
+ * for device bcm56690_a0 and variant dna_6_5_31_7_0.
  * Edits to this file will be lost when it is regenerated.
  *
  * $Id: $
@@ -30,387 +30,322 @@
 #include <sal/sal_types.h>
 #include <shr/shr_error.h>
 #include <bcmpkt/bcmpkt_flexhdr.h>
-#include <bcmpkt/chip/bcm78800_a0/bcmpkt_bcm78800_a0_rxpmd.h>
-#include <bcmpkt/xfcr/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_bcmpkt_flexhdr.h>
-#include <bcmpkt/xfcr/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_bcmpkt_flexhdr_data.h>
-#include <bcmpkt/xfcr/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_bcmpkt_rxpmd_flex_data.h>
+#include <bcmpkt/chip/bcm56690_a0/bcmpkt_bcm56690_a0_rxpmd.h>
+#include <bcmpkt/xfcr/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_bcmpkt_flexhdr.h>
+#include <bcmpkt/xfcr/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_bcmpkt_flexhdr_data.h>
+#include <bcmpkt/xfcr/bcm56690_a0/dna_6_5_31_7_0/bcm56690_a0_dna_6_5_31_7_0_bcmpkt_rxpmd_flex_data.h>
 
 #define MASK(_bn) (((uint32_t)0x1<<(_bn))-1)
 #define WORD_FIELD_GET(_d,_s,_l) (((_d) >> (_s)) & MASK(_l))
 #define WORD_FIELD_SET(_d,_s,_l,_v) (_d)=(((_d) & ~(MASK(_l) << (_s))) | (((_v) & MASK(_l)) << (_s)))
 #define WORD_FIELD_MASK(_d,_s,_l) (_d)=((_d) | (MASK(_l) << (_s)))
 
-static void bcm78800_a0_dna_6_5_30_3_1_rxpmd_flex_reason_decode(uint32_t *data, bcmpkt_bitmap_t *reasons)
+static void bcm56690_a0_dna_6_5_31_7_0_rxpmd_flex_reason_decode(uint32_t *data, bcmpkt_bitmap_t *reasons)
 {
     uint32_t *reason = data + 0;
 
     if (reason[13] & (0x1 << 0)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU);
     }
     if (reason[13] & (0x1 << 1)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS);
     }
     if (reason[13] & (0x1 << 2)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE);
     }
     if (reason[13] & (0x1 << 3)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT_HPAE_MISS);
     }
     if (reason[13] & (0x1 << 4)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD);
     }
     if (reason[13] & (0x1 << 5)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED);
     }
     if (reason[13] & (0x1 << 6)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT);
     }
     if (reason[13] & (0x1 << 7)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD);
     }
     if (reason[13] & (0x1 << 8)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD);
     }
     if (reason[13] & (0x1 << 9)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS);
     }
     if (reason[13] & (0x1 << 10)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP);
     }
     if (reason[13] & (0x1 << 11)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS);
     }
     if (reason[13] & (0x1 << 12)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP);
     }
     if (reason[13] & (0x1 << 13)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR);
     }
     if (reason[13] & (0x1 << 14)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR);
     }
     if (reason[13] & (0x1 << 15)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED);
     }
     if (reason[13] & (0x1 << 16)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL);
     }
     if (reason[13] & (0x1 << 17)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_VFP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_VFP);
     }
     if (reason[13] & (0x1 << 18)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_IFP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_IFP);
     }
     if (reason[13] & (0x1 << 19)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_IFP_METER);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER);
     }
     if (reason[13] & (0x1 << 20)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_DST_FP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP);
     }
     if (reason[13] & (0x1 << 21)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_SVP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_SVP);
     }
     if (reason[13] & (0x1 << 22)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_EM_FT);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT);
     }
     if (reason[13] & (0x1 << 23)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_IVXLT);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT);
     }
     if (reason[13] & (0x1 << 24)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED);
     }
     if (reason[13] & (0x1 << 25)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED);
     }
     if (reason[13] & (0x1 << 26)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_SER_DROP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP);
     }
     if (reason[13] & (0x1 << 27)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED);
     }
     if (reason[13] & (0x1 << 28)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF);
     }
     if (reason[13] & (0x1 << 29)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED);
     }
     if (reason[13] & (0x1 << 30)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED);
     }
     if (reason[13] & (0x1 << 31)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU);
     }
     if (reason[12] & (0x1 << 0)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0);
     }
     if (reason[12] & (0x1 << 1)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1);
     }
     if (reason[12] & (0x1 << 2)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2);
     }
     if (reason[12] & (0x1 << 3)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3);
     }
     if (reason[12] & (0x1 << 4)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4);
     }
     if (reason[12] & (0x1 << 5)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5);
     }
     if (reason[12] & (0x1 << 6)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6);
     }
     if (reason[12] & (0x1 << 7)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7);
     }
     if (reason[12] & (0x1 << 8)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_IDEV_CONFIG_TO_CPU);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DEFAULT);
     }
     if (reason[12] & (0x1 << 9)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED);
     }
     if (reason[12] & (0x1 << 10)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED);
     }
     if (reason[12] & (0x1 << 11)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_SRV6);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_SRV6);
     }
     if (reason[12] & (0x1 << 12)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR);
     }
     if (reason[12] & (0x1 << 13)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU);
     }
     if (reason[12] & (0x1 << 14)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_SER_DROP_EPIPE);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE);
     }
     if (reason[12] & (0x1 << 15)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP);
     }
 }
 
-static void bcm78800_a0_dna_6_5_30_3_1_rxpmd_flex_reason_encode(bcmpkt_bitmap_t *reasons, uint32_t *data)
+static void bcm56690_a0_dna_6_5_31_7_0_rxpmd_flex_reason_encode(bcmpkt_bitmap_t *reasons, uint32_t *data)
 {
     uint32_t *reason = data + 0;
 
     reason[13] = 0;
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU)) {
         reason[13] |= (0x1 << 0);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS)) {
         reason[13] |= (0x1 << 1);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE)) {
         reason[13] |= (0x1 << 2);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT_HPAE_MISS)) {
         reason[13] |= (0x1 << 3);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD)) {
         reason[13] |= (0x1 << 4);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED)) {
         reason[13] |= (0x1 << 5);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT)) {
         reason[13] |= (0x1 << 6);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD)) {
         reason[13] |= (0x1 << 7);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD)) {
         reason[13] |= (0x1 << 8);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS)) {
         reason[13] |= (0x1 << 9);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP)) {
         reason[13] |= (0x1 << 10);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS)) {
         reason[13] |= (0x1 << 11);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP)) {
         reason[13] |= (0x1 << 12);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR)) {
         reason[13] |= (0x1 << 13);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR)) {
         reason[13] |= (0x1 << 14);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED)) {
         reason[13] |= (0x1 << 15);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL)) {
         reason[13] |= (0x1 << 16);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_VFP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_VFP)) {
         reason[13] |= (0x1 << 17);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_IFP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_IFP)) {
         reason[13] |= (0x1 << 18);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_IFP_METER)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER)) {
         reason[13] |= (0x1 << 19);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_DST_FP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP)) {
         reason[13] |= (0x1 << 20);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_SVP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_SVP)) {
         reason[13] |= (0x1 << 21);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_EM_FT)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT)) {
         reason[13] |= (0x1 << 22);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_IVXLT)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT)) {
         reason[13] |= (0x1 << 23);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED)) {
         reason[13] |= (0x1 << 24);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED)) {
         reason[13] |= (0x1 << 25);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_SER_DROP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP)) {
         reason[13] |= (0x1 << 26);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED)) {
         reason[13] |= (0x1 << 27);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF)) {
         reason[13] |= (0x1 << 28);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED)) {
         reason[13] |= (0x1 << 29);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED)) {
         reason[13] |= (0x1 << 30);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU)) {
         reason[13] |= (0x1 << 31);
     }
     reason[12] = 0;
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0)) {
         reason[12] |= (0x1 << 0);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1)) {
         reason[12] |= (0x1 << 1);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2)) {
         reason[12] |= (0x1 << 2);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3)) {
         reason[12] |= (0x1 << 3);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4)) {
         reason[12] |= (0x1 << 4);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5)) {
         reason[12] |= (0x1 << 5);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6)) {
         reason[12] |= (0x1 << 6);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7)) {
         reason[12] |= (0x1 << 7);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_IDEV_CONFIG_TO_CPU)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DEFAULT)) {
         reason[12] |= (0x1 << 8);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED)) {
         reason[12] |= (0x1 << 9);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED)) {
         reason[12] |= (0x1 << 10);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_SRV6)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_SRV6)) {
         reason[12] |= (0x1 << 11);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR)) {
         reason[12] |= (0x1 << 12);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU)) {
         reason[12] |= (0x1 << 13);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_SER_DROP_EPIPE)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE)) {
         reason[12] |= (0x1 << 14);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP)) {
         reason[12] |= (0x1 << 15);
     }
 }
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_flex_field_data[] = {
-    {
-        .name = "ALLOW_NAT_3_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_ALLOW_NAT_3_0,
-        .profile = {
-            { -1, -1 }, /* Profile 0. */
-            { -1, -1 }, /* Profile 1. */
-            { 416, 419 }, /* Profile 2. */
-            { 408, 411 }, /* Profile 3. */
-            { 416, 419 }, /* Profile 4. */
-            { 416, 419 }, /* Profile 5. */
-            { 416, 419 }, /* Profile 6. */
-            { 416, 419 }, /* Profile 7. */
-            { 408, 411 }, /* Profile 8. */
-            { 416, 419 }, /* Profile 9. */
-            { 416, 419 }, /* Profile 10. */
-            { 416, 419 }, /* Profile 11. */
-            { 412, 415 }, /* Profile 12. */
-            { 404, 407 }, /* Profile 13. */
-            { 412, 415 }, /* Profile 14. */
-            { 412, 415 }, /* Profile 15. */
-            { 416, 419 }, /* Profile 16. */
-            { 408, 411 }, /* Profile 17. */
-            { 416, 419 }, /* Profile 18. */
-            { 416, 419 }, /* Profile 19. */
-            { 416, 419 }, /* Profile 20. */
-            { 416, 419 }, /* Profile 21. */
-            { 408, 411 }, /* Profile 22. */
-            { 416, 419 }, /* Profile 23. */
-            { 416, 419 }, /* Profile 24. */
-            { 416, 419 }, /* Profile 25. */
-            { 412, 415 }, /* Profile 26. */
-            { 404, 407 }, /* Profile 27. */
-            { 412, 415 }, /* Profile 28. */
-            { 412, 415 }, /* Profile 29. */
-            { 416, 419 }, /* Profile 30. */
-            { 408, 411 }, /* Profile 31. */
-            { 416, 419 }, /* Profile 32. */
-            { 416, 419 }, /* Profile 33. */
-            { 416, 419 }, /* Profile 34. */
-            { 416, 419 }, /* Profile 35. */
-            { 408, 411 }, /* Profile 36. */
-            { 416, 419 }, /* Profile 37. */
-            { 416, 419 }, /* Profile 38. */
-            { 416, 419 }, /* Profile 39. */
-            { 412, 415 }, /* Profile 40. */
-            { 404, 407 }, /* Profile 41. */
-            { 412, 415 }, /* Profile 42. */
-            { 412, 415 }, /* Profile 43. */
-            { 416, 419 }, /* Profile 44. */
-            { 408, 411 }, /* Profile 45. */
-            { 416, 419 }, /* Profile 46. */
-            { 416, 419 }, /* Profile 47. */
-            { 416, 419 }, /* Profile 48. */
-            { 416, 419 }, /* Profile 49. */
-            { 408, 411 }, /* Profile 50. */
-            { 416, 419 }, /* Profile 51. */
-            { 416, 419 }, /* Profile 52. */
-            { 416, 419 }, /* Profile 53. */
-            { 412, 415 }, /* Profile 54. */
-            { 404, 407 }, /* Profile 55. */
-            { 412, 415 }, /* Profile 56. */
-            { 412, 415 }, /* Profile 57. */
-        },
-        .profile_cnt = 58,
-    },
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_flex_field_data[] = {
     {
         .name = "DLB_ECMP_DESTINATION_15_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_DLB_ECMP_DESTINATION_15_0,
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_DLB_ECMP_DESTINATION_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -422,141 +357,93 @@ static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_flex_field_
             { -1, -1 }, /* Profile 7. */
             { -1, -1 }, /* Profile 8. */
             { -1, -1 }, /* Profile 9. */
-            { -1, -1 }, /* Profile 10. */
-            { -1, -1 }, /* Profile 11. */
-            { -1, -1 }, /* Profile 12. */
-            { -1, -1 }, /* Profile 13. */
-            { -1, -1 }, /* Profile 14. */
-            { -1, -1 }, /* Profile 15. */
-            { 208, 223 }, /* Profile 16. */
-            { 192, 207 }, /* Profile 17. */
-            { 208, 223 }, /* Profile 18. */
-            { 192, 207 }, /* Profile 19. */
-            { 192, 207 }, /* Profile 20. */
-            { 208, 223 }, /* Profile 21. */
-            { 192, 207 }, /* Profile 22. */
-            { 208, 223 }, /* Profile 23. */
-            { 192, 207 }, /* Profile 24. */
-            { 192, 207 }, /* Profile 25. */
-            { 208, 223 }, /* Profile 26. */
-            { 192, 207 }, /* Profile 27. */
-            { 208, 223 }, /* Profile 28. */
-            { 192, 207 }, /* Profile 29. */
-            { -1, -1 }, /* Profile 30. */
-            { -1, -1 }, /* Profile 31. */
-            { -1, -1 }, /* Profile 32. */
-            { -1, -1 }, /* Profile 33. */
-            { -1, -1 }, /* Profile 34. */
-            { -1, -1 }, /* Profile 35. */
-            { -1, -1 }, /* Profile 36. */
-            { -1, -1 }, /* Profile 37. */
-            { -1, -1 }, /* Profile 38. */
-            { -1, -1 }, /* Profile 39. */
-            { -1, -1 }, /* Profile 40. */
-            { -1, -1 }, /* Profile 41. */
-            { -1, -1 }, /* Profile 42. */
-            { -1, -1 }, /* Profile 43. */
-            { 224, 239 }, /* Profile 44. */
-            { 208, 223 }, /* Profile 45. */
-            { 224, 239 }, /* Profile 46. */
-            { 208, 223 }, /* Profile 47. */
-            { 208, 223 }, /* Profile 48. */
-            { 224, 239 }, /* Profile 49. */
-            { 208, 223 }, /* Profile 50. */
-            { 224, 239 }, /* Profile 51. */
-            { 208, 223 }, /* Profile 52. */
-            { 208, 223 }, /* Profile 53. */
-            { 224, 239 }, /* Profile 54. */
-            { 208, 223 }, /* Profile 55. */
-            { 224, 239 }, /* Profile 56. */
-            { 208, 223 }, /* Profile 57. */
+            { 320, 335 }, /* Profile 10. */
+            { 320, 335 }, /* Profile 11. */
+            { 320, 335 }, /* Profile 12. */
+            { 320, 335 }, /* Profile 13. */
+            { 320, 335 }, /* Profile 14. */
+            { 320, 335 }, /* Profile 15. */
+            { 320, 335 }, /* Profile 16. */
+            { 320, 335 }, /* Profile 17. */
+            { -1, -1 }, /* Profile 18. */
+            { -1, -1 }, /* Profile 19. */
+            { -1, -1 }, /* Profile 20. */
+            { -1, -1 }, /* Profile 21. */
+            { -1, -1 }, /* Profile 22. */
+            { -1, -1 }, /* Profile 23. */
+            { -1, -1 }, /* Profile 24. */
+            { -1, -1 }, /* Profile 25. */
+            { 320, 335 }, /* Profile 26. */
+            { 320, 335 }, /* Profile 27. */
+            { 320, 335 }, /* Profile 28. */
+            { 320, 335 }, /* Profile 29. */
+            { 320, 335 }, /* Profile 30. */
+            { 320, 335 }, /* Profile 31. */
+            { 320, 335 }, /* Profile 32. */
+            { 320, 335 }, /* Profile 33. */
         },
-        .profile_cnt = 58,
+        .profile_cnt = 34,
     },
     {
         .name = "DNAT_CTRL_3_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_DNAT_CTRL_3_0,
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_DNAT_CTRL_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { -1, -1 }, /* Profile 2. */
+            { 368, 371 }, /* Profile 2. */
             { -1, -1 }, /* Profile 3. */
-            { 372, 375 }, /* Profile 4. */
-            { -1, -1 }, /* Profile 5. */
+            { -1, -1 }, /* Profile 4. */
+            { 368, 371 }, /* Profile 5. */
             { -1, -1 }, /* Profile 6. */
             { -1, -1 }, /* Profile 7. */
-            { -1, -1 }, /* Profile 8. */
-            { 372, 375 }, /* Profile 9. */
-            { -1, -1 }, /* Profile 10. */
+            { 368, 371 }, /* Profile 8. */
+            { -1, -1 }, /* Profile 9. */
+            { 368, 371 }, /* Profile 10. */
             { -1, -1 }, /* Profile 11. */
             { -1, -1 }, /* Profile 12. */
-            { -1, -1 }, /* Profile 13. */
-            { 368, 371 }, /* Profile 14. */
+            { 368, 371 }, /* Profile 13. */
+            { -1, -1 }, /* Profile 14. */
             { -1, -1 }, /* Profile 15. */
-            { -1, -1 }, /* Profile 16. */
+            { 368, 371 }, /* Profile 16. */
             { -1, -1 }, /* Profile 17. */
-            { 372, 375 }, /* Profile 18. */
+            { 368, 371 }, /* Profile 18. */
             { -1, -1 }, /* Profile 19. */
             { -1, -1 }, /* Profile 20. */
-            { -1, -1 }, /* Profile 21. */
+            { 368, 371 }, /* Profile 21. */
             { -1, -1 }, /* Profile 22. */
-            { 372, 375 }, /* Profile 23. */
-            { -1, -1 }, /* Profile 24. */
+            { -1, -1 }, /* Profile 23. */
+            { 368, 371 }, /* Profile 24. */
             { -1, -1 }, /* Profile 25. */
-            { -1, -1 }, /* Profile 26. */
+            { 368, 371 }, /* Profile 26. */
             { -1, -1 }, /* Profile 27. */
-            { 368, 371 }, /* Profile 28. */
-            { -1, -1 }, /* Profile 29. */
+            { -1, -1 }, /* Profile 28. */
+            { 368, 371 }, /* Profile 29. */
             { -1, -1 }, /* Profile 30. */
             { -1, -1 }, /* Profile 31. */
-            { 372, 375 }, /* Profile 32. */
-            { -1, -1 }, /* Profile 33. */
-            { -1, -1 }, /* Profile 34. */
-            { -1, -1 }, /* Profile 35. */
-            { -1, -1 }, /* Profile 36. */
-            { 372, 375 }, /* Profile 37. */
-            { -1, -1 }, /* Profile 38. */
-            { -1, -1 }, /* Profile 39. */
-            { -1, -1 }, /* Profile 40. */
-            { -1, -1 }, /* Profile 41. */
-            { 368, 371 }, /* Profile 42. */
-            { -1, -1 }, /* Profile 43. */
-            { -1, -1 }, /* Profile 44. */
-            { -1, -1 }, /* Profile 45. */
-            { 372, 375 }, /* Profile 46. */
-            { -1, -1 }, /* Profile 47. */
-            { -1, -1 }, /* Profile 48. */
-            { -1, -1 }, /* Profile 49. */
-            { -1, -1 }, /* Profile 50. */
-            { 372, 375 }, /* Profile 51. */
-            { -1, -1 }, /* Profile 52. */
-            { -1, -1 }, /* Profile 53. */
-            { -1, -1 }, /* Profile 54. */
-            { -1, -1 }, /* Profile 55. */
-            { 368, 371 }, /* Profile 56. */
+            { 368, 371 }, /* Profile 32. */
         },
-        .profile_cnt = 57,
+        .profile_cnt = 33,
     },
     {
         .name = "DROP_CODE_15_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0,
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 48, 63 }, /* Profile 2. */
             { 48, 63 }, /* Profile 3. */
             { 48, 63 }, /* Profile 4. */
-            { 48, 63 }, /* Profile 5. */
-            { 48, 63 }, /* Profile 6. */
+            { -1, -1 }, /* Profile 5. */
+            { -1, -1 }, /* Profile 6. */
             { -1, -1 }, /* Profile 7. */
-            { -1, -1 }, /* Profile 8. */
-            { -1, -1 }, /* Profile 9. */
-            { -1, -1 }, /* Profile 10. */
-            { -1, -1 }, /* Profile 11. */
+            { 48, 63 }, /* Profile 8. */
+            { 48, 63 }, /* Profile 9. */
+            { 48, 63 }, /* Profile 10. */
+            { 48, 63 }, /* Profile 11. */
             { 48, 63 }, /* Profile 12. */
-            { 48, 63 }, /* Profile 13. */
-            { 48, 63 }, /* Profile 14. */
-            { 48, 63 }, /* Profile 15. */
+            { -1, -1 }, /* Profile 13. */
+            { -1, -1 }, /* Profile 14. */
+            { -1, -1 }, /* Profile 15. */
             { 48, 63 }, /* Profile 16. */
             { 48, 63 }, /* Profile 17. */
             { 48, 63 }, /* Profile 18. */
@@ -565,374 +452,236 @@ static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_flex_field_
             { -1, -1 }, /* Profile 21. */
             { -1, -1 }, /* Profile 22. */
             { -1, -1 }, /* Profile 23. */
-            { -1, -1 }, /* Profile 24. */
-            { -1, -1 }, /* Profile 25. */
+            { 48, 63 }, /* Profile 24. */
+            { 48, 63 }, /* Profile 25. */
             { 48, 63 }, /* Profile 26. */
             { 48, 63 }, /* Profile 27. */
             { 48, 63 }, /* Profile 28. */
-            { 48, 63 }, /* Profile 29. */
-            { 48, 63 }, /* Profile 30. */
-            { 48, 63 }, /* Profile 31. */
+            { -1, -1 }, /* Profile 29. */
+            { -1, -1 }, /* Profile 30. */
+            { -1, -1 }, /* Profile 31. */
             { 48, 63 }, /* Profile 32. */
             { 48, 63 }, /* Profile 33. */
-            { 48, 63 }, /* Profile 34. */
-            { -1, -1 }, /* Profile 35. */
-            { -1, -1 }, /* Profile 36. */
-            { -1, -1 }, /* Profile 37. */
-            { -1, -1 }, /* Profile 38. */
-            { -1, -1 }, /* Profile 39. */
-            { 48, 63 }, /* Profile 40. */
-            { 48, 63 }, /* Profile 41. */
-            { 48, 63 }, /* Profile 42. */
-            { 48, 63 }, /* Profile 43. */
-            { 48, 63 }, /* Profile 44. */
-            { 48, 63 }, /* Profile 45. */
-            { 48, 63 }, /* Profile 46. */
-            { 48, 63 }, /* Profile 47. */
-            { 48, 63 }, /* Profile 48. */
-            { -1, -1 }, /* Profile 49. */
-            { -1, -1 }, /* Profile 50. */
-            { -1, -1 }, /* Profile 51. */
-            { -1, -1 }, /* Profile 52. */
-            { -1, -1 }, /* Profile 53. */
-            { 48, 63 }, /* Profile 54. */
-            { 48, 63 }, /* Profile 55. */
-            { 48, 63 }, /* Profile 56. */
-            { 48, 63 }, /* Profile 57. */
         },
-        .profile_cnt = 58,
+        .profile_cnt = 34,
     },
     {
         .name = "DVP_15_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_DVP_15_0,
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_DVP_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 176, 191 }, /* Profile 2. */
-            { 176, 191 }, /* Profile 3. */
-            { 176, 191 }, /* Profile 4. */
+            { 208, 223 }, /* Profile 3. */
+            { 208, 223 }, /* Profile 4. */
             { 176, 191 }, /* Profile 5. */
-            { 176, 191 }, /* Profile 6. */
-            { 176, 191 }, /* Profile 7. */
+            { 208, 223 }, /* Profile 6. */
+            { 208, 223 }, /* Profile 7. */
             { 176, 191 }, /* Profile 8. */
-            { 176, 191 }, /* Profile 9. */
+            { 208, 223 }, /* Profile 9. */
             { 176, 191 }, /* Profile 10. */
-            { 176, 191 }, /* Profile 11. */
-            { 176, 191 }, /* Profile 12. */
+            { 208, 223 }, /* Profile 11. */
+            { 208, 223 }, /* Profile 12. */
             { 176, 191 }, /* Profile 13. */
-            { 176, 191 }, /* Profile 14. */
-            { 176, 191 }, /* Profile 15. */
+            { 208, 223 }, /* Profile 14. */
+            { 208, 223 }, /* Profile 15. */
             { 176, 191 }, /* Profile 16. */
-            { 176, 191 }, /* Profile 17. */
-            { 176, 191 }, /* Profile 18. */
-            { 176, 191 }, /* Profile 19. */
-            { 176, 191 }, /* Profile 20. */
-            { 176, 191 }, /* Profile 21. */
-            { 176, 191 }, /* Profile 22. */
-            { 176, 191 }, /* Profile 23. */
-            { 176, 191 }, /* Profile 24. */
-            { 176, 191 }, /* Profile 25. */
-            { 176, 191 }, /* Profile 26. */
-            { 176, 191 }, /* Profile 27. */
-            { 176, 191 }, /* Profile 28. */
-            { 176, 191 }, /* Profile 29. */
-            { 192, 207 }, /* Profile 30. */
-            { 192, 207 }, /* Profile 31. */
+            { 208, 223 }, /* Profile 17. */
+            { 192, 207 }, /* Profile 18. */
+            { 224, 239 }, /* Profile 19. */
+            { 224, 239 }, /* Profile 20. */
+            { 192, 207 }, /* Profile 21. */
+            { 224, 239 }, /* Profile 22. */
+            { 224, 239 }, /* Profile 23. */
+            { 192, 207 }, /* Profile 24. */
+            { 224, 239 }, /* Profile 25. */
+            { 192, 207 }, /* Profile 26. */
+            { 224, 239 }, /* Profile 27. */
+            { 224, 239 }, /* Profile 28. */
+            { 192, 207 }, /* Profile 29. */
+            { 224, 239 }, /* Profile 30. */
+            { 224, 239 }, /* Profile 31. */
             { 192, 207 }, /* Profile 32. */
-            { 192, 207 }, /* Profile 33. */
-            { 192, 207 }, /* Profile 34. */
-            { 192, 207 }, /* Profile 35. */
-            { 192, 207 }, /* Profile 36. */
-            { 192, 207 }, /* Profile 37. */
-            { 192, 207 }, /* Profile 38. */
-            { 192, 207 }, /* Profile 39. */
-            { 192, 207 }, /* Profile 40. */
-            { 192, 207 }, /* Profile 41. */
-            { 192, 207 }, /* Profile 42. */
-            { 192, 207 }, /* Profile 43. */
-            { 192, 207 }, /* Profile 44. */
-            { 192, 207 }, /* Profile 45. */
-            { 192, 207 }, /* Profile 46. */
-            { 192, 207 }, /* Profile 47. */
-            { 192, 207 }, /* Profile 48. */
-            { 192, 207 }, /* Profile 49. */
-            { 192, 207 }, /* Profile 50. */
-            { 192, 207 }, /* Profile 51. */
-            { 192, 207 }, /* Profile 52. */
-            { 192, 207 }, /* Profile 53. */
-            { 192, 207 }, /* Profile 54. */
-            { 192, 207 }, /* Profile 55. */
-            { 192, 207 }, /* Profile 56. */
-            { 192, 207 }, /* Profile 57. */
+            { 224, 239 }, /* Profile 33. */
         },
-        .profile_cnt = 58,
+        .profile_cnt = 34,
     },
     {
         .name = "EFFECTIVE_TTL_AND_SNAT_CTRL_15_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_AND_SNAT_CTRL_15_0,
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_AND_SNAT_CTRL_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 144, 159 }, /* Profile 2. */
-            { 144, 159 }, /* Profile 3. */
-            { 144, 159 }, /* Profile 4. */
+            { 176, 191 }, /* Profile 3. */
+            { 176, 191 }, /* Profile 4. */
             { 144, 159 }, /* Profile 5. */
-            { 144, 159 }, /* Profile 6. */
-            { 144, 159 }, /* Profile 7. */
+            { 176, 191 }, /* Profile 6. */
+            { 176, 191 }, /* Profile 7. */
             { 144, 159 }, /* Profile 8. */
-            { 144, 159 }, /* Profile 9. */
+            { 176, 191 }, /* Profile 9. */
             { 144, 159 }, /* Profile 10. */
-            { 144, 159 }, /* Profile 11. */
-            { 144, 159 }, /* Profile 12. */
+            { 176, 191 }, /* Profile 11. */
+            { 176, 191 }, /* Profile 12. */
             { 144, 159 }, /* Profile 13. */
-            { 144, 159 }, /* Profile 14. */
-            { 144, 159 }, /* Profile 15. */
+            { 176, 191 }, /* Profile 14. */
+            { 176, 191 }, /* Profile 15. */
             { 144, 159 }, /* Profile 16. */
-            { 144, 159 }, /* Profile 17. */
-            { 144, 159 }, /* Profile 18. */
-            { 144, 159 }, /* Profile 19. */
-            { 144, 159 }, /* Profile 20. */
-            { 144, 159 }, /* Profile 21. */
-            { 144, 159 }, /* Profile 22. */
-            { 144, 159 }, /* Profile 23. */
-            { 144, 159 }, /* Profile 24. */
-            { 144, 159 }, /* Profile 25. */
-            { 144, 159 }, /* Profile 26. */
-            { 144, 159 }, /* Profile 27. */
-            { 144, 159 }, /* Profile 28. */
-            { 144, 159 }, /* Profile 29. */
-            { 144, 159 }, /* Profile 30. */
-            { 144, 159 }, /* Profile 31. */
-            { 144, 159 }, /* Profile 32. */
-            { 144, 159 }, /* Profile 33. */
-            { 144, 159 }, /* Profile 34. */
-            { 144, 159 }, /* Profile 35. */
-            { 144, 159 }, /* Profile 36. */
-            { 144, 159 }, /* Profile 37. */
-            { 144, 159 }, /* Profile 38. */
-            { 144, 159 }, /* Profile 39. */
-            { 144, 159 }, /* Profile 40. */
-            { 144, 159 }, /* Profile 41. */
-            { 144, 159 }, /* Profile 42. */
-            { 144, 159 }, /* Profile 43. */
-            { 144, 159 }, /* Profile 44. */
-            { 144, 159 }, /* Profile 45. */
-            { 144, 159 }, /* Profile 46. */
-            { 144, 159 }, /* Profile 47. */
-            { 144, 159 }, /* Profile 48. */
-            { 144, 159 }, /* Profile 49. */
-            { 144, 159 }, /* Profile 50. */
-            { 144, 159 }, /* Profile 51. */
-            { 144, 159 }, /* Profile 52. */
-            { 144, 159 }, /* Profile 53. */
-            { 144, 159 }, /* Profile 54. */
-            { 144, 159 }, /* Profile 55. */
-            { 144, 159 }, /* Profile 56. */
-            { 144, 159 }, /* Profile 57. */
+            { 176, 191 }, /* Profile 17. */
+            { 160, 175 }, /* Profile 18. */
+            { 192, 207 }, /* Profile 19. */
+            { 192, 207 }, /* Profile 20. */
+            { 160, 175 }, /* Profile 21. */
+            { 192, 207 }, /* Profile 22. */
+            { 192, 207 }, /* Profile 23. */
+            { 160, 175 }, /* Profile 24. */
+            { 192, 207 }, /* Profile 25. */
+            { 160, 175 }, /* Profile 26. */
+            { 192, 207 }, /* Profile 27. */
+            { 192, 207 }, /* Profile 28. */
+            { 160, 175 }, /* Profile 29. */
+            { 192, 207 }, /* Profile 30. */
+            { 192, 207 }, /* Profile 31. */
+            { 160, 175 }, /* Profile 32. */
+            { 192, 207 }, /* Profile 33. */
         },
-        .profile_cnt = 58,
+        .profile_cnt = 34,
     },
     {
         .name = "EM_FT_OPAQUE_OBJ_OR_IFP_OPAQUE_OBJ_15_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_EM_FT_OPAQUE_OBJ_OR_IFP_OPAQUE_OBJ_15_0,
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_EM_FT_OPAQUE_OBJ_OR_IFP_OPAQUE_OBJ_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 208, 223 }, /* Profile 2. */
-            { 192, 207 }, /* Profile 3. */
-            { 208, 223 }, /* Profile 4. */
-            { 192, 207 }, /* Profile 5. */
-            { 192, 207 }, /* Profile 6. */
-            { 208, 223 }, /* Profile 7. */
-            { 192, 207 }, /* Profile 8. */
-            { 208, 223 }, /* Profile 9. */
-            { 192, 207 }, /* Profile 10. */
-            { 192, 207 }, /* Profile 11. */
-            { 208, 223 }, /* Profile 12. */
-            { 192, 207 }, /* Profile 13. */
-            { 208, 223 }, /* Profile 14. */
-            { 192, 207 }, /* Profile 15. */
+            { 320, 335 }, /* Profile 2. */
+            { 320, 335 }, /* Profile 3. */
+            { 320, 335 }, /* Profile 4. */
+            { 320, 335 }, /* Profile 5. */
+            { 320, 335 }, /* Profile 6. */
+            { 320, 335 }, /* Profile 7. */
+            { 320, 335 }, /* Profile 8. */
+            { 320, 335 }, /* Profile 9. */
+            { -1, -1 }, /* Profile 10. */
+            { -1, -1 }, /* Profile 11. */
+            { -1, -1 }, /* Profile 12. */
+            { -1, -1 }, /* Profile 13. */
+            { -1, -1 }, /* Profile 14. */
+            { -1, -1 }, /* Profile 15. */
             { -1, -1 }, /* Profile 16. */
             { -1, -1 }, /* Profile 17. */
-            { -1, -1 }, /* Profile 18. */
-            { -1, -1 }, /* Profile 19. */
-            { -1, -1 }, /* Profile 20. */
-            { -1, -1 }, /* Profile 21. */
-            { -1, -1 }, /* Profile 22. */
-            { -1, -1 }, /* Profile 23. */
-            { -1, -1 }, /* Profile 24. */
-            { -1, -1 }, /* Profile 25. */
-            { -1, -1 }, /* Profile 26. */
-            { -1, -1 }, /* Profile 27. */
-            { -1, -1 }, /* Profile 28. */
-            { -1, -1 }, /* Profile 29. */
-            { 224, 239 }, /* Profile 30. */
-            { 208, 223 }, /* Profile 31. */
-            { 224, 239 }, /* Profile 32. */
-            { 208, 223 }, /* Profile 33. */
-            { 208, 223 }, /* Profile 34. */
-            { 224, 239 }, /* Profile 35. */
-            { 208, 223 }, /* Profile 36. */
-            { 224, 239 }, /* Profile 37. */
-            { 208, 223 }, /* Profile 38. */
-            { 208, 223 }, /* Profile 39. */
-            { 224, 239 }, /* Profile 40. */
-            { 208, 223 }, /* Profile 41. */
-            { 224, 239 }, /* Profile 42. */
-            { 208, 223 }, /* Profile 43. */
+            { 320, 335 }, /* Profile 18. */
+            { 320, 335 }, /* Profile 19. */
+            { 320, 335 }, /* Profile 20. */
+            { 320, 335 }, /* Profile 21. */
+            { 320, 335 }, /* Profile 22. */
+            { 320, 335 }, /* Profile 23. */
+            { 320, 335 }, /* Profile 24. */
+            { 320, 335 }, /* Profile 25. */
         },
-        .profile_cnt = 44,
+        .profile_cnt = 26,
     },
     {
         .name = "ENTROPY_LABEL_HIGH_3_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_HIGH_3_0,
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_HIGH_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 388, 391 }, /* Profile 2. */
+            { 384, 387 }, /* Profile 2. */
             { 380, 383 }, /* Profile 3. */
-            { 392, 395 }, /* Profile 4. */
-            { 388, 391 }, /* Profile 5. */
-            { 388, 391 }, /* Profile 6. */
-            { 388, 391 }, /* Profile 7. */
-            { 380, 383 }, /* Profile 8. */
-            { 392, 395 }, /* Profile 9. */
-            { 388, 391 }, /* Profile 10. */
-            { 388, 391 }, /* Profile 11. */
-            { 384, 387 }, /* Profile 12. */
-            { 376, 379 }, /* Profile 13. */
-            { 388, 391 }, /* Profile 14. */
-            { 384, 387 }, /* Profile 15. */
-            { 388, 391 }, /* Profile 16. */
+            { 380, 383 }, /* Profile 4. */
+            { 384, 387 }, /* Profile 5. */
+            { 380, 383 }, /* Profile 6. */
+            { 380, 383 }, /* Profile 7. */
+            { 384, 387 }, /* Profile 8. */
+            { 380, 383 }, /* Profile 9. */
+            { 384, 387 }, /* Profile 10. */
+            { 380, 383 }, /* Profile 11. */
+            { 380, 383 }, /* Profile 12. */
+            { 384, 387 }, /* Profile 13. */
+            { 380, 383 }, /* Profile 14. */
+            { 380, 383 }, /* Profile 15. */
+            { 384, 387 }, /* Profile 16. */
             { 380, 383 }, /* Profile 17. */
-            { 392, 395 }, /* Profile 18. */
-            { 388, 391 }, /* Profile 19. */
-            { 388, 391 }, /* Profile 20. */
-            { 388, 391 }, /* Profile 21. */
+            { 384, 387 }, /* Profile 18. */
+            { 380, 383 }, /* Profile 19. */
+            { 380, 383 }, /* Profile 20. */
+            { 384, 387 }, /* Profile 21. */
             { 380, 383 }, /* Profile 22. */
-            { 392, 395 }, /* Profile 23. */
-            { 388, 391 }, /* Profile 24. */
-            { 388, 391 }, /* Profile 25. */
+            { 380, 383 }, /* Profile 23. */
+            { 384, 387 }, /* Profile 24. */
+            { 380, 383 }, /* Profile 25. */
             { 384, 387 }, /* Profile 26. */
-            { 376, 379 }, /* Profile 27. */
-            { 388, 391 }, /* Profile 28. */
+            { 380, 383 }, /* Profile 27. */
+            { 380, 383 }, /* Profile 28. */
             { 384, 387 }, /* Profile 29. */
-            { 388, 391 }, /* Profile 30. */
+            { 380, 383 }, /* Profile 30. */
             { 380, 383 }, /* Profile 31. */
-            { 392, 395 }, /* Profile 32. */
-            { 388, 391 }, /* Profile 33. */
-            { 388, 391 }, /* Profile 34. */
-            { 388, 391 }, /* Profile 35. */
-            { 380, 383 }, /* Profile 36. */
-            { 392, 395 }, /* Profile 37. */
-            { 388, 391 }, /* Profile 38. */
-            { 388, 391 }, /* Profile 39. */
-            { 384, 387 }, /* Profile 40. */
-            { 376, 379 }, /* Profile 41. */
-            { 388, 391 }, /* Profile 42. */
-            { 384, 387 }, /* Profile 43. */
-            { 388, 391 }, /* Profile 44. */
-            { 380, 383 }, /* Profile 45. */
-            { 392, 395 }, /* Profile 46. */
-            { 388, 391 }, /* Profile 47. */
-            { 388, 391 }, /* Profile 48. */
-            { 388, 391 }, /* Profile 49. */
-            { 380, 383 }, /* Profile 50. */
-            { 392, 395 }, /* Profile 51. */
-            { 388, 391 }, /* Profile 52. */
-            { 388, 391 }, /* Profile 53. */
-            { 384, 387 }, /* Profile 54. */
-            { 376, 379 }, /* Profile 55. */
-            { 388, 391 }, /* Profile 56. */
-            { 384, 387 }, /* Profile 57. */
+            { 384, 387 }, /* Profile 32. */
+            { 380, 383 }, /* Profile 33. */
         },
-        .profile_cnt = 58,
+        .profile_cnt = 34,
     },
     {
         .name = "ENTROPY_LABEL_LOW_15_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0,
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 128, 143 }, /* Profile 2. */
-            { 128, 143 }, /* Profile 3. */
-            { 128, 143 }, /* Profile 4. */
-            { 128, 143 }, /* Profile 5. */
-            { 128, 143 }, /* Profile 6. */
-            { 128, 143 }, /* Profile 7. */
-            { 128, 143 }, /* Profile 8. */
-            { 128, 143 }, /* Profile 9. */
-            { 128, 143 }, /* Profile 10. */
-            { 128, 143 }, /* Profile 11. */
-            { 128, 143 }, /* Profile 12. */
-            { 128, 143 }, /* Profile 13. */
-            { 128, 143 }, /* Profile 14. */
-            { 128, 143 }, /* Profile 15. */
-            { 128, 143 }, /* Profile 16. */
-            { 128, 143 }, /* Profile 17. */
-            { 128, 143 }, /* Profile 18. */
-            { 128, 143 }, /* Profile 19. */
-            { 128, 143 }, /* Profile 20. */
-            { 128, 143 }, /* Profile 21. */
-            { 128, 143 }, /* Profile 22. */
-            { 128, 143 }, /* Profile 23. */
-            { 128, 143 }, /* Profile 24. */
-            { 128, 143 }, /* Profile 25. */
-            { 128, 143 }, /* Profile 26. */
-            { 128, 143 }, /* Profile 27. */
-            { 128, 143 }, /* Profile 28. */
-            { 128, 143 }, /* Profile 29. */
-            { 128, 143 }, /* Profile 30. */
-            { 128, 143 }, /* Profile 31. */
-            { 128, 143 }, /* Profile 32. */
-            { 128, 143 }, /* Profile 33. */
-            { 128, 143 }, /* Profile 34. */
-            { 128, 143 }, /* Profile 35. */
-            { 128, 143 }, /* Profile 36. */
-            { 128, 143 }, /* Profile 37. */
-            { 128, 143 }, /* Profile 38. */
-            { 128, 143 }, /* Profile 39. */
-            { 128, 143 }, /* Profile 40. */
-            { 128, 143 }, /* Profile 41. */
-            { 128, 143 }, /* Profile 42. */
-            { 128, 143 }, /* Profile 43. */
-            { 128, 143 }, /* Profile 44. */
-            { 128, 143 }, /* Profile 45. */
-            { 128, 143 }, /* Profile 46. */
-            { 128, 143 }, /* Profile 47. */
-            { 128, 143 }, /* Profile 48. */
-            { 128, 143 }, /* Profile 49. */
-            { 128, 143 }, /* Profile 50. */
-            { 128, 143 }, /* Profile 51. */
-            { 128, 143 }, /* Profile 52. */
-            { 128, 143 }, /* Profile 53. */
-            { 128, 143 }, /* Profile 54. */
-            { 128, 143 }, /* Profile 55. */
-            { 128, 143 }, /* Profile 56. */
-            { 128, 143 }, /* Profile 57. */
+            { 96, 111 }, /* Profile 2. */
+            { 96, 111 }, /* Profile 3. */
+            { 96, 111 }, /* Profile 4. */
+            { 96, 111 }, /* Profile 5. */
+            { 96, 111 }, /* Profile 6. */
+            { 96, 111 }, /* Profile 7. */
+            { 96, 111 }, /* Profile 8. */
+            { 96, 111 }, /* Profile 9. */
+            { 96, 111 }, /* Profile 10. */
+            { 96, 111 }, /* Profile 11. */
+            { 96, 111 }, /* Profile 12. */
+            { 96, 111 }, /* Profile 13. */
+            { 96, 111 }, /* Profile 14. */
+            { 96, 111 }, /* Profile 15. */
+            { 96, 111 }, /* Profile 16. */
+            { 96, 111 }, /* Profile 17. */
+            { 96, 111 }, /* Profile 18. */
+            { 96, 111 }, /* Profile 19. */
+            { 96, 111 }, /* Profile 20. */
+            { 96, 111 }, /* Profile 21. */
+            { 96, 111 }, /* Profile 22. */
+            { 96, 111 }, /* Profile 23. */
+            { 96, 111 }, /* Profile 24. */
+            { 96, 111 }, /* Profile 25. */
+            { 96, 111 }, /* Profile 26. */
+            { 96, 111 }, /* Profile 27. */
+            { 96, 111 }, /* Profile 28. */
+            { 96, 111 }, /* Profile 29. */
+            { 96, 111 }, /* Profile 30. */
+            { 96, 111 }, /* Profile 31. */
+            { 96, 111 }, /* Profile 32. */
+            { 96, 111 }, /* Profile 33. */
         },
-        .profile_cnt = 58,
+        .profile_cnt = 34,
     },
     {
         .name = "EP_NIH_DROP_CODE_OR_IFP_OPAQUE_OBJ_15_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_EP_NIH_DROP_CODE_OR_IFP_OPAQUE_OBJ_15_0,
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_EP_NIH_DROP_CODE_OR_IFP_OPAQUE_OBJ_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { -1, -1 }, /* Profile 2. */
             { -1, -1 }, /* Profile 3. */
             { -1, -1 }, /* Profile 4. */
-            { -1, -1 }, /* Profile 5. */
-            { -1, -1 }, /* Profile 6. */
+            { 48, 63 }, /* Profile 5. */
+            { 48, 63 }, /* Profile 6. */
             { 48, 63 }, /* Profile 7. */
-            { 48, 63 }, /* Profile 8. */
-            { 48, 63 }, /* Profile 9. */
-            { 48, 63 }, /* Profile 10. */
-            { 48, 63 }, /* Profile 11. */
+            { -1, -1 }, /* Profile 8. */
+            { -1, -1 }, /* Profile 9. */
+            { -1, -1 }, /* Profile 10. */
+            { -1, -1 }, /* Profile 11. */
             { -1, -1 }, /* Profile 12. */
-            { -1, -1 }, /* Profile 13. */
-            { -1, -1 }, /* Profile 14. */
-            { -1, -1 }, /* Profile 15. */
+            { 48, 63 }, /* Profile 13. */
+            { 48, 63 }, /* Profile 14. */
+            { 48, 63 }, /* Profile 15. */
             { -1, -1 }, /* Profile 16. */
             { -1, -1 }, /* Profile 17. */
             { -1, -1 }, /* Profile 18. */
@@ -941,223 +690,135 @@ static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_flex_field_
             { 48, 63 }, /* Profile 21. */
             { 48, 63 }, /* Profile 22. */
             { 48, 63 }, /* Profile 23. */
-            { 48, 63 }, /* Profile 24. */
-            { 48, 63 }, /* Profile 25. */
+            { -1, -1 }, /* Profile 24. */
+            { -1, -1 }, /* Profile 25. */
             { -1, -1 }, /* Profile 26. */
             { -1, -1 }, /* Profile 27. */
             { -1, -1 }, /* Profile 28. */
-            { -1, -1 }, /* Profile 29. */
-            { -1, -1 }, /* Profile 30. */
-            { -1, -1 }, /* Profile 31. */
-            { -1, -1 }, /* Profile 32. */
-            { -1, -1 }, /* Profile 33. */
-            { -1, -1 }, /* Profile 34. */
-            { 48, 63 }, /* Profile 35. */
-            { 48, 63 }, /* Profile 36. */
-            { 48, 63 }, /* Profile 37. */
-            { 48, 63 }, /* Profile 38. */
-            { 48, 63 }, /* Profile 39. */
-            { -1, -1 }, /* Profile 40. */
-            { -1, -1 }, /* Profile 41. */
-            { -1, -1 }, /* Profile 42. */
-            { -1, -1 }, /* Profile 43. */
-            { -1, -1 }, /* Profile 44. */
-            { -1, -1 }, /* Profile 45. */
-            { -1, -1 }, /* Profile 46. */
-            { -1, -1 }, /* Profile 47. */
-            { -1, -1 }, /* Profile 48. */
-            { 48, 63 }, /* Profile 49. */
-            { 48, 63 }, /* Profile 50. */
-            { 48, 63 }, /* Profile 51. */
-            { 48, 63 }, /* Profile 52. */
-            { 48, 63 }, /* Profile 53. */
+            { 48, 63 }, /* Profile 29. */
+            { 48, 63 }, /* Profile 30. */
+            { 48, 63 }, /* Profile 31. */
         },
-        .profile_cnt = 54,
+        .profile_cnt = 32,
     },
     {
         .name = "EP_NIH_HDR_RECIRC_CODE_3_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_RECIRC_CODE_3_0,
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_RECIRC_CODE_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 368, 371 }, /* Profile 2. */
-            { 352, 355 }, /* Profile 3. */
-            { 368, 371 }, /* Profile 4. */
-            { 368, 371 }, /* Profile 5. */
-            { 368, 371 }, /* Profile 6. */
-            { 368, 371 }, /* Profile 7. */
-            { 352, 355 }, /* Profile 8. */
-            { 368, 371 }, /* Profile 9. */
-            { 368, 371 }, /* Profile 10. */
-            { 368, 371 }, /* Profile 11. */
-            { -1, -1 }, /* Profile 12. */
-            { -1, -1 }, /* Profile 13. */
-            { -1, -1 }, /* Profile 14. */
-            { -1, -1 }, /* Profile 15. */
-            { 368, 371 }, /* Profile 16. */
-            { 352, 355 }, /* Profile 17. */
-            { 368, 371 }, /* Profile 18. */
-            { 368, 371 }, /* Profile 19. */
-            { 368, 371 }, /* Profile 20. */
-            { 368, 371 }, /* Profile 21. */
-            { 352, 355 }, /* Profile 22. */
-            { 368, 371 }, /* Profile 23. */
-            { 368, 371 }, /* Profile 24. */
-            { 368, 371 }, /* Profile 25. */
-            { -1, -1 }, /* Profile 26. */
-            { -1, -1 }, /* Profile 27. */
-            { -1, -1 }, /* Profile 28. */
-            { -1, -1 }, /* Profile 29. */
-            { 368, 371 }, /* Profile 30. */
-            { 352, 355 }, /* Profile 31. */
-            { 368, 371 }, /* Profile 32. */
-            { 368, 371 }, /* Profile 33. */
-            { 368, 371 }, /* Profile 34. */
-            { 368, 371 }, /* Profile 35. */
-            { 352, 355 }, /* Profile 36. */
-            { 368, 371 }, /* Profile 37. */
-            { 368, 371 }, /* Profile 38. */
-            { 368, 371 }, /* Profile 39. */
-            { -1, -1 }, /* Profile 40. */
-            { -1, -1 }, /* Profile 41. */
-            { -1, -1 }, /* Profile 42. */
-            { -1, -1 }, /* Profile 43. */
-            { 368, 371 }, /* Profile 44. */
-            { 352, 355 }, /* Profile 45. */
-            { 368, 371 }, /* Profile 46. */
-            { 368, 371 }, /* Profile 47. */
-            { 368, 371 }, /* Profile 48. */
-            { 368, 371 }, /* Profile 49. */
-            { 352, 355 }, /* Profile 50. */
-            { 368, 371 }, /* Profile 51. */
-            { 368, 371 }, /* Profile 52. */
-            { 368, 371 }, /* Profile 53. */
+            { 388, 391 }, /* Profile 2. */
+            { 384, 387 }, /* Profile 3. */
+            { 384, 387 }, /* Profile 4. */
+            { 388, 391 }, /* Profile 5. */
+            { 384, 387 }, /* Profile 6. */
+            { 384, 387 }, /* Profile 7. */
+            { -1, -1 }, /* Profile 8. */
+            { -1, -1 }, /* Profile 9. */
+            { 388, 391 }, /* Profile 10. */
+            { 384, 387 }, /* Profile 11. */
+            { 384, 387 }, /* Profile 12. */
+            { 388, 391 }, /* Profile 13. */
+            { 384, 387 }, /* Profile 14. */
+            { 384, 387 }, /* Profile 15. */
+            { -1, -1 }, /* Profile 16. */
+            { -1, -1 }, /* Profile 17. */
+            { 388, 391 }, /* Profile 18. */
+            { 384, 387 }, /* Profile 19. */
+            { 384, 387 }, /* Profile 20. */
+            { 388, 391 }, /* Profile 21. */
+            { 384, 387 }, /* Profile 22. */
+            { 384, 387 }, /* Profile 23. */
+            { -1, -1 }, /* Profile 24. */
+            { -1, -1 }, /* Profile 25. */
+            { 388, 391 }, /* Profile 26. */
+            { 384, 387 }, /* Profile 27. */
+            { 384, 387 }, /* Profile 28. */
+            { 388, 391 }, /* Profile 29. */
+            { 384, 387 }, /* Profile 30. */
+            { 384, 387 }, /* Profile 31. */
         },
-        .profile_cnt = 54,
+        .profile_cnt = 32,
     },
     {
         .name = "EP_NIH_HDR_TIMESTAMP_15_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_15_0,
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { -1, -1 }, /* Profile 2. */
-            { -1, -1 }, /* Profile 3. */
+            { 128, 143 }, /* Profile 3. */
             { -1, -1 }, /* Profile 4. */
-            { 288, 303 }, /* Profile 5. */
-            { -1, -1 }, /* Profile 6. */
+            { -1, -1 }, /* Profile 5. */
+            { 128, 143 }, /* Profile 6. */
             { -1, -1 }, /* Profile 7. */
             { -1, -1 }, /* Profile 8. */
             { -1, -1 }, /* Profile 9. */
-            { 288, 303 }, /* Profile 10. */
-            { -1, -1 }, /* Profile 11. */
+            { -1, -1 }, /* Profile 10. */
+            { 128, 143 }, /* Profile 11. */
             { -1, -1 }, /* Profile 12. */
             { -1, -1 }, /* Profile 13. */
-            { -1, -1 }, /* Profile 14. */
+            { 128, 143 }, /* Profile 14. */
             { -1, -1 }, /* Profile 15. */
             { -1, -1 }, /* Profile 16. */
             { -1, -1 }, /* Profile 17. */
             { -1, -1 }, /* Profile 18. */
-            { 288, 303 }, /* Profile 19. */
+            { 144, 159 }, /* Profile 19. */
             { -1, -1 }, /* Profile 20. */
             { -1, -1 }, /* Profile 21. */
-            { -1, -1 }, /* Profile 22. */
+            { 144, 159 }, /* Profile 22. */
             { -1, -1 }, /* Profile 23. */
-            { 288, 303 }, /* Profile 24. */
+            { -1, -1 }, /* Profile 24. */
             { -1, -1 }, /* Profile 25. */
             { -1, -1 }, /* Profile 26. */
-            { -1, -1 }, /* Profile 27. */
+            { 144, 159 }, /* Profile 27. */
             { -1, -1 }, /* Profile 28. */
             { -1, -1 }, /* Profile 29. */
-            { -1, -1 }, /* Profile 30. */
-            { -1, -1 }, /* Profile 31. */
-            { -1, -1 }, /* Profile 32. */
-            { 304, 319 }, /* Profile 33. */
-            { -1, -1 }, /* Profile 34. */
-            { -1, -1 }, /* Profile 35. */
-            { -1, -1 }, /* Profile 36. */
-            { -1, -1 }, /* Profile 37. */
-            { 304, 319 }, /* Profile 38. */
-            { -1, -1 }, /* Profile 39. */
-            { -1, -1 }, /* Profile 40. */
-            { -1, -1 }, /* Profile 41. */
-            { -1, -1 }, /* Profile 42. */
-            { -1, -1 }, /* Profile 43. */
-            { -1, -1 }, /* Profile 44. */
-            { -1, -1 }, /* Profile 45. */
-            { -1, -1 }, /* Profile 46. */
-            { 304, 319 }, /* Profile 47. */
-            { -1, -1 }, /* Profile 48. */
-            { -1, -1 }, /* Profile 49. */
-            { -1, -1 }, /* Profile 50. */
-            { -1, -1 }, /* Profile 51. */
-            { 304, 319 }, /* Profile 52. */
+            { 144, 159 }, /* Profile 30. */
         },
-        .profile_cnt = 53,
+        .profile_cnt = 31,
     },
     {
         .name = "EP_NIH_HDR_TIMESTAMP_31_16",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_31_16,
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_31_16,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { -1, -1 }, /* Profile 2. */
-            { -1, -1 }, /* Profile 3. */
+            { 144, 159 }, /* Profile 3. */
             { -1, -1 }, /* Profile 4. */
-            { 304, 319 }, /* Profile 5. */
-            { -1, -1 }, /* Profile 6. */
+            { -1, -1 }, /* Profile 5. */
+            { 144, 159 }, /* Profile 6. */
             { -1, -1 }, /* Profile 7. */
             { -1, -1 }, /* Profile 8. */
             { -1, -1 }, /* Profile 9. */
-            { 304, 319 }, /* Profile 10. */
-            { -1, -1 }, /* Profile 11. */
+            { -1, -1 }, /* Profile 10. */
+            { 144, 159 }, /* Profile 11. */
             { -1, -1 }, /* Profile 12. */
             { -1, -1 }, /* Profile 13. */
-            { -1, -1 }, /* Profile 14. */
+            { 144, 159 }, /* Profile 14. */
             { -1, -1 }, /* Profile 15. */
             { -1, -1 }, /* Profile 16. */
             { -1, -1 }, /* Profile 17. */
             { -1, -1 }, /* Profile 18. */
-            { 304, 319 }, /* Profile 19. */
+            { 160, 175 }, /* Profile 19. */
             { -1, -1 }, /* Profile 20. */
             { -1, -1 }, /* Profile 21. */
-            { -1, -1 }, /* Profile 22. */
+            { 160, 175 }, /* Profile 22. */
             { -1, -1 }, /* Profile 23. */
-            { 304, 319 }, /* Profile 24. */
+            { -1, -1 }, /* Profile 24. */
             { -1, -1 }, /* Profile 25. */
             { -1, -1 }, /* Profile 26. */
-            { -1, -1 }, /* Profile 27. */
+            { 160, 175 }, /* Profile 27. */
             { -1, -1 }, /* Profile 28. */
             { -1, -1 }, /* Profile 29. */
-            { -1, -1 }, /* Profile 30. */
-            { -1, -1 }, /* Profile 31. */
-            { -1, -1 }, /* Profile 32. */
-            { 320, 335 }, /* Profile 33. */
-            { -1, -1 }, /* Profile 34. */
-            { -1, -1 }, /* Profile 35. */
-            { -1, -1 }, /* Profile 36. */
-            { -1, -1 }, /* Profile 37. */
-            { 320, 335 }, /* Profile 38. */
-            { -1, -1 }, /* Profile 39. */
-            { -1, -1 }, /* Profile 40. */
-            { -1, -1 }, /* Profile 41. */
-            { -1, -1 }, /* Profile 42. */
-            { -1, -1 }, /* Profile 43. */
-            { -1, -1 }, /* Profile 44. */
-            { -1, -1 }, /* Profile 45. */
-            { -1, -1 }, /* Profile 46. */
-            { 320, 335 }, /* Profile 47. */
-            { -1, -1 }, /* Profile 48. */
-            { -1, -1 }, /* Profile 49. */
-            { -1, -1 }, /* Profile 50. */
-            { -1, -1 }, /* Profile 51. */
-            { 320, 335 }, /* Profile 52. */
+            { 160, 175 }, /* Profile 30. */
         },
-        .profile_cnt = 53,
+        .profile_cnt = 31,
     },
     {
         .name = "EVENT_TRACE_VECTOR_15_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_15_0,
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1193,36 +854,12 @@ static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_flex_field_
             { 0, 15 }, /* Profile 31. */
             { 0, 15 }, /* Profile 32. */
             { 0, 15 }, /* Profile 33. */
-            { 0, 15 }, /* Profile 34. */
-            { 0, 15 }, /* Profile 35. */
-            { 0, 15 }, /* Profile 36. */
-            { 0, 15 }, /* Profile 37. */
-            { 0, 15 }, /* Profile 38. */
-            { 0, 15 }, /* Profile 39. */
-            { 0, 15 }, /* Profile 40. */
-            { 0, 15 }, /* Profile 41. */
-            { 0, 15 }, /* Profile 42. */
-            { 0, 15 }, /* Profile 43. */
-            { 0, 15 }, /* Profile 44. */
-            { 0, 15 }, /* Profile 45. */
-            { 0, 15 }, /* Profile 46. */
-            { 0, 15 }, /* Profile 47. */
-            { 0, 15 }, /* Profile 48. */
-            { 0, 15 }, /* Profile 49. */
-            { 0, 15 }, /* Profile 50. */
-            { 0, 15 }, /* Profile 51. */
-            { 0, 15 }, /* Profile 52. */
-            { 0, 15 }, /* Profile 53. */
-            { 0, 15 }, /* Profile 54. */
-            { 0, 15 }, /* Profile 55. */
-            { 0, 15 }, /* Profile 56. */
-            { 0, 15 }, /* Profile 57. */
         },
-        .profile_cnt = 58,
+        .profile_cnt = 34,
     },
     {
         .name = "EVENT_TRACE_VECTOR_31_16",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_16,
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_16,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1258,36 +895,12 @@ static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_flex_field_
             { 16, 31 }, /* Profile 31. */
             { 16, 31 }, /* Profile 32. */
             { 16, 31 }, /* Profile 33. */
-            { 16, 31 }, /* Profile 34. */
-            { 16, 31 }, /* Profile 35. */
-            { 16, 31 }, /* Profile 36. */
-            { 16, 31 }, /* Profile 37. */
-            { 16, 31 }, /* Profile 38. */
-            { 16, 31 }, /* Profile 39. */
-            { 16, 31 }, /* Profile 40. */
-            { 16, 31 }, /* Profile 41. */
-            { 16, 31 }, /* Profile 42. */
-            { 16, 31 }, /* Profile 43. */
-            { 16, 31 }, /* Profile 44. */
-            { 16, 31 }, /* Profile 45. */
-            { 16, 31 }, /* Profile 46. */
-            { 16, 31 }, /* Profile 47. */
-            { 16, 31 }, /* Profile 48. */
-            { 16, 31 }, /* Profile 49. */
-            { 16, 31 }, /* Profile 50. */
-            { 16, 31 }, /* Profile 51. */
-            { 16, 31 }, /* Profile 52. */
-            { 16, 31 }, /* Profile 53. */
-            { 16, 31 }, /* Profile 54. */
-            { 16, 31 }, /* Profile 55. */
-            { 16, 31 }, /* Profile 56. */
-            { 16, 31 }, /* Profile 57. */
         },
-        .profile_cnt = 58,
+        .profile_cnt = 34,
     },
     {
         .name = "EVENT_TRACE_VECTOR_47_32",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32,
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1323,658 +936,406 @@ static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_flex_field_
             { 32, 47 }, /* Profile 31. */
             { 32, 47 }, /* Profile 32. */
             { 32, 47 }, /* Profile 33. */
-            { 32, 47 }, /* Profile 34. */
-            { 32, 47 }, /* Profile 35. */
-            { 32, 47 }, /* Profile 36. */
-            { 32, 47 }, /* Profile 37. */
-            { 32, 47 }, /* Profile 38. */
-            { 32, 47 }, /* Profile 39. */
-            { 32, 47 }, /* Profile 40. */
-            { 32, 47 }, /* Profile 41. */
-            { 32, 47 }, /* Profile 42. */
-            { 32, 47 }, /* Profile 43. */
-            { 32, 47 }, /* Profile 44. */
-            { 32, 47 }, /* Profile 45. */
-            { 32, 47 }, /* Profile 46. */
-            { 32, 47 }, /* Profile 47. */
-            { 32, 47 }, /* Profile 48. */
-            { 32, 47 }, /* Profile 49. */
-            { 32, 47 }, /* Profile 50. */
-            { 32, 47 }, /* Profile 51. */
-            { 32, 47 }, /* Profile 52. */
-            { 32, 47 }, /* Profile 53. */
-            { 32, 47 }, /* Profile 54. */
-            { 32, 47 }, /* Profile 55. */
-            { 32, 47 }, /* Profile 56. */
-            { 32, 47 }, /* Profile 57. */
         },
-        .profile_cnt = 58,
+        .profile_cnt = 34,
     },
     {
         .name = "I2E_CLASS_ID_15_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0,
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 320, 335 }, /* Profile 2. */
-            { 288, 303 }, /* Profile 3. */
-            { 320, 335 }, /* Profile 4. */
-            { 320, 335 }, /* Profile 5. */
-            { 320, 335 }, /* Profile 6. */
-            { 320, 335 }, /* Profile 7. */
-            { 288, 303 }, /* Profile 8. */
-            { 320, 335 }, /* Profile 9. */
-            { 320, 335 }, /* Profile 10. */
-            { 320, 335 }, /* Profile 11. */
-            { 320, 335 }, /* Profile 12. */
-            { 288, 303 }, /* Profile 13. */
-            { 320, 335 }, /* Profile 14. */
-            { 320, 335 }, /* Profile 15. */
-            { 320, 335 }, /* Profile 16. */
-            { 288, 303 }, /* Profile 17. */
-            { 320, 335 }, /* Profile 18. */
-            { 320, 335 }, /* Profile 19. */
-            { 320, 335 }, /* Profile 20. */
-            { 320, 335 }, /* Profile 21. */
-            { 288, 303 }, /* Profile 22. */
-            { 320, 335 }, /* Profile 23. */
-            { 320, 335 }, /* Profile 24. */
-            { 320, 335 }, /* Profile 25. */
-            { 320, 335 }, /* Profile 26. */
-            { 288, 303 }, /* Profile 27. */
-            { 320, 335 }, /* Profile 28. */
-            { 320, 335 }, /* Profile 29. */
-            { 336, 351 }, /* Profile 30. */
-            { 304, 319 }, /* Profile 31. */
-            { 336, 351 }, /* Profile 32. */
-            { 336, 351 }, /* Profile 33. */
-            { 336, 351 }, /* Profile 34. */
-            { 336, 351 }, /* Profile 35. */
-            { 304, 319 }, /* Profile 36. */
-            { 336, 351 }, /* Profile 37. */
-            { 336, 351 }, /* Profile 38. */
-            { 336, 351 }, /* Profile 39. */
-            { 336, 351 }, /* Profile 40. */
-            { 304, 319 }, /* Profile 41. */
-            { 336, 351 }, /* Profile 42. */
-            { 336, 351 }, /* Profile 43. */
-            { 336, 351 }, /* Profile 44. */
-            { 304, 319 }, /* Profile 45. */
-            { 336, 351 }, /* Profile 46. */
-            { 336, 351 }, /* Profile 47. */
-            { 336, 351 }, /* Profile 48. */
-            { 336, 351 }, /* Profile 49. */
-            { 304, 319 }, /* Profile 50. */
-            { 336, 351 }, /* Profile 51. */
-            { 336, 351 }, /* Profile 52. */
-            { 336, 351 }, /* Profile 53. */
-            { 336, 351 }, /* Profile 54. */
-            { 304, 319 }, /* Profile 55. */
-            { 336, 351 }, /* Profile 56. */
-            { 336, 351 }, /* Profile 57. */
+            { 192, 207 }, /* Profile 2. */
+            { 224, 239 }, /* Profile 3. */
+            { 224, 239 }, /* Profile 4. */
+            { 192, 207 }, /* Profile 5. */
+            { 224, 239 }, /* Profile 6. */
+            { 224, 239 }, /* Profile 7. */
+            { 192, 207 }, /* Profile 8. */
+            { 224, 239 }, /* Profile 9. */
+            { 192, 207 }, /* Profile 10. */
+            { 224, 239 }, /* Profile 11. */
+            { 224, 239 }, /* Profile 12. */
+            { 192, 207 }, /* Profile 13. */
+            { 224, 239 }, /* Profile 14. */
+            { 224, 239 }, /* Profile 15. */
+            { 192, 207 }, /* Profile 16. */
+            { 224, 239 }, /* Profile 17. */
+            { 208, 223 }, /* Profile 18. */
+            { 240, 255 }, /* Profile 19. */
+            { 240, 255 }, /* Profile 20. */
+            { 208, 223 }, /* Profile 21. */
+            { 240, 255 }, /* Profile 22. */
+            { 240, 255 }, /* Profile 23. */
+            { 208, 223 }, /* Profile 24. */
+            { 240, 255 }, /* Profile 25. */
+            { 208, 223 }, /* Profile 26. */
+            { 240, 255 }, /* Profile 27. */
+            { 240, 255 }, /* Profile 28. */
+            { 208, 223 }, /* Profile 29. */
+            { 240, 255 }, /* Profile 30. */
+            { 240, 255 }, /* Profile 31. */
+            { 208, 223 }, /* Profile 32. */
+            { 240, 255 }, /* Profile 33. */
         },
-        .profile_cnt = 58,
+        .profile_cnt = 34,
     },
     {
         .name = "IFP_IOAM_GBP_ACTION_3_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_IFP_IOAM_GBP_ACTION_3_0,
-        .profile = {
-            { -1, -1 }, /* Profile 0. */
-            { -1, -1 }, /* Profile 1. */
-            { 408, 411 }, /* Profile 2. */
-            { 400, 403 }, /* Profile 3. */
-            { 408, 411 }, /* Profile 4. */
-            { 404, 407 }, /* Profile 5. */
-            { 404, 407 }, /* Profile 6. */
-            { 408, 411 }, /* Profile 7. */
-            { 400, 403 }, /* Profile 8. */
-            { 408, 411 }, /* Profile 9. */
-            { 404, 407 }, /* Profile 10. */
-            { 404, 407 }, /* Profile 11. */
-            { 404, 407 }, /* Profile 12. */
-            { 396, 399 }, /* Profile 13. */
-            { 404, 407 }, /* Profile 14. */
-            { 400, 403 }, /* Profile 15. */
-            { 408, 411 }, /* Profile 16. */
-            { 400, 403 }, /* Profile 17. */
-            { 408, 411 }, /* Profile 18. */
-            { 404, 407 }, /* Profile 19. */
-            { 404, 407 }, /* Profile 20. */
-            { 408, 411 }, /* Profile 21. */
-            { 400, 403 }, /* Profile 22. */
-            { 408, 411 }, /* Profile 23. */
-            { 404, 407 }, /* Profile 24. */
-            { 404, 407 }, /* Profile 25. */
-            { 404, 407 }, /* Profile 26. */
-            { 396, 399 }, /* Profile 27. */
-            { 404, 407 }, /* Profile 28. */
-            { 400, 403 }, /* Profile 29. */
-            { 408, 411 }, /* Profile 30. */
-            { 400, 403 }, /* Profile 31. */
-            { 408, 411 }, /* Profile 32. */
-            { 404, 407 }, /* Profile 33. */
-            { 404, 407 }, /* Profile 34. */
-            { 408, 411 }, /* Profile 35. */
-            { 400, 403 }, /* Profile 36. */
-            { 408, 411 }, /* Profile 37. */
-            { 404, 407 }, /* Profile 38. */
-            { 404, 407 }, /* Profile 39. */
-            { 404, 407 }, /* Profile 40. */
-            { 396, 399 }, /* Profile 41. */
-            { 404, 407 }, /* Profile 42. */
-            { 400, 403 }, /* Profile 43. */
-            { 408, 411 }, /* Profile 44. */
-            { 400, 403 }, /* Profile 45. */
-            { 408, 411 }, /* Profile 46. */
-            { 404, 407 }, /* Profile 47. */
-            { 404, 407 }, /* Profile 48. */
-            { 408, 411 }, /* Profile 49. */
-            { 400, 403 }, /* Profile 50. */
-            { 408, 411 }, /* Profile 51. */
-            { 404, 407 }, /* Profile 52. */
-            { 404, 407 }, /* Profile 53. */
-            { 404, 407 }, /* Profile 54. */
-            { 396, 399 }, /* Profile 55. */
-            { 404, 407 }, /* Profile 56. */
-            { 400, 403 }, /* Profile 57. */
-        },
-        .profile_cnt = 58,
-    },
-    {
-        .name = "IFP_TS_CONTROL_ACTION_3_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_IFP_TS_CONTROL_ACTION_3_0,
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_IFP_IOAM_GBP_ACTION_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 372, 375 }, /* Profile 2. */
-            { 356, 359 }, /* Profile 3. */
-            { 376, 379 }, /* Profile 4. */
-            { 372, 375 }, /* Profile 5. */
+            { 376, 379 }, /* Profile 2. */
+            { 372, 375 }, /* Profile 3. */
+            { 372, 375 }, /* Profile 4. */
+            { 376, 379 }, /* Profile 5. */
             { 372, 375 }, /* Profile 6. */
             { 372, 375 }, /* Profile 7. */
-            { 356, 359 }, /* Profile 8. */
-            { 376, 379 }, /* Profile 9. */
-            { 372, 375 }, /* Profile 10. */
+            { 376, 379 }, /* Profile 8. */
+            { 372, 375 }, /* Profile 9. */
+            { 376, 379 }, /* Profile 10. */
             { 372, 375 }, /* Profile 11. */
-            { 368, 371 }, /* Profile 12. */
-            { 352, 355 }, /* Profile 13. */
+            { 372, 375 }, /* Profile 12. */
+            { 376, 379 }, /* Profile 13. */
             { 372, 375 }, /* Profile 14. */
-            { 368, 371 }, /* Profile 15. */
-            { 372, 375 }, /* Profile 16. */
-            { 356, 359 }, /* Profile 17. */
+            { 372, 375 }, /* Profile 15. */
+            { 376, 379 }, /* Profile 16. */
+            { 372, 375 }, /* Profile 17. */
             { 376, 379 }, /* Profile 18. */
             { 372, 375 }, /* Profile 19. */
             { 372, 375 }, /* Profile 20. */
-            { 372, 375 }, /* Profile 21. */
-            { 356, 359 }, /* Profile 22. */
-            { 376, 379 }, /* Profile 23. */
-            { 372, 375 }, /* Profile 24. */
+            { 376, 379 }, /* Profile 21. */
+            { 372, 375 }, /* Profile 22. */
+            { 372, 375 }, /* Profile 23. */
+            { 376, 379 }, /* Profile 24. */
             { 372, 375 }, /* Profile 25. */
-            { 368, 371 }, /* Profile 26. */
-            { 352, 355 }, /* Profile 27. */
+            { 376, 379 }, /* Profile 26. */
+            { 372, 375 }, /* Profile 27. */
             { 372, 375 }, /* Profile 28. */
-            { 368, 371 }, /* Profile 29. */
+            { 376, 379 }, /* Profile 29. */
             { 372, 375 }, /* Profile 30. */
-            { 356, 359 }, /* Profile 31. */
+            { 372, 375 }, /* Profile 31. */
             { 376, 379 }, /* Profile 32. */
             { 372, 375 }, /* Profile 33. */
-            { 372, 375 }, /* Profile 34. */
-            { 372, 375 }, /* Profile 35. */
-            { 356, 359 }, /* Profile 36. */
-            { 376, 379 }, /* Profile 37. */
-            { 372, 375 }, /* Profile 38. */
-            { 372, 375 }, /* Profile 39. */
-            { 368, 371 }, /* Profile 40. */
-            { 352, 355 }, /* Profile 41. */
-            { 372, 375 }, /* Profile 42. */
-            { 368, 371 }, /* Profile 43. */
-            { 372, 375 }, /* Profile 44. */
-            { 356, 359 }, /* Profile 45. */
-            { 376, 379 }, /* Profile 46. */
-            { 372, 375 }, /* Profile 47. */
-            { 372, 375 }, /* Profile 48. */
-            { 372, 375 }, /* Profile 49. */
-            { 356, 359 }, /* Profile 50. */
-            { 376, 379 }, /* Profile 51. */
-            { 372, 375 }, /* Profile 52. */
-            { 372, 375 }, /* Profile 53. */
-            { 368, 371 }, /* Profile 54. */
-            { 352, 355 }, /* Profile 55. */
-            { 372, 375 }, /* Profile 56. */
-            { 368, 371 }, /* Profile 57. */
         },
-        .profile_cnt = 58,
+        .profile_cnt = 34,
+    },
+    {
+        .name = "IFP_TS_CONTROL_ACTION_3_0",
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_IFP_TS_CONTROL_ACTION_3_0,
+        .profile = {
+            { -1, -1 }, /* Profile 0. */
+            { -1, -1 }, /* Profile 1. */
+            { 396, 399 }, /* Profile 2. */
+            { 392, 395 }, /* Profile 3. */
+            { 392, 395 }, /* Profile 4. */
+            { 396, 399 }, /* Profile 5. */
+            { 392, 395 }, /* Profile 6. */
+            { 392, 395 }, /* Profile 7. */
+            { 392, 395 }, /* Profile 8. */
+            { 388, 391 }, /* Profile 9. */
+            { 396, 399 }, /* Profile 10. */
+            { 392, 395 }, /* Profile 11. */
+            { 392, 395 }, /* Profile 12. */
+            { 396, 399 }, /* Profile 13. */
+            { 392, 395 }, /* Profile 14. */
+            { 392, 395 }, /* Profile 15. */
+            { 392, 395 }, /* Profile 16. */
+            { 388, 391 }, /* Profile 17. */
+            { 396, 399 }, /* Profile 18. */
+            { 392, 395 }, /* Profile 19. */
+            { 392, 395 }, /* Profile 20. */
+            { 396, 399 }, /* Profile 21. */
+            { 392, 395 }, /* Profile 22. */
+            { 392, 395 }, /* Profile 23. */
+            { 392, 395 }, /* Profile 24. */
+            { 388, 391 }, /* Profile 25. */
+            { 396, 399 }, /* Profile 26. */
+            { 392, 395 }, /* Profile 27. */
+            { 392, 395 }, /* Profile 28. */
+            { 396, 399 }, /* Profile 29. */
+            { 392, 395 }, /* Profile 30. */
+            { 392, 395 }, /* Profile 31. */
+            { 392, 395 }, /* Profile 32. */
+            { 388, 391 }, /* Profile 33. */
+        },
+        .profile_cnt = 34,
     },
     {
         .name = "ING_TIMESTAMP_15_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_15_0,
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { -1, -1 }, /* Profile 2. */
             { -1, -1 }, /* Profile 3. */
-            { -1, -1 }, /* Profile 4. */
+            { 128, 143 }, /* Profile 4. */
             { -1, -1 }, /* Profile 5. */
-            { 288, 303 }, /* Profile 6. */
-            { -1, -1 }, /* Profile 7. */
+            { -1, -1 }, /* Profile 6. */
+            { 128, 143 }, /* Profile 7. */
             { -1, -1 }, /* Profile 8. */
-            { -1, -1 }, /* Profile 9. */
+            { 128, 143 }, /* Profile 9. */
             { -1, -1 }, /* Profile 10. */
-            { 288, 303 }, /* Profile 11. */
-            { -1, -1 }, /* Profile 12. */
+            { -1, -1 }, /* Profile 11. */
+            { 128, 143 }, /* Profile 12. */
             { -1, -1 }, /* Profile 13. */
             { -1, -1 }, /* Profile 14. */
-            { 288, 303 }, /* Profile 15. */
+            { 128, 143 }, /* Profile 15. */
             { -1, -1 }, /* Profile 16. */
-            { -1, -1 }, /* Profile 17. */
+            { 128, 143 }, /* Profile 17. */
             { -1, -1 }, /* Profile 18. */
             { -1, -1 }, /* Profile 19. */
-            { 288, 303 }, /* Profile 20. */
+            { 144, 159 }, /* Profile 20. */
             { -1, -1 }, /* Profile 21. */
             { -1, -1 }, /* Profile 22. */
-            { -1, -1 }, /* Profile 23. */
+            { 144, 159 }, /* Profile 23. */
             { -1, -1 }, /* Profile 24. */
-            { 288, 303 }, /* Profile 25. */
+            { 144, 159 }, /* Profile 25. */
             { -1, -1 }, /* Profile 26. */
             { -1, -1 }, /* Profile 27. */
-            { -1, -1 }, /* Profile 28. */
-            { 288, 303 }, /* Profile 29. */
+            { 144, 159 }, /* Profile 28. */
+            { -1, -1 }, /* Profile 29. */
             { -1, -1 }, /* Profile 30. */
-            { -1, -1 }, /* Profile 31. */
+            { 144, 159 }, /* Profile 31. */
             { -1, -1 }, /* Profile 32. */
-            { -1, -1 }, /* Profile 33. */
-            { 304, 319 }, /* Profile 34. */
-            { -1, -1 }, /* Profile 35. */
-            { -1, -1 }, /* Profile 36. */
-            { -1, -1 }, /* Profile 37. */
-            { -1, -1 }, /* Profile 38. */
-            { 304, 319 }, /* Profile 39. */
-            { -1, -1 }, /* Profile 40. */
-            { -1, -1 }, /* Profile 41. */
-            { -1, -1 }, /* Profile 42. */
-            { 304, 319 }, /* Profile 43. */
-            { -1, -1 }, /* Profile 44. */
-            { -1, -1 }, /* Profile 45. */
-            { -1, -1 }, /* Profile 46. */
-            { -1, -1 }, /* Profile 47. */
-            { 304, 319 }, /* Profile 48. */
-            { -1, -1 }, /* Profile 49. */
-            { -1, -1 }, /* Profile 50. */
-            { -1, -1 }, /* Profile 51. */
-            { -1, -1 }, /* Profile 52. */
-            { 304, 319 }, /* Profile 53. */
-            { -1, -1 }, /* Profile 54. */
-            { -1, -1 }, /* Profile 55. */
-            { -1, -1 }, /* Profile 56. */
-            { 304, 319 }, /* Profile 57. */
+            { 144, 159 }, /* Profile 33. */
         },
-        .profile_cnt = 58,
+        .profile_cnt = 34,
     },
     {
         .name = "ING_TIMESTAMP_31_16",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_16,
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_16,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { -1, -1 }, /* Profile 2. */
             { -1, -1 }, /* Profile 3. */
-            { -1, -1 }, /* Profile 4. */
+            { 144, 159 }, /* Profile 4. */
             { -1, -1 }, /* Profile 5. */
-            { 304, 319 }, /* Profile 6. */
-            { -1, -1 }, /* Profile 7. */
+            { -1, -1 }, /* Profile 6. */
+            { 144, 159 }, /* Profile 7. */
             { -1, -1 }, /* Profile 8. */
-            { -1, -1 }, /* Profile 9. */
+            { 144, 159 }, /* Profile 9. */
             { -1, -1 }, /* Profile 10. */
-            { 304, 319 }, /* Profile 11. */
-            { -1, -1 }, /* Profile 12. */
+            { -1, -1 }, /* Profile 11. */
+            { 144, 159 }, /* Profile 12. */
             { -1, -1 }, /* Profile 13. */
             { -1, -1 }, /* Profile 14. */
-            { 304, 319 }, /* Profile 15. */
+            { 144, 159 }, /* Profile 15. */
             { -1, -1 }, /* Profile 16. */
-            { -1, -1 }, /* Profile 17. */
+            { 144, 159 }, /* Profile 17. */
             { -1, -1 }, /* Profile 18. */
             { -1, -1 }, /* Profile 19. */
-            { 304, 319 }, /* Profile 20. */
+            { 160, 175 }, /* Profile 20. */
             { -1, -1 }, /* Profile 21. */
             { -1, -1 }, /* Profile 22. */
-            { -1, -1 }, /* Profile 23. */
+            { 160, 175 }, /* Profile 23. */
             { -1, -1 }, /* Profile 24. */
-            { 304, 319 }, /* Profile 25. */
+            { 160, 175 }, /* Profile 25. */
             { -1, -1 }, /* Profile 26. */
             { -1, -1 }, /* Profile 27. */
-            { -1, -1 }, /* Profile 28. */
-            { 304, 319 }, /* Profile 29. */
+            { 160, 175 }, /* Profile 28. */
+            { -1, -1 }, /* Profile 29. */
             { -1, -1 }, /* Profile 30. */
-            { -1, -1 }, /* Profile 31. */
+            { 160, 175 }, /* Profile 31. */
             { -1, -1 }, /* Profile 32. */
-            { -1, -1 }, /* Profile 33. */
-            { 320, 335 }, /* Profile 34. */
-            { -1, -1 }, /* Profile 35. */
-            { -1, -1 }, /* Profile 36. */
-            { -1, -1 }, /* Profile 37. */
-            { -1, -1 }, /* Profile 38. */
-            { 320, 335 }, /* Profile 39. */
-            { -1, -1 }, /* Profile 40. */
-            { -1, -1 }, /* Profile 41. */
-            { -1, -1 }, /* Profile 42. */
-            { 320, 335 }, /* Profile 43. */
-            { -1, -1 }, /* Profile 44. */
-            { -1, -1 }, /* Profile 45. */
-            { -1, -1 }, /* Profile 46. */
-            { -1, -1 }, /* Profile 47. */
-            { 320, 335 }, /* Profile 48. */
-            { -1, -1 }, /* Profile 49. */
-            { -1, -1 }, /* Profile 50. */
-            { -1, -1 }, /* Profile 51. */
-            { -1, -1 }, /* Profile 52. */
-            { 320, 335 }, /* Profile 53. */
-            { -1, -1 }, /* Profile 54. */
-            { -1, -1 }, /* Profile 55. */
-            { -1, -1 }, /* Profile 56. */
-            { 320, 335 }, /* Profile 57. */
+            { 160, 175 }, /* Profile 33. */
         },
-        .profile_cnt = 58,
+        .profile_cnt = 34,
     },
     {
-        .name = "INGRESS_PP_PORT_7_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_INGRESS_PP_PORT_7_0,
+        .name = "INGRESS_DEVICE_PORT_6_0",
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_INGRESS_DEVICE_PORT_6_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 272, 279 }, /* Profile 2. */
-            { 256, 263 }, /* Profile 3. */
-            { 272, 279 }, /* Profile 4. */
-            { 256, 263 }, /* Profile 5. */
-            { 256, 263 }, /* Profile 6. */
-            { 272, 279 }, /* Profile 7. */
-            { 256, 263 }, /* Profile 8. */
-            { 272, 279 }, /* Profile 9. */
-            { 256, 263 }, /* Profile 10. */
-            { 256, 263 }, /* Profile 11. */
-            { 272, 279 }, /* Profile 12. */
-            { 256, 263 }, /* Profile 13. */
-            { 272, 279 }, /* Profile 14. */
-            { 256, 263 }, /* Profile 15. */
-            { 272, 279 }, /* Profile 16. */
-            { 256, 263 }, /* Profile 17. */
-            { 272, 279 }, /* Profile 18. */
-            { 256, 263 }, /* Profile 19. */
-            { 256, 263 }, /* Profile 20. */
-            { 272, 279 }, /* Profile 21. */
-            { 256, 263 }, /* Profile 22. */
-            { 272, 279 }, /* Profile 23. */
-            { 256, 263 }, /* Profile 24. */
-            { 256, 263 }, /* Profile 25. */
-            { 272, 279 }, /* Profile 26. */
-            { 256, 263 }, /* Profile 27. */
-            { 272, 279 }, /* Profile 28. */
-            { 256, 263 }, /* Profile 29. */
-            { 288, 295 }, /* Profile 30. */
-            { 272, 279 }, /* Profile 31. */
-            { 288, 295 }, /* Profile 32. */
-            { 272, 279 }, /* Profile 33. */
-            { 272, 279 }, /* Profile 34. */
-            { 288, 295 }, /* Profile 35. */
-            { 272, 279 }, /* Profile 36. */
-            { 288, 295 }, /* Profile 37. */
-            { 272, 279 }, /* Profile 38. */
-            { 272, 279 }, /* Profile 39. */
-            { 288, 295 }, /* Profile 40. */
-            { 272, 279 }, /* Profile 41. */
-            { 288, 295 }, /* Profile 42. */
-            { 272, 279 }, /* Profile 43. */
-            { 288, 295 }, /* Profile 44. */
-            { 272, 279 }, /* Profile 45. */
-            { 288, 295 }, /* Profile 46. */
-            { 272, 279 }, /* Profile 47. */
-            { 272, 279 }, /* Profile 48. */
-            { 288, 295 }, /* Profile 49. */
-            { 272, 279 }, /* Profile 50. */
-            { 288, 295 }, /* Profile 51. */
-            { 272, 279 }, /* Profile 52. */
-            { 272, 279 }, /* Profile 53. */
-            { 288, 295 }, /* Profile 54. */
-            { 272, 279 }, /* Profile 55. */
-            { 288, 295 }, /* Profile 56. */
-            { 272, 279 }, /* Profile 57. */
+            { 304, 310 }, /* Profile 2. */
+            { 304, 310 }, /* Profile 3. */
+            { 304, 310 }, /* Profile 4. */
+            { 304, 310 }, /* Profile 5. */
+            { 304, 310 }, /* Profile 6. */
+            { 304, 310 }, /* Profile 7. */
+            { 304, 310 }, /* Profile 8. */
+            { 304, 310 }, /* Profile 9. */
+            { 304, 310 }, /* Profile 10. */
+            { 304, 310 }, /* Profile 11. */
+            { 304, 310 }, /* Profile 12. */
+            { 304, 310 }, /* Profile 13. */
+            { 304, 310 }, /* Profile 14. */
+            { 304, 310 }, /* Profile 15. */
+            { 304, 310 }, /* Profile 16. */
+            { 304, 310 }, /* Profile 17. */
+            { 304, 310 }, /* Profile 18. */
+            { 304, 310 }, /* Profile 19. */
+            { 304, 310 }, /* Profile 20. */
+            { 304, 310 }, /* Profile 21. */
+            { 304, 310 }, /* Profile 22. */
+            { 304, 310 }, /* Profile 23. */
+            { 304, 310 }, /* Profile 24. */
+            { 304, 310 }, /* Profile 25. */
+            { 304, 310 }, /* Profile 26. */
+            { 304, 310 }, /* Profile 27. */
+            { 304, 310 }, /* Profile 28. */
+            { 304, 310 }, /* Profile 29. */
+            { 304, 310 }, /* Profile 30. */
+            { 304, 310 }, /* Profile 31. */
+            { 304, 310 }, /* Profile 32. */
+            { 304, 310 }, /* Profile 33. */
         },
-        .profile_cnt = 58,
+        .profile_cnt = 34,
     },
     {
         .name = "INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0,
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 224, 239 }, /* Profile 2. */
-            { 208, 223 }, /* Profile 3. */
-            { 224, 239 }, /* Profile 4. */
-            { 208, 223 }, /* Profile 5. */
-            { 208, 223 }, /* Profile 6. */
-            { 224, 239 }, /* Profile 7. */
-            { 208, 223 }, /* Profile 8. */
-            { 224, 239 }, /* Profile 9. */
-            { 208, 223 }, /* Profile 10. */
-            { 208, 223 }, /* Profile 11. */
-            { 224, 239 }, /* Profile 12. */
-            { 208, 223 }, /* Profile 13. */
-            { 224, 239 }, /* Profile 14. */
-            { 208, 223 }, /* Profile 15. */
+            { 256, 271 }, /* Profile 3. */
+            { 256, 271 }, /* Profile 4. */
+            { 224, 239 }, /* Profile 5. */
+            { 256, 271 }, /* Profile 6. */
+            { 256, 271 }, /* Profile 7. */
+            { 224, 239 }, /* Profile 8. */
+            { 256, 271 }, /* Profile 9. */
+            { 224, 239 }, /* Profile 10. */
+            { 256, 271 }, /* Profile 11. */
+            { 256, 271 }, /* Profile 12. */
+            { 224, 239 }, /* Profile 13. */
+            { 256, 271 }, /* Profile 14. */
+            { 256, 271 }, /* Profile 15. */
             { 224, 239 }, /* Profile 16. */
-            { 208, 223 }, /* Profile 17. */
+            { 256, 271 }, /* Profile 17. */
             { 224, 239 }, /* Profile 18. */
-            { 208, 223 }, /* Profile 19. */
-            { 208, 223 }, /* Profile 20. */
+            { 256, 271 }, /* Profile 19. */
+            { 256, 271 }, /* Profile 20. */
             { 224, 239 }, /* Profile 21. */
-            { 208, 223 }, /* Profile 22. */
-            { 224, 239 }, /* Profile 23. */
-            { 208, 223 }, /* Profile 24. */
-            { 208, 223 }, /* Profile 25. */
+            { 256, 271 }, /* Profile 22. */
+            { 256, 271 }, /* Profile 23. */
+            { 224, 239 }, /* Profile 24. */
+            { 256, 271 }, /* Profile 25. */
             { 224, 239 }, /* Profile 26. */
-            { 208, 223 }, /* Profile 27. */
-            { 224, 239 }, /* Profile 28. */
-            { 208, 223 }, /* Profile 29. */
-            { 240, 255 }, /* Profile 30. */
-            { 224, 239 }, /* Profile 31. */
-            { 240, 255 }, /* Profile 32. */
-            { 224, 239 }, /* Profile 33. */
-            { 224, 239 }, /* Profile 34. */
-            { 240, 255 }, /* Profile 35. */
-            { 224, 239 }, /* Profile 36. */
-            { 240, 255 }, /* Profile 37. */
-            { 224, 239 }, /* Profile 38. */
-            { 224, 239 }, /* Profile 39. */
-            { 240, 255 }, /* Profile 40. */
-            { 224, 239 }, /* Profile 41. */
-            { 240, 255 }, /* Profile 42. */
-            { 224, 239 }, /* Profile 43. */
-            { 240, 255 }, /* Profile 44. */
-            { 224, 239 }, /* Profile 45. */
-            { 240, 255 }, /* Profile 46. */
-            { 224, 239 }, /* Profile 47. */
-            { 224, 239 }, /* Profile 48. */
-            { 240, 255 }, /* Profile 49. */
-            { 224, 239 }, /* Profile 50. */
-            { 240, 255 }, /* Profile 51. */
-            { 224, 239 }, /* Profile 52. */
-            { 224, 239 }, /* Profile 53. */
-            { 240, 255 }, /* Profile 54. */
-            { 224, 239 }, /* Profile 55. */
-            { 240, 255 }, /* Profile 56. */
-            { 224, 239 }, /* Profile 57. */
+            { 256, 271 }, /* Profile 27. */
+            { 256, 271 }, /* Profile 28. */
+            { 224, 239 }, /* Profile 29. */
+            { 256, 271 }, /* Profile 30. */
+            { 256, 271 }, /* Profile 31. */
+            { 224, 239 }, /* Profile 32. */
+            { 256, 271 }, /* Profile 33. */
         },
-        .profile_cnt = 58,
+        .profile_cnt = 34,
     },
     {
         .name = "INGRESS_QOS_REMARK_CTRL_3_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0,
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 404, 407 }, /* Profile 2. */
-            { 396, 399 }, /* Profile 3. */
+            { 408, 411 }, /* Profile 2. */
+            { 404, 407 }, /* Profile 3. */
             { 404, 407 }, /* Profile 4. */
-            { 400, 403 }, /* Profile 5. */
-            { 400, 403 }, /* Profile 6. */
+            { 408, 411 }, /* Profile 5. */
+            { 404, 407 }, /* Profile 6. */
             { 404, 407 }, /* Profile 7. */
-            { 396, 399 }, /* Profile 8. */
-            { 404, 407 }, /* Profile 9. */
-            { 400, 403 }, /* Profile 10. */
-            { 400, 403 }, /* Profile 11. */
-            { 400, 403 }, /* Profile 12. */
-            { 392, 395 }, /* Profile 13. */
-            { 400, 403 }, /* Profile 14. */
-            { 396, 399 }, /* Profile 15. */
+            { 404, 407 }, /* Profile 8. */
+            { 400, 403 }, /* Profile 9. */
+            { 408, 411 }, /* Profile 10. */
+            { 404, 407 }, /* Profile 11. */
+            { 404, 407 }, /* Profile 12. */
+            { 408, 411 }, /* Profile 13. */
+            { 404, 407 }, /* Profile 14. */
+            { 404, 407 }, /* Profile 15. */
             { 404, 407 }, /* Profile 16. */
-            { 396, 399 }, /* Profile 17. */
-            { 404, 407 }, /* Profile 18. */
-            { 400, 403 }, /* Profile 19. */
-            { 400, 403 }, /* Profile 20. */
-            { 404, 407 }, /* Profile 21. */
-            { 396, 399 }, /* Profile 22. */
-            { 404, 407 }, /* Profile 23. */
-            { 400, 403 }, /* Profile 24. */
-            { 400, 403 }, /* Profile 25. */
-            { 400, 403 }, /* Profile 26. */
-            { 392, 395 }, /* Profile 27. */
-            { 400, 403 }, /* Profile 28. */
-            { 396, 399 }, /* Profile 29. */
+            { 400, 403 }, /* Profile 17. */
+            { 408, 411 }, /* Profile 18. */
+            { 404, 407 }, /* Profile 19. */
+            { 404, 407 }, /* Profile 20. */
+            { 408, 411 }, /* Profile 21. */
+            { 404, 407 }, /* Profile 22. */
+            { 404, 407 }, /* Profile 23. */
+            { 404, 407 }, /* Profile 24. */
+            { 400, 403 }, /* Profile 25. */
+            { 408, 411 }, /* Profile 26. */
+            { 404, 407 }, /* Profile 27. */
+            { 404, 407 }, /* Profile 28. */
+            { 408, 411 }, /* Profile 29. */
             { 404, 407 }, /* Profile 30. */
-            { 396, 399 }, /* Profile 31. */
+            { 404, 407 }, /* Profile 31. */
             { 404, 407 }, /* Profile 32. */
             { 400, 403 }, /* Profile 33. */
-            { 400, 403 }, /* Profile 34. */
-            { 404, 407 }, /* Profile 35. */
-            { 396, 399 }, /* Profile 36. */
-            { 404, 407 }, /* Profile 37. */
-            { 400, 403 }, /* Profile 38. */
-            { 400, 403 }, /* Profile 39. */
-            { 400, 403 }, /* Profile 40. */
-            { 392, 395 }, /* Profile 41. */
-            { 400, 403 }, /* Profile 42. */
-            { 396, 399 }, /* Profile 43. */
-            { 404, 407 }, /* Profile 44. */
-            { 396, 399 }, /* Profile 45. */
-            { 404, 407 }, /* Profile 46. */
-            { 400, 403 }, /* Profile 47. */
-            { 400, 403 }, /* Profile 48. */
-            { 404, 407 }, /* Profile 49. */
-            { 396, 399 }, /* Profile 50. */
-            { 404, 407 }, /* Profile 51. */
-            { 400, 403 }, /* Profile 52. */
-            { 400, 403 }, /* Profile 53. */
-            { 400, 403 }, /* Profile 54. */
-            { 392, 395 }, /* Profile 55. */
-            { 400, 403 }, /* Profile 56. */
-            { 396, 399 }, /* Profile 57. */
         },
-        .profile_cnt = 58,
+        .profile_cnt = 34,
     },
     {
         .name = "INT_PRI_3_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_INT_PRI_3_0,
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_INT_PRI_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 420, 423 }, /* Profile 2. */
-            { 412, 415 }, /* Profile 3. */
-            { 420, 423 }, /* Profile 4. */
-            { 420, 423 }, /* Profile 5. */
-            { 420, 423 }, /* Profile 6. */
-            { 420, 423 }, /* Profile 7. */
-            { 412, 415 }, /* Profile 8. */
-            { 420, 423 }, /* Profile 9. */
-            { 420, 423 }, /* Profile 10. */
-            { 420, 423 }, /* Profile 11. */
-            { 416, 419 }, /* Profile 12. */
-            { 408, 411 }, /* Profile 13. */
-            { 416, 419 }, /* Profile 14. */
-            { 416, 419 }, /* Profile 15. */
-            { 420, 423 }, /* Profile 16. */
-            { 412, 415 }, /* Profile 17. */
-            { 420, 423 }, /* Profile 18. */
-            { 420, 423 }, /* Profile 19. */
-            { 420, 423 }, /* Profile 20. */
-            { 420, 423 }, /* Profile 21. */
-            { 412, 415 }, /* Profile 22. */
-            { 420, 423 }, /* Profile 23. */
-            { 420, 423 }, /* Profile 24. */
-            { 420, 423 }, /* Profile 25. */
-            { 416, 419 }, /* Profile 26. */
-            { 408, 411 }, /* Profile 27. */
-            { 416, 419 }, /* Profile 28. */
-            { 416, 419 }, /* Profile 29. */
-            { 420, 423 }, /* Profile 30. */
-            { 412, 415 }, /* Profile 31. */
-            { 420, 423 }, /* Profile 32. */
-            { 420, 423 }, /* Profile 33. */
-            { 420, 423 }, /* Profile 34. */
-            { 420, 423 }, /* Profile 35. */
-            { 412, 415 }, /* Profile 36. */
-            { 420, 423 }, /* Profile 37. */
-            { 420, 423 }, /* Profile 38. */
-            { 420, 423 }, /* Profile 39. */
-            { 416, 419 }, /* Profile 40. */
-            { 408, 411 }, /* Profile 41. */
-            { 416, 419 }, /* Profile 42. */
-            { 416, 419 }, /* Profile 43. */
-            { 420, 423 }, /* Profile 44. */
-            { 412, 415 }, /* Profile 45. */
-            { 420, 423 }, /* Profile 46. */
-            { 420, 423 }, /* Profile 47. */
-            { 420, 423 }, /* Profile 48. */
-            { 420, 423 }, /* Profile 49. */
-            { 412, 415 }, /* Profile 50. */
-            { 420, 423 }, /* Profile 51. */
-            { 420, 423 }, /* Profile 52. */
-            { 420, 423 }, /* Profile 53. */
-            { 416, 419 }, /* Profile 54. */
-            { 408, 411 }, /* Profile 55. */
-            { 416, 419 }, /* Profile 56. */
-            { 416, 419 }, /* Profile 57. */
+            { 392, 395 }, /* Profile 2. */
+            { 388, 391 }, /* Profile 3. */
+            { 388, 391 }, /* Profile 4. */
+            { 392, 395 }, /* Profile 5. */
+            { 388, 391 }, /* Profile 6. */
+            { 388, 391 }, /* Profile 7. */
+            { 388, 391 }, /* Profile 8. */
+            { 384, 387 }, /* Profile 9. */
+            { 392, 395 }, /* Profile 10. */
+            { 388, 391 }, /* Profile 11. */
+            { 388, 391 }, /* Profile 12. */
+            { 392, 395 }, /* Profile 13. */
+            { 388, 391 }, /* Profile 14. */
+            { 388, 391 }, /* Profile 15. */
+            { 388, 391 }, /* Profile 16. */
+            { 384, 387 }, /* Profile 17. */
+            { 392, 395 }, /* Profile 18. */
+            { 388, 391 }, /* Profile 19. */
+            { 388, 391 }, /* Profile 20. */
+            { 392, 395 }, /* Profile 21. */
+            { 388, 391 }, /* Profile 22. */
+            { 388, 391 }, /* Profile 23. */
+            { 388, 391 }, /* Profile 24. */
+            { 384, 387 }, /* Profile 25. */
+            { 392, 395 }, /* Profile 26. */
+            { 388, 391 }, /* Profile 27. */
+            { 388, 391 }, /* Profile 28. */
+            { 392, 395 }, /* Profile 29. */
+            { 388, 391 }, /* Profile 30. */
+            { 388, 391 }, /* Profile 31. */
+            { 388, 391 }, /* Profile 32. */
+            { 384, 387 }, /* Profile 33. */
         },
-        .profile_cnt = 58,
+        .profile_cnt = 34,
     },
     {
         .name = "L2_IIF_11_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_L2_IIF_11_0,
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_L2_IIF_11_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 336, 347 }, /* Profile 2. */
-            { 304, 315 }, /* Profile 3. */
-            { 336, 347 }, /* Profile 4. */
-            { 336, 347 }, /* Profile 5. */
-            { 336, 347 }, /* Profile 6. */
-            { 336, 347 }, /* Profile 7. */
-            { 304, 315 }, /* Profile 8. */
-            { 336, 347 }, /* Profile 9. */
-            { 336, 347 }, /* Profile 10. */
-            { 336, 347 }, /* Profile 11. */
-            { 336, 347 }, /* Profile 12. */
-            { 304, 315 }, /* Profile 13. */
-            { 336, 347 }, /* Profile 14. */
-            { 336, 347 }, /* Profile 15. */
-            { 336, 347 }, /* Profile 16. */
-            { 304, 315 }, /* Profile 17. */
-            { 336, 347 }, /* Profile 18. */
-            { 336, 347 }, /* Profile 19. */
-            { 336, 347 }, /* Profile 20. */
-            { 336, 347 }, /* Profile 21. */
-            { 304, 315 }, /* Profile 22. */
-            { 336, 347 }, /* Profile 23. */
-            { 336, 347 }, /* Profile 24. */
-            { 336, 347 }, /* Profile 25. */
-            { 336, 347 }, /* Profile 26. */
-            { 304, 315 }, /* Profile 27. */
-            { 336, 347 }, /* Profile 28. */
-            { 336, 347 }, /* Profile 29. */
+            { 208, 219 }, /* Profile 2. */
+            { 240, 251 }, /* Profile 3. */
+            { 240, 251 }, /* Profile 4. */
+            { 208, 219 }, /* Profile 5. */
+            { 240, 251 }, /* Profile 6. */
+            { 240, 251 }, /* Profile 7. */
+            { 208, 219 }, /* Profile 8. */
+            { 240, 251 }, /* Profile 9. */
+            { 208, 219 }, /* Profile 10. */
+            { 240, 251 }, /* Profile 11. */
+            { 240, 251 }, /* Profile 12. */
+            { 208, 219 }, /* Profile 13. */
+            { 240, 251 }, /* Profile 14. */
+            { 240, 251 }, /* Profile 15. */
+            { 208, 219 }, /* Profile 16. */
+            { 240, 251 }, /* Profile 17. */
         },
-        .profile_cnt = 30,
+        .profile_cnt = 18,
     },
     {
         .name = "L2_OIF_11_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_L2_OIF_11_0,
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_L2_OIF_11_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1994,567 +1355,313 @@ static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_flex_field_
             { -1, -1 }, /* Profile 15. */
             { -1, -1 }, /* Profile 16. */
             { -1, -1 }, /* Profile 17. */
-            { -1, -1 }, /* Profile 18. */
-            { -1, -1 }, /* Profile 19. */
-            { -1, -1 }, /* Profile 20. */
-            { -1, -1 }, /* Profile 21. */
-            { -1, -1 }, /* Profile 22. */
-            { -1, -1 }, /* Profile 23. */
-            { -1, -1 }, /* Profile 24. */
-            { -1, -1 }, /* Profile 25. */
-            { -1, -1 }, /* Profile 26. */
-            { -1, -1 }, /* Profile 27. */
-            { -1, -1 }, /* Profile 28. */
-            { -1, -1 }, /* Profile 29. */
-            { 160, 171 }, /* Profile 30. */
-            { 160, 171 }, /* Profile 31. */
-            { 160, 171 }, /* Profile 32. */
-            { 160, 171 }, /* Profile 33. */
-            { 160, 171 }, /* Profile 34. */
-            { 160, 171 }, /* Profile 35. */
-            { 160, 171 }, /* Profile 36. */
-            { 160, 171 }, /* Profile 37. */
-            { 160, 171 }, /* Profile 38. */
-            { 160, 171 }, /* Profile 39. */
-            { 160, 171 }, /* Profile 40. */
-            { 160, 171 }, /* Profile 41. */
-            { 160, 171 }, /* Profile 42. */
-            { 160, 171 }, /* Profile 43. */
-            { 160, 171 }, /* Profile 44. */
-            { 160, 171 }, /* Profile 45. */
-            { 160, 171 }, /* Profile 46. */
-            { 160, 171 }, /* Profile 47. */
-            { 160, 171 }, /* Profile 48. */
-            { 160, 171 }, /* Profile 49. */
-            { 160, 171 }, /* Profile 50. */
-            { 160, 171 }, /* Profile 51. */
-            { 160, 171 }, /* Profile 52. */
-            { 160, 171 }, /* Profile 53. */
-            { 160, 171 }, /* Profile 54. */
-            { 160, 171 }, /* Profile 55. */
-            { 160, 171 }, /* Profile 56. */
-            { 160, 171 }, /* Profile 57. */
+            { 128, 139 }, /* Profile 18. */
+            { 128, 139 }, /* Profile 19. */
+            { 128, 139 }, /* Profile 20. */
+            { 128, 139 }, /* Profile 21. */
+            { 128, 139 }, /* Profile 22. */
+            { 128, 139 }, /* Profile 23. */
+            { 128, 139 }, /* Profile 24. */
+            { 128, 139 }, /* Profile 25. */
+            { 128, 139 }, /* Profile 26. */
+            { 128, 139 }, /* Profile 27. */
+            { 128, 139 }, /* Profile 28. */
+            { 128, 139 }, /* Profile 29. */
+            { 128, 139 }, /* Profile 30. */
+            { 128, 139 }, /* Profile 31. */
+            { 128, 139 }, /* Profile 32. */
+            { 128, 139 }, /* Profile 33. */
         },
-        .profile_cnt = 58,
+        .profile_cnt = 34,
     },
     {
         .name = "L3_DNAT_INDEX_15_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_L3_DNAT_INDEX_15_0,
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_L3_DNAT_INDEX_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 192, 207 }, /* Profile 2. */
+            { 256, 271 }, /* Profile 2. */
             { -1, -1 }, /* Profile 3. */
-            { 192, 207 }, /* Profile 4. */
-            { -1, -1 }, /* Profile 5. */
+            { -1, -1 }, /* Profile 4. */
+            { 256, 271 }, /* Profile 5. */
             { -1, -1 }, /* Profile 6. */
-            { 192, 207 }, /* Profile 7. */
-            { -1, -1 }, /* Profile 8. */
-            { 192, 207 }, /* Profile 9. */
-            { -1, -1 }, /* Profile 10. */
+            { -1, -1 }, /* Profile 7. */
+            { 256, 271 }, /* Profile 8. */
+            { -1, -1 }, /* Profile 9. */
+            { 256, 271 }, /* Profile 10. */
             { -1, -1 }, /* Profile 11. */
-            { 192, 207 }, /* Profile 12. */
-            { -1, -1 }, /* Profile 13. */
-            { 192, 207 }, /* Profile 14. */
+            { -1, -1 }, /* Profile 12. */
+            { 256, 271 }, /* Profile 13. */
+            { -1, -1 }, /* Profile 14. */
             { -1, -1 }, /* Profile 15. */
-            { 192, 207 }, /* Profile 16. */
+            { 256, 271 }, /* Profile 16. */
             { -1, -1 }, /* Profile 17. */
-            { 192, 207 }, /* Profile 18. */
+            { 256, 271 }, /* Profile 18. */
             { -1, -1 }, /* Profile 19. */
             { -1, -1 }, /* Profile 20. */
-            { 192, 207 }, /* Profile 21. */
+            { 256, 271 }, /* Profile 21. */
             { -1, -1 }, /* Profile 22. */
-            { 192, 207 }, /* Profile 23. */
-            { -1, -1 }, /* Profile 24. */
+            { -1, -1 }, /* Profile 23. */
+            { 256, 271 }, /* Profile 24. */
             { -1, -1 }, /* Profile 25. */
-            { 192, 207 }, /* Profile 26. */
+            { 256, 271 }, /* Profile 26. */
             { -1, -1 }, /* Profile 27. */
-            { 192, 207 }, /* Profile 28. */
-            { -1, -1 }, /* Profile 29. */
-            { 208, 223 }, /* Profile 30. */
+            { -1, -1 }, /* Profile 28. */
+            { 256, 271 }, /* Profile 29. */
+            { -1, -1 }, /* Profile 30. */
             { -1, -1 }, /* Profile 31. */
-            { 208, 223 }, /* Profile 32. */
-            { -1, -1 }, /* Profile 33. */
-            { -1, -1 }, /* Profile 34. */
-            { 208, 223 }, /* Profile 35. */
-            { -1, -1 }, /* Profile 36. */
-            { 208, 223 }, /* Profile 37. */
-            { -1, -1 }, /* Profile 38. */
-            { -1, -1 }, /* Profile 39. */
-            { 208, 223 }, /* Profile 40. */
-            { -1, -1 }, /* Profile 41. */
-            { 208, 223 }, /* Profile 42. */
-            { -1, -1 }, /* Profile 43. */
-            { 208, 223 }, /* Profile 44. */
-            { -1, -1 }, /* Profile 45. */
-            { 208, 223 }, /* Profile 46. */
-            { -1, -1 }, /* Profile 47. */
-            { -1, -1 }, /* Profile 48. */
-            { 208, 223 }, /* Profile 49. */
-            { -1, -1 }, /* Profile 50. */
-            { 208, 223 }, /* Profile 51. */
-            { -1, -1 }, /* Profile 52. */
-            { -1, -1 }, /* Profile 53. */
-            { 208, 223 }, /* Profile 54. */
-            { -1, -1 }, /* Profile 55. */
-            { 208, 223 }, /* Profile 56. */
+            { 256, 271 }, /* Profile 32. */
         },
-        .profile_cnt = 57,
+        .profile_cnt = 33,
     },
     {
         .name = "L3_IIF_13_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_L3_IIF_13_0,
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_L3_IIF_13_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 352, 365 }, /* Profile 2. */
-            { 320, 333 }, /* Profile 3. */
-            { 352, 365 }, /* Profile 4. */
-            { 352, 365 }, /* Profile 5. */
-            { 352, 365 }, /* Profile 6. */
-            { 352, 365 }, /* Profile 7. */
-            { 320, 333 }, /* Profile 8. */
-            { 352, 365 }, /* Profile 9. */
-            { 352, 365 }, /* Profile 10. */
-            { 352, 365 }, /* Profile 11. */
-            { 352, 365 }, /* Profile 12. */
-            { 320, 333 }, /* Profile 13. */
-            { 352, 365 }, /* Profile 14. */
-            { 352, 365 }, /* Profile 15. */
-            { 352, 365 }, /* Profile 16. */
-            { 320, 333 }, /* Profile 17. */
-            { 352, 365 }, /* Profile 18. */
-            { 352, 365 }, /* Profile 19. */
-            { 352, 365 }, /* Profile 20. */
-            { 352, 365 }, /* Profile 21. */
-            { 320, 333 }, /* Profile 22. */
-            { 352, 365 }, /* Profile 23. */
-            { 352, 365 }, /* Profile 24. */
-            { 352, 365 }, /* Profile 25. */
-            { 352, 365 }, /* Profile 26. */
-            { 320, 333 }, /* Profile 27. */
-            { 352, 365 }, /* Profile 28. */
-            { 352, 365 }, /* Profile 29. */
-            { 352, 365 }, /* Profile 30. */
-            { 320, 333 }, /* Profile 31. */
-            { 352, 365 }, /* Profile 32. */
-            { 352, 365 }, /* Profile 33. */
-            { 352, 365 }, /* Profile 34. */
-            { 352, 365 }, /* Profile 35. */
-            { 320, 333 }, /* Profile 36. */
-            { 352, 365 }, /* Profile 37. */
-            { 352, 365 }, /* Profile 38. */
-            { 352, 365 }, /* Profile 39. */
-            { 352, 365 }, /* Profile 40. */
-            { 320, 333 }, /* Profile 41. */
-            { 352, 365 }, /* Profile 42. */
-            { 352, 365 }, /* Profile 43. */
-            { 352, 365 }, /* Profile 44. */
-            { 320, 333 }, /* Profile 45. */
-            { 352, 365 }, /* Profile 46. */
-            { 352, 365 }, /* Profile 47. */
-            { 352, 365 }, /* Profile 48. */
-            { 352, 365 }, /* Profile 49. */
-            { 320, 333 }, /* Profile 50. */
-            { 352, 365 }, /* Profile 51. */
-            { 352, 365 }, /* Profile 52. */
-            { 352, 365 }, /* Profile 53. */
-            { 352, 365 }, /* Profile 54. */
-            { 320, 333 }, /* Profile 55. */
-            { 352, 365 }, /* Profile 56. */
-            { 352, 365 }, /* Profile 57. */
+            { 288, 301 }, /* Profile 2. */
+            { 288, 301 }, /* Profile 3. */
+            { 288, 301 }, /* Profile 4. */
+            { 288, 301 }, /* Profile 5. */
+            { 288, 301 }, /* Profile 6. */
+            { 288, 301 }, /* Profile 7. */
+            { 288, 301 }, /* Profile 8. */
+            { 288, 301 }, /* Profile 9. */
+            { 288, 301 }, /* Profile 10. */
+            { 288, 301 }, /* Profile 11. */
+            { 288, 301 }, /* Profile 12. */
+            { 288, 301 }, /* Profile 13. */
+            { 288, 301 }, /* Profile 14. */
+            { 288, 301 }, /* Profile 15. */
+            { 288, 301 }, /* Profile 16. */
+            { 288, 301 }, /* Profile 17. */
+            { 288, 301 }, /* Profile 18. */
+            { 288, 301 }, /* Profile 19. */
+            { 288, 301 }, /* Profile 20. */
+            { 288, 301 }, /* Profile 21. */
+            { 288, 301 }, /* Profile 22. */
+            { 288, 301 }, /* Profile 23. */
+            { 288, 301 }, /* Profile 24. */
+            { 288, 301 }, /* Profile 25. */
+            { 288, 301 }, /* Profile 26. */
+            { 288, 301 }, /* Profile 27. */
+            { 288, 301 }, /* Profile 28. */
+            { 288, 301 }, /* Profile 29. */
+            { 288, 301 }, /* Profile 30. */
+            { 288, 301 }, /* Profile 31. */
+            { 288, 301 }, /* Profile 32. */
+            { 288, 301 }, /* Profile 33. */
         },
-        .profile_cnt = 58,
+        .profile_cnt = 34,
     },
     {
         .name = "L3_OIF_1_13_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0,
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 160, 173 }, /* Profile 2. */
-            { 160, 173 }, /* Profile 3. */
-            { 160, 173 }, /* Profile 4. */
+            { 192, 205 }, /* Profile 3. */
+            { 192, 205 }, /* Profile 4. */
             { 160, 173 }, /* Profile 5. */
-            { 160, 173 }, /* Profile 6. */
-            { 160, 173 }, /* Profile 7. */
+            { 192, 205 }, /* Profile 6. */
+            { 192, 205 }, /* Profile 7. */
             { 160, 173 }, /* Profile 8. */
-            { 160, 173 }, /* Profile 9. */
+            { 192, 205 }, /* Profile 9. */
             { 160, 173 }, /* Profile 10. */
-            { 160, 173 }, /* Profile 11. */
-            { 160, 173 }, /* Profile 12. */
+            { 192, 205 }, /* Profile 11. */
+            { 192, 205 }, /* Profile 12. */
             { 160, 173 }, /* Profile 13. */
-            { 160, 173 }, /* Profile 14. */
-            { 160, 173 }, /* Profile 15. */
+            { 192, 205 }, /* Profile 14. */
+            { 192, 205 }, /* Profile 15. */
             { 160, 173 }, /* Profile 16. */
-            { 160, 173 }, /* Profile 17. */
-            { 160, 173 }, /* Profile 18. */
-            { 160, 173 }, /* Profile 19. */
-            { 160, 173 }, /* Profile 20. */
-            { 160, 173 }, /* Profile 21. */
-            { 160, 173 }, /* Profile 22. */
-            { 160, 173 }, /* Profile 23. */
-            { 160, 173 }, /* Profile 24. */
-            { 160, 173 }, /* Profile 25. */
-            { 160, 173 }, /* Profile 26. */
-            { 160, 173 }, /* Profile 27. */
-            { 160, 173 }, /* Profile 28. */
-            { 160, 173 }, /* Profile 29. */
-            { 176, 189 }, /* Profile 30. */
-            { 176, 189 }, /* Profile 31. */
+            { 192, 205 }, /* Profile 17. */
+            { 176, 189 }, /* Profile 18. */
+            { 208, 221 }, /* Profile 19. */
+            { 208, 221 }, /* Profile 20. */
+            { 176, 189 }, /* Profile 21. */
+            { 208, 221 }, /* Profile 22. */
+            { 208, 221 }, /* Profile 23. */
+            { 176, 189 }, /* Profile 24. */
+            { 208, 221 }, /* Profile 25. */
+            { 176, 189 }, /* Profile 26. */
+            { 208, 221 }, /* Profile 27. */
+            { 208, 221 }, /* Profile 28. */
+            { 176, 189 }, /* Profile 29. */
+            { 208, 221 }, /* Profile 30. */
+            { 208, 221 }, /* Profile 31. */
             { 176, 189 }, /* Profile 32. */
-            { 176, 189 }, /* Profile 33. */
-            { 176, 189 }, /* Profile 34. */
-            { 176, 189 }, /* Profile 35. */
-            { 176, 189 }, /* Profile 36. */
-            { 176, 189 }, /* Profile 37. */
-            { 176, 189 }, /* Profile 38. */
-            { 176, 189 }, /* Profile 39. */
-            { 176, 189 }, /* Profile 40. */
-            { 176, 189 }, /* Profile 41. */
-            { 176, 189 }, /* Profile 42. */
-            { 176, 189 }, /* Profile 43. */
-            { 176, 189 }, /* Profile 44. */
-            { 176, 189 }, /* Profile 45. */
-            { 176, 189 }, /* Profile 46. */
-            { 176, 189 }, /* Profile 47. */
-            { 176, 189 }, /* Profile 48. */
-            { 176, 189 }, /* Profile 49. */
-            { 176, 189 }, /* Profile 50. */
-            { 176, 189 }, /* Profile 51. */
-            { 176, 189 }, /* Profile 52. */
-            { 176, 189 }, /* Profile 53. */
-            { 176, 189 }, /* Profile 54. */
-            { 176, 189 }, /* Profile 55. */
-            { 176, 189 }, /* Profile 56. */
-            { 176, 189 }, /* Profile 57. */
+            { 208, 221 }, /* Profile 33. */
         },
-        .profile_cnt = 58,
+        .profile_cnt = 34,
     },
     {
         .name = "L3_SNAT_INDEX_15_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_L3_SNAT_INDEX_15_0,
-        .profile = {
-            { -1, -1 }, /* Profile 0. */
-            { -1, -1 }, /* Profile 1. */
-            { 304, 319 }, /* Profile 2. */
-            { -1, -1 }, /* Profile 3. */
-            { 304, 319 }, /* Profile 4. */
-            { -1, -1 }, /* Profile 5. */
-            { -1, -1 }, /* Profile 6. */
-            { 304, 319 }, /* Profile 7. */
-            { -1, -1 }, /* Profile 8. */
-            { 304, 319 }, /* Profile 9. */
-            { -1, -1 }, /* Profile 10. */
-            { -1, -1 }, /* Profile 11. */
-            { 304, 319 }, /* Profile 12. */
-            { -1, -1 }, /* Profile 13. */
-            { 304, 319 }, /* Profile 14. */
-            { -1, -1 }, /* Profile 15. */
-            { 304, 319 }, /* Profile 16. */
-            { -1, -1 }, /* Profile 17. */
-            { 304, 319 }, /* Profile 18. */
-            { -1, -1 }, /* Profile 19. */
-            { -1, -1 }, /* Profile 20. */
-            { 304, 319 }, /* Profile 21. */
-            { -1, -1 }, /* Profile 22. */
-            { 304, 319 }, /* Profile 23. */
-            { -1, -1 }, /* Profile 24. */
-            { -1, -1 }, /* Profile 25. */
-            { 304, 319 }, /* Profile 26. */
-            { -1, -1 }, /* Profile 27. */
-            { 304, 319 }, /* Profile 28. */
-            { -1, -1 }, /* Profile 29. */
-            { 320, 335 }, /* Profile 30. */
-            { -1, -1 }, /* Profile 31. */
-            { 320, 335 }, /* Profile 32. */
-            { -1, -1 }, /* Profile 33. */
-            { -1, -1 }, /* Profile 34. */
-            { 320, 335 }, /* Profile 35. */
-            { -1, -1 }, /* Profile 36. */
-            { 320, 335 }, /* Profile 37. */
-            { -1, -1 }, /* Profile 38. */
-            { -1, -1 }, /* Profile 39. */
-            { 320, 335 }, /* Profile 40. */
-            { -1, -1 }, /* Profile 41. */
-            { 320, 335 }, /* Profile 42. */
-            { -1, -1 }, /* Profile 43. */
-            { 320, 335 }, /* Profile 44. */
-            { -1, -1 }, /* Profile 45. */
-            { 320, 335 }, /* Profile 46. */
-            { -1, -1 }, /* Profile 47. */
-            { -1, -1 }, /* Profile 48. */
-            { 320, 335 }, /* Profile 49. */
-            { -1, -1 }, /* Profile 50. */
-            { 320, 335 }, /* Profile 51. */
-            { -1, -1 }, /* Profile 52. */
-            { -1, -1 }, /* Profile 53. */
-            { 320, 335 }, /* Profile 54. */
-            { -1, -1 }, /* Profile 55. */
-            { 320, 335 }, /* Profile 56. */
-        },
-        .profile_cnt = 57,
-    },
-    {
-        .name = "MAC_DA_23_20_3_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_MAC_DA_23_20_3_0,
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_L3_SNAT_INDEX_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 392, 395 }, /* Profile 2. */
+            { 240, 255 }, /* Profile 2. */
             { -1, -1 }, /* Profile 3. */
             { -1, -1 }, /* Profile 4. */
-            { -1, -1 }, /* Profile 5. */
+            { 240, 255 }, /* Profile 5. */
             { -1, -1 }, /* Profile 6. */
-            { 392, 395 }, /* Profile 7. */
-            { -1, -1 }, /* Profile 8. */
+            { -1, -1 }, /* Profile 7. */
+            { 240, 255 }, /* Profile 8. */
             { -1, -1 }, /* Profile 9. */
-            { -1, -1 }, /* Profile 10. */
+            { 240, 255 }, /* Profile 10. */
             { -1, -1 }, /* Profile 11. */
-            { 388, 391 }, /* Profile 12. */
-            { -1, -1 }, /* Profile 13. */
+            { -1, -1 }, /* Profile 12. */
+            { 240, 255 }, /* Profile 13. */
             { -1, -1 }, /* Profile 14. */
             { -1, -1 }, /* Profile 15. */
-            { 392, 395 }, /* Profile 16. */
+            { 240, 255 }, /* Profile 16. */
             { -1, -1 }, /* Profile 17. */
-            { -1, -1 }, /* Profile 18. */
+            { 240, 255 }, /* Profile 18. */
             { -1, -1 }, /* Profile 19. */
             { -1, -1 }, /* Profile 20. */
-            { 392, 395 }, /* Profile 21. */
+            { 240, 255 }, /* Profile 21. */
             { -1, -1 }, /* Profile 22. */
             { -1, -1 }, /* Profile 23. */
-            { -1, -1 }, /* Profile 24. */
+            { 240, 255 }, /* Profile 24. */
             { -1, -1 }, /* Profile 25. */
-            { 388, 391 }, /* Profile 26. */
+            { 240, 255 }, /* Profile 26. */
             { -1, -1 }, /* Profile 27. */
             { -1, -1 }, /* Profile 28. */
-            { -1, -1 }, /* Profile 29. */
-            { 392, 395 }, /* Profile 30. */
+            { 240, 255 }, /* Profile 29. */
+            { -1, -1 }, /* Profile 30. */
             { -1, -1 }, /* Profile 31. */
-            { -1, -1 }, /* Profile 32. */
-            { -1, -1 }, /* Profile 33. */
-            { -1, -1 }, /* Profile 34. */
-            { 392, 395 }, /* Profile 35. */
-            { -1, -1 }, /* Profile 36. */
-            { -1, -1 }, /* Profile 37. */
-            { -1, -1 }, /* Profile 38. */
-            { -1, -1 }, /* Profile 39. */
-            { 388, 391 }, /* Profile 40. */
-            { -1, -1 }, /* Profile 41. */
-            { -1, -1 }, /* Profile 42. */
-            { -1, -1 }, /* Profile 43. */
-            { 392, 395 }, /* Profile 44. */
-            { -1, -1 }, /* Profile 45. */
-            { -1, -1 }, /* Profile 46. */
-            { -1, -1 }, /* Profile 47. */
-            { -1, -1 }, /* Profile 48. */
-            { 392, 395 }, /* Profile 49. */
-            { -1, -1 }, /* Profile 50. */
-            { -1, -1 }, /* Profile 51. */
-            { -1, -1 }, /* Profile 52. */
-            { -1, -1 }, /* Profile 53. */
-            { 388, 391 }, /* Profile 54. */
+            { 240, 255 }, /* Profile 32. */
         },
-        .profile_cnt = 55,
+        .profile_cnt = 33,
     },
     {
         .name = "MPLS_LABEL_DECAP_COUNT_3_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_MPLS_LABEL_DECAP_COUNT_3_0,
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_MPLS_LABEL_DECAP_COUNT_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 400, 403 }, /* Profile 2. */
-            { 392, 395 }, /* Profile 3. */
-            { 400, 403 }, /* Profile 4. */
-            { 396, 399 }, /* Profile 5. */
-            { 396, 399 }, /* Profile 6. */
-            { 400, 403 }, /* Profile 7. */
-            { 392, 395 }, /* Profile 8. */
-            { 400, 403 }, /* Profile 9. */
-            { 396, 399 }, /* Profile 10. */
-            { 396, 399 }, /* Profile 11. */
-            { 396, 399 }, /* Profile 12. */
-            { 388, 391 }, /* Profile 13. */
-            { 396, 399 }, /* Profile 14. */
-            { 392, 395 }, /* Profile 15. */
-            { 400, 403 }, /* Profile 16. */
-            { 392, 395 }, /* Profile 17. */
-            { 400, 403 }, /* Profile 18. */
-            { 396, 399 }, /* Profile 19. */
-            { 396, 399 }, /* Profile 20. */
-            { 400, 403 }, /* Profile 21. */
-            { 392, 395 }, /* Profile 22. */
-            { 400, 403 }, /* Profile 23. */
-            { 396, 399 }, /* Profile 24. */
-            { 396, 399 }, /* Profile 25. */
-            { 396, 399 }, /* Profile 26. */
-            { 388, 391 }, /* Profile 27. */
-            { 396, 399 }, /* Profile 28. */
-            { 392, 395 }, /* Profile 29. */
-            { 400, 403 }, /* Profile 30. */
-            { 392, 395 }, /* Profile 31. */
-            { 400, 403 }, /* Profile 32. */
-            { 396, 399 }, /* Profile 33. */
-            { 396, 399 }, /* Profile 34. */
-            { 400, 403 }, /* Profile 35. */
-            { 392, 395 }, /* Profile 36. */
-            { 400, 403 }, /* Profile 37. */
-            { 396, 399 }, /* Profile 38. */
-            { 396, 399 }, /* Profile 39. */
-            { 396, 399 }, /* Profile 40. */
-            { 388, 391 }, /* Profile 41. */
-            { 396, 399 }, /* Profile 42. */
-            { 392, 395 }, /* Profile 43. */
-            { 400, 403 }, /* Profile 44. */
-            { 392, 395 }, /* Profile 45. */
-            { 400, 403 }, /* Profile 46. */
-            { 396, 399 }, /* Profile 47. */
-            { 396, 399 }, /* Profile 48. */
-            { 400, 403 }, /* Profile 49. */
-            { 392, 395 }, /* Profile 50. */
-            { 400, 403 }, /* Profile 51. */
-            { 396, 399 }, /* Profile 52. */
-            { 396, 399 }, /* Profile 53. */
-            { 396, 399 }, /* Profile 54. */
-            { 388, 391 }, /* Profile 55. */
-            { 396, 399 }, /* Profile 56. */
-            { 392, 395 }, /* Profile 57. */
+            { 412, 415 }, /* Profile 2. */
+            { 408, 411 }, /* Profile 3. */
+            { 408, 411 }, /* Profile 4. */
+            { 412, 415 }, /* Profile 5. */
+            { 408, 411 }, /* Profile 6. */
+            { 408, 411 }, /* Profile 7. */
+            { 408, 411 }, /* Profile 8. */
+            { 404, 407 }, /* Profile 9. */
+            { 412, 415 }, /* Profile 10. */
+            { 408, 411 }, /* Profile 11. */
+            { 408, 411 }, /* Profile 12. */
+            { 412, 415 }, /* Profile 13. */
+            { 408, 411 }, /* Profile 14. */
+            { 408, 411 }, /* Profile 15. */
+            { 408, 411 }, /* Profile 16. */
+            { 404, 407 }, /* Profile 17. */
+            { 412, 415 }, /* Profile 18. */
+            { 408, 411 }, /* Profile 19. */
+            { 408, 411 }, /* Profile 20. */
+            { 412, 415 }, /* Profile 21. */
+            { 408, 411 }, /* Profile 22. */
+            { 408, 411 }, /* Profile 23. */
+            { 408, 411 }, /* Profile 24. */
+            { 404, 407 }, /* Profile 25. */
+            { 412, 415 }, /* Profile 26. */
+            { 408, 411 }, /* Profile 27. */
+            { 408, 411 }, /* Profile 28. */
+            { 412, 415 }, /* Profile 29. */
+            { 408, 411 }, /* Profile 30. */
+            { 408, 411 }, /* Profile 31. */
+            { 408, 411 }, /* Profile 32. */
+            { 404, 407 }, /* Profile 33. */
         },
-        .profile_cnt = 58,
+        .profile_cnt = 34,
     },
     {
         .name = "NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0,
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 288, 303 }, /* Profile 2. */
+            { 272, 287 }, /* Profile 2. */
             { 272, 287 }, /* Profile 3. */
-            { 288, 303 }, /* Profile 4. */
+            { 272, 287 }, /* Profile 4. */
             { 272, 287 }, /* Profile 5. */
             { 272, 287 }, /* Profile 6. */
-            { 288, 303 }, /* Profile 7. */
+            { 272, 287 }, /* Profile 7. */
             { 272, 287 }, /* Profile 8. */
-            { 288, 303 }, /* Profile 9. */
+            { 272, 287 }, /* Profile 9. */
             { 272, 287 }, /* Profile 10. */
             { 272, 287 }, /* Profile 11. */
-            { 288, 303 }, /* Profile 12. */
+            { 272, 287 }, /* Profile 12. */
             { 272, 287 }, /* Profile 13. */
-            { 288, 303 }, /* Profile 14. */
+            { 272, 287 }, /* Profile 14. */
             { 272, 287 }, /* Profile 15. */
-            { 288, 303 }, /* Profile 16. */
+            { 272, 287 }, /* Profile 16. */
             { 272, 287 }, /* Profile 17. */
-            { 288, 303 }, /* Profile 18. */
+            { 272, 287 }, /* Profile 18. */
             { 272, 287 }, /* Profile 19. */
             { 272, 287 }, /* Profile 20. */
-            { 288, 303 }, /* Profile 21. */
+            { 272, 287 }, /* Profile 21. */
             { 272, 287 }, /* Profile 22. */
-            { 288, 303 }, /* Profile 23. */
+            { 272, 287 }, /* Profile 23. */
             { 272, 287 }, /* Profile 24. */
             { 272, 287 }, /* Profile 25. */
-            { 288, 303 }, /* Profile 26. */
+            { 272, 287 }, /* Profile 26. */
             { 272, 287 }, /* Profile 27. */
-            { 288, 303 }, /* Profile 28. */
+            { 272, 287 }, /* Profile 28. */
             { 272, 287 }, /* Profile 29. */
-            { 304, 319 }, /* Profile 30. */
-            { 288, 303 }, /* Profile 31. */
-            { 304, 319 }, /* Profile 32. */
-            { 288, 303 }, /* Profile 33. */
-            { 288, 303 }, /* Profile 34. */
-            { 304, 319 }, /* Profile 35. */
-            { 288, 303 }, /* Profile 36. */
-            { 304, 319 }, /* Profile 37. */
-            { 288, 303 }, /* Profile 38. */
-            { 288, 303 }, /* Profile 39. */
-            { 304, 319 }, /* Profile 40. */
-            { 288, 303 }, /* Profile 41. */
-            { 304, 319 }, /* Profile 42. */
-            { 288, 303 }, /* Profile 43. */
-            { 304, 319 }, /* Profile 44. */
-            { 288, 303 }, /* Profile 45. */
-            { 304, 319 }, /* Profile 46. */
-            { 288, 303 }, /* Profile 47. */
-            { 288, 303 }, /* Profile 48. */
-            { 304, 319 }, /* Profile 49. */
-            { 288, 303 }, /* Profile 50. */
-            { 304, 319 }, /* Profile 51. */
-            { 288, 303 }, /* Profile 52. */
-            { 288, 303 }, /* Profile 53. */
-            { 304, 319 }, /* Profile 54. */
-            { 288, 303 }, /* Profile 55. */
-            { 304, 319 }, /* Profile 56. */
-            { 288, 303 }, /* Profile 57. */
+            { 272, 287 }, /* Profile 30. */
+            { 272, 287 }, /* Profile 31. */
+            { 272, 287 }, /* Profile 32. */
+            { 272, 287 }, /* Profile 33. */
         },
-        .profile_cnt = 58,
+        .profile_cnt = 34,
     },
     {
         .name = "NHOP_INDEX_1_15_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_15_0,
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 256, 271 }, /* Profile 2. */
-            { 240, 255 }, /* Profile 3. */
-            { 256, 271 }, /* Profile 4. */
-            { 240, 255 }, /* Profile 5. */
-            { 240, 255 }, /* Profile 6. */
-            { 256, 271 }, /* Profile 7. */
-            { 240, 255 }, /* Profile 8. */
-            { 256, 271 }, /* Profile 9. */
-            { 240, 255 }, /* Profile 10. */
-            { 240, 255 }, /* Profile 11. */
-            { 256, 271 }, /* Profile 12. */
-            { 240, 255 }, /* Profile 13. */
-            { 256, 271 }, /* Profile 14. */
-            { 240, 255 }, /* Profile 15. */
-            { 256, 271 }, /* Profile 16. */
-            { 240, 255 }, /* Profile 17. */
-            { 256, 271 }, /* Profile 18. */
-            { 240, 255 }, /* Profile 19. */
-            { 240, 255 }, /* Profile 20. */
-            { 256, 271 }, /* Profile 21. */
-            { 240, 255 }, /* Profile 22. */
-            { 256, 271 }, /* Profile 23. */
-            { 240, 255 }, /* Profile 24. */
-            { 240, 255 }, /* Profile 25. */
-            { 256, 271 }, /* Profile 26. */
-            { 240, 255 }, /* Profile 27. */
-            { 256, 271 }, /* Profile 28. */
-            { 240, 255 }, /* Profile 29. */
-            { 272, 287 }, /* Profile 30. */
-            { 256, 271 }, /* Profile 31. */
-            { 272, 287 }, /* Profile 32. */
-            { 256, 271 }, /* Profile 33. */
-            { 256, 271 }, /* Profile 34. */
-            { 272, 287 }, /* Profile 35. */
-            { 256, 271 }, /* Profile 36. */
-            { 272, 287 }, /* Profile 37. */
-            { 256, 271 }, /* Profile 38. */
-            { 256, 271 }, /* Profile 39. */
-            { 272, 287 }, /* Profile 40. */
-            { 256, 271 }, /* Profile 41. */
-            { 272, 287 }, /* Profile 42. */
-            { 256, 271 }, /* Profile 43. */
-            { 272, 287 }, /* Profile 44. */
-            { 256, 271 }, /* Profile 45. */
-            { 272, 287 }, /* Profile 46. */
-            { 256, 271 }, /* Profile 47. */
-            { 256, 271 }, /* Profile 48. */
-            { 272, 287 }, /* Profile 49. */
-            { 256, 271 }, /* Profile 50. */
-            { 272, 287 }, /* Profile 51. */
-            { 256, 271 }, /* Profile 52. */
-            { 256, 271 }, /* Profile 53. */
-            { 272, 287 }, /* Profile 54. */
-            { 256, 271 }, /* Profile 55. */
-            { 272, 287 }, /* Profile 56. */
-            { 256, 271 }, /* Profile 57. */
+            { 336, 351 }, /* Profile 2. */
+            { 336, 351 }, /* Profile 3. */
+            { 336, 351 }, /* Profile 4. */
+            { 336, 351 }, /* Profile 5. */
+            { 336, 351 }, /* Profile 6. */
+            { 336, 351 }, /* Profile 7. */
+            { 336, 351 }, /* Profile 8. */
+            { 336, 351 }, /* Profile 9. */
+            { 336, 351 }, /* Profile 10. */
+            { 336, 351 }, /* Profile 11. */
+            { 336, 351 }, /* Profile 12. */
+            { 336, 351 }, /* Profile 13. */
+            { 336, 351 }, /* Profile 14. */
+            { 336, 351 }, /* Profile 15. */
+            { 336, 351 }, /* Profile 16. */
+            { 336, 351 }, /* Profile 17. */
+            { 336, 351 }, /* Profile 18. */
+            { 336, 351 }, /* Profile 19. */
+            { 336, 351 }, /* Profile 20. */
+            { 336, 351 }, /* Profile 21. */
+            { 336, 351 }, /* Profile 22. */
+            { 336, 351 }, /* Profile 23. */
+            { 336, 351 }, /* Profile 24. */
+            { 336, 351 }, /* Profile 25. */
+            { 336, 351 }, /* Profile 26. */
+            { 336, 351 }, /* Profile 27. */
+            { 336, 351 }, /* Profile 28. */
+            { 336, 351 }, /* Profile 29. */
+            { 336, 351 }, /* Profile 30. */
+            { 336, 351 }, /* Profile 31. */
+            { 336, 351 }, /* Profile 32. */
+            { 336, 351 }, /* Profile 33. */
         },
-        .profile_cnt = 58,
+        .profile_cnt = 34,
     },
     {
         .name = "PARSER_VHLEN_0_15_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0,
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -2590,483 +1697,258 @@ static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_flex_field_
             { 64, 79 }, /* Profile 31. */
             { 64, 79 }, /* Profile 32. */
             { 64, 79 }, /* Profile 33. */
-            { 64, 79 }, /* Profile 34. */
-            { 64, 79 }, /* Profile 35. */
-            { 64, 79 }, /* Profile 36. */
-            { 64, 79 }, /* Profile 37. */
-            { 64, 79 }, /* Profile 38. */
-            { 64, 79 }, /* Profile 39. */
-            { 64, 79 }, /* Profile 40. */
-            { 64, 79 }, /* Profile 41. */
-            { 64, 79 }, /* Profile 42. */
-            { 64, 79 }, /* Profile 43. */
-            { 64, 79 }, /* Profile 44. */
-            { 64, 79 }, /* Profile 45. */
-            { 64, 79 }, /* Profile 46. */
-            { 64, 79 }, /* Profile 47. */
-            { 64, 79 }, /* Profile 48. */
-            { 64, 79 }, /* Profile 49. */
-            { 64, 79 }, /* Profile 50. */
-            { 64, 79 }, /* Profile 51. */
-            { 64, 79 }, /* Profile 52. */
-            { 64, 79 }, /* Profile 53. */
-            { 64, 79 }, /* Profile 54. */
-            { 64, 79 }, /* Profile 55. */
-            { 64, 79 }, /* Profile 56. */
-            { 64, 79 }, /* Profile 57. */
         },
-        .profile_cnt = 58,
+        .profile_cnt = 34,
     },
     {
         .name = "PKT_MISC_CTRL_0_3_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0,
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 376, 379 }, /* Profile 2. */
-            { 360, 363 }, /* Profile 3. */
-            { 380, 383 }, /* Profile 4. */
-            { 376, 379 }, /* Profile 5. */
+            { 400, 403 }, /* Profile 2. */
+            { 396, 399 }, /* Profile 3. */
+            { 396, 399 }, /* Profile 4. */
+            { 400, 403 }, /* Profile 5. */
+            { 396, 399 }, /* Profile 6. */
+            { 396, 399 }, /* Profile 7. */
+            { 396, 399 }, /* Profile 8. */
+            { 392, 395 }, /* Profile 9. */
+            { 400, 403 }, /* Profile 10. */
+            { 396, 399 }, /* Profile 11. */
+            { 396, 399 }, /* Profile 12. */
+            { 400, 403 }, /* Profile 13. */
+            { 396, 399 }, /* Profile 14. */
+            { 396, 399 }, /* Profile 15. */
+            { 396, 399 }, /* Profile 16. */
+            { 392, 395 }, /* Profile 17. */
+            { 400, 403 }, /* Profile 18. */
+            { 396, 399 }, /* Profile 19. */
+            { 396, 399 }, /* Profile 20. */
+            { 400, 403 }, /* Profile 21. */
+            { 396, 399 }, /* Profile 22. */
+            { 396, 399 }, /* Profile 23. */
+            { 396, 399 }, /* Profile 24. */
+            { 392, 395 }, /* Profile 25. */
+            { 400, 403 }, /* Profile 26. */
+            { 396, 399 }, /* Profile 27. */
+            { 396, 399 }, /* Profile 28. */
+            { 400, 403 }, /* Profile 29. */
+            { 396, 399 }, /* Profile 30. */
+            { 396, 399 }, /* Profile 31. */
+            { 396, 399 }, /* Profile 32. */
+            { 392, 395 }, /* Profile 33. */
+        },
+        .profile_cnt = 34,
+    },
+    {
+        .name = "SVP_15_0",
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_SVP_15_0,
+        .profile = {
+            { -1, -1 }, /* Profile 0. */
+            { -1, -1 }, /* Profile 1. */
+            { 352, 367 }, /* Profile 2. */
+            { 352, 367 }, /* Profile 3. */
+            { 352, 367 }, /* Profile 4. */
+            { 352, 367 }, /* Profile 5. */
+            { 352, 367 }, /* Profile 6. */
+            { 352, 367 }, /* Profile 7. */
+            { 352, 367 }, /* Profile 8. */
+            { 352, 367 }, /* Profile 9. */
+            { 352, 367 }, /* Profile 10. */
+            { 352, 367 }, /* Profile 11. */
+            { 352, 367 }, /* Profile 12. */
+            { 352, 367 }, /* Profile 13. */
+            { 352, 367 }, /* Profile 14. */
+            { 352, 367 }, /* Profile 15. */
+            { 352, 367 }, /* Profile 16. */
+            { 352, 367 }, /* Profile 17. */
+            { 352, 367 }, /* Profile 18. */
+            { 352, 367 }, /* Profile 19. */
+            { 352, 367 }, /* Profile 20. */
+            { 352, 367 }, /* Profile 21. */
+            { 352, 367 }, /* Profile 22. */
+            { 352, 367 }, /* Profile 23. */
+            { 352, 367 }, /* Profile 24. */
+            { 352, 367 }, /* Profile 25. */
+            { 352, 367 }, /* Profile 26. */
+            { 352, 367 }, /* Profile 27. */
+            { 352, 367 }, /* Profile 28. */
+            { 352, 367 }, /* Profile 29. */
+            { 352, 367 }, /* Profile 30. */
+            { 352, 367 }, /* Profile 31. */
+            { 352, 367 }, /* Profile 32. */
+            { 352, 367 }, /* Profile 33. */
+        },
+        .profile_cnt = 34,
+    },
+    {
+        .name = "SVP_NETWORK_GROUP_BITMAP_3_0",
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0,
+        .profile = {
+            { -1, -1 }, /* Profile 0. */
+            { -1, -1 }, /* Profile 1. */
+            { 380, 383 }, /* Profile 2. */
+            { 376, 379 }, /* Profile 3. */
+            { 376, 379 }, /* Profile 4. */
+            { 380, 383 }, /* Profile 5. */
             { 376, 379 }, /* Profile 6. */
             { 376, 379 }, /* Profile 7. */
-            { 360, 363 }, /* Profile 8. */
-            { 380, 383 }, /* Profile 9. */
-            { 376, 379 }, /* Profile 10. */
+            { 380, 383 }, /* Profile 8. */
+            { 376, 379 }, /* Profile 9. */
+            { 380, 383 }, /* Profile 10. */
             { 376, 379 }, /* Profile 11. */
-            { 372, 375 }, /* Profile 12. */
-            { 356, 359 }, /* Profile 13. */
+            { 376, 379 }, /* Profile 12. */
+            { 380, 383 }, /* Profile 13. */
             { 376, 379 }, /* Profile 14. */
-            { 372, 375 }, /* Profile 15. */
-            { 376, 379 }, /* Profile 16. */
-            { 360, 363 }, /* Profile 17. */
+            { 376, 379 }, /* Profile 15. */
+            { 380, 383 }, /* Profile 16. */
+            { 376, 379 }, /* Profile 17. */
             { 380, 383 }, /* Profile 18. */
             { 376, 379 }, /* Profile 19. */
             { 376, 379 }, /* Profile 20. */
-            { 376, 379 }, /* Profile 21. */
-            { 360, 363 }, /* Profile 22. */
-            { 380, 383 }, /* Profile 23. */
-            { 376, 379 }, /* Profile 24. */
+            { 380, 383 }, /* Profile 21. */
+            { 376, 379 }, /* Profile 22. */
+            { 376, 379 }, /* Profile 23. */
+            { 380, 383 }, /* Profile 24. */
             { 376, 379 }, /* Profile 25. */
-            { 372, 375 }, /* Profile 26. */
-            { 356, 359 }, /* Profile 27. */
+            { 380, 383 }, /* Profile 26. */
+            { 376, 379 }, /* Profile 27. */
             { 376, 379 }, /* Profile 28. */
-            { 372, 375 }, /* Profile 29. */
+            { 380, 383 }, /* Profile 29. */
             { 376, 379 }, /* Profile 30. */
-            { 360, 363 }, /* Profile 31. */
+            { 376, 379 }, /* Profile 31. */
             { 380, 383 }, /* Profile 32. */
             { 376, 379 }, /* Profile 33. */
-            { 376, 379 }, /* Profile 34. */
-            { 376, 379 }, /* Profile 35. */
-            { 360, 363 }, /* Profile 36. */
-            { 380, 383 }, /* Profile 37. */
-            { 376, 379 }, /* Profile 38. */
-            { 376, 379 }, /* Profile 39. */
-            { 372, 375 }, /* Profile 40. */
-            { 356, 359 }, /* Profile 41. */
-            { 376, 379 }, /* Profile 42. */
-            { 372, 375 }, /* Profile 43. */
-            { 376, 379 }, /* Profile 44. */
-            { 360, 363 }, /* Profile 45. */
-            { 380, 383 }, /* Profile 46. */
-            { 376, 379 }, /* Profile 47. */
-            { 376, 379 }, /* Profile 48. */
-            { 376, 379 }, /* Profile 49. */
-            { 360, 363 }, /* Profile 50. */
-            { 380, 383 }, /* Profile 51. */
-            { 376, 379 }, /* Profile 52. */
-            { 376, 379 }, /* Profile 53. */
-            { 372, 375 }, /* Profile 54. */
-            { 356, 359 }, /* Profile 55. */
-            { 376, 379 }, /* Profile 56. */
-            { 372, 375 }, /* Profile 57. */
         },
-        .profile_cnt = 58,
+        .profile_cnt = 34,
     },
     {
-        .name = "SRV6_DIP_EDIT_CTRL_3_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_SRV6_DIP_EDIT_CTRL_3_0,
+        .name = "SVTAG_SC_INDEX_STR_ALLOW_NAT_3_0",
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_SVTAG_SC_INDEX_STR_ALLOW_NAT_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { -1, -1 }, /* Profile 2. */
-            { 384, 387 }, /* Profile 3. */
-            { -1, -1 }, /* Profile 4. */
-            { -1, -1 }, /* Profile 5. */
-            { -1, -1 }, /* Profile 6. */
-            { -1, -1 }, /* Profile 7. */
-            { 384, 387 }, /* Profile 8. */
-            { -1, -1 }, /* Profile 9. */
-            { -1, -1 }, /* Profile 10. */
-            { -1, -1 }, /* Profile 11. */
-            { -1, -1 }, /* Profile 12. */
-            { 380, 383 }, /* Profile 13. */
-            { -1, -1 }, /* Profile 14. */
-            { -1, -1 }, /* Profile 15. */
-            { -1, -1 }, /* Profile 16. */
-            { 384, 387 }, /* Profile 17. */
-            { -1, -1 }, /* Profile 18. */
-            { -1, -1 }, /* Profile 19. */
-            { -1, -1 }, /* Profile 20. */
-            { -1, -1 }, /* Profile 21. */
-            { 384, 387 }, /* Profile 22. */
-            { -1, -1 }, /* Profile 23. */
-            { -1, -1 }, /* Profile 24. */
-            { -1, -1 }, /* Profile 25. */
-            { -1, -1 }, /* Profile 26. */
-            { 380, 383 }, /* Profile 27. */
-            { -1, -1 }, /* Profile 28. */
-            { -1, -1 }, /* Profile 29. */
-            { -1, -1 }, /* Profile 30. */
-            { 384, 387 }, /* Profile 31. */
-            { -1, -1 }, /* Profile 32. */
-            { -1, -1 }, /* Profile 33. */
-            { -1, -1 }, /* Profile 34. */
-            { -1, -1 }, /* Profile 35. */
-            { 384, 387 }, /* Profile 36. */
-            { -1, -1 }, /* Profile 37. */
-            { -1, -1 }, /* Profile 38. */
-            { -1, -1 }, /* Profile 39. */
-            { -1, -1 }, /* Profile 40. */
-            { 380, 383 }, /* Profile 41. */
-            { -1, -1 }, /* Profile 42. */
-            { -1, -1 }, /* Profile 43. */
-            { -1, -1 }, /* Profile 44. */
-            { 384, 387 }, /* Profile 45. */
-            { -1, -1 }, /* Profile 46. */
-            { -1, -1 }, /* Profile 47. */
-            { -1, -1 }, /* Profile 48. */
-            { -1, -1 }, /* Profile 49. */
-            { 384, 387 }, /* Profile 50. */
-            { -1, -1 }, /* Profile 51. */
-            { -1, -1 }, /* Profile 52. */
-            { -1, -1 }, /* Profile 53. */
-            { -1, -1 }, /* Profile 54. */
-            { 380, 383 }, /* Profile 55. */
-        },
-        .profile_cnt = 56,
-    },
-    {
-        .name = "SRV6_EDIT_AND_SL_UPDATE_CTRL_3_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_SRV6_EDIT_AND_SL_UPDATE_CTRL_3_0,
-        .profile = {
-            { -1, -1 }, /* Profile 0. */
-            { -1, -1 }, /* Profile 1. */
-            { -1, -1 }, /* Profile 2. */
-            { 416, 419 }, /* Profile 3. */
-            { -1, -1 }, /* Profile 4. */
-            { -1, -1 }, /* Profile 5. */
-            { -1, -1 }, /* Profile 6. */
-            { -1, -1 }, /* Profile 7. */
+            { 420, 423 }, /* Profile 2. */
+            { 420, 423 }, /* Profile 3. */
+            { 420, 423 }, /* Profile 4. */
+            { 420, 423 }, /* Profile 5. */
+            { 420, 423 }, /* Profile 6. */
+            { 420, 423 }, /* Profile 7. */
             { 416, 419 }, /* Profile 8. */
-            { -1, -1 }, /* Profile 9. */
-            { -1, -1 }, /* Profile 10. */
-            { -1, -1 }, /* Profile 11. */
-            { -1, -1 }, /* Profile 12. */
-            { 412, 415 }, /* Profile 13. */
-            { -1, -1 }, /* Profile 14. */
-            { -1, -1 }, /* Profile 15. */
-            { -1, -1 }, /* Profile 16. */
+            { 416, 419 }, /* Profile 9. */
+            { 420, 423 }, /* Profile 10. */
+            { 420, 423 }, /* Profile 11. */
+            { 420, 423 }, /* Profile 12. */
+            { 420, 423 }, /* Profile 13. */
+            { 420, 423 }, /* Profile 14. */
+            { 420, 423 }, /* Profile 15. */
+            { 416, 419 }, /* Profile 16. */
             { 416, 419 }, /* Profile 17. */
-            { -1, -1 }, /* Profile 18. */
-            { -1, -1 }, /* Profile 19. */
-            { -1, -1 }, /* Profile 20. */
-            { -1, -1 }, /* Profile 21. */
-            { 416, 419 }, /* Profile 22. */
-            { -1, -1 }, /* Profile 23. */
-            { -1, -1 }, /* Profile 24. */
-            { -1, -1 }, /* Profile 25. */
-            { -1, -1 }, /* Profile 26. */
-            { 412, 415 }, /* Profile 27. */
-            { -1, -1 }, /* Profile 28. */
-            { -1, -1 }, /* Profile 29. */
-            { -1, -1 }, /* Profile 30. */
-            { 416, 419 }, /* Profile 31. */
-            { -1, -1 }, /* Profile 32. */
-            { -1, -1 }, /* Profile 33. */
-            { -1, -1 }, /* Profile 34. */
-            { -1, -1 }, /* Profile 35. */
-            { 416, 419 }, /* Profile 36. */
-            { -1, -1 }, /* Profile 37. */
-            { -1, -1 }, /* Profile 38. */
-            { -1, -1 }, /* Profile 39. */
-            { -1, -1 }, /* Profile 40. */
-            { 412, 415 }, /* Profile 41. */
-            { -1, -1 }, /* Profile 42. */
-            { -1, -1 }, /* Profile 43. */
-            { -1, -1 }, /* Profile 44. */
-            { 416, 419 }, /* Profile 45. */
-            { -1, -1 }, /* Profile 46. */
-            { -1, -1 }, /* Profile 47. */
-            { -1, -1 }, /* Profile 48. */
-            { -1, -1 }, /* Profile 49. */
-            { 416, 419 }, /* Profile 50. */
-            { -1, -1 }, /* Profile 51. */
-            { -1, -1 }, /* Profile 52. */
-            { -1, -1 }, /* Profile 53. */
-            { -1, -1 }, /* Profile 54. */
-            { 412, 415 }, /* Profile 55. */
-        },
-        .profile_cnt = 56,
-    },
-    {
-        .name = "SRV6_NEW_GSID_SI_2_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_SRV6_NEW_GSID_SI_2_0,
-        .profile = {
-            { -1, -1 }, /* Profile 0. */
-            { -1, -1 }, /* Profile 1. */
-            { -1, -1 }, /* Profile 2. */
-            { 372, 374 }, /* Profile 3. */
-            { -1, -1 }, /* Profile 4. */
-            { -1, -1 }, /* Profile 5. */
-            { -1, -1 }, /* Profile 6. */
-            { -1, -1 }, /* Profile 7. */
-            { 372, 374 }, /* Profile 8. */
-            { -1, -1 }, /* Profile 9. */
-            { -1, -1 }, /* Profile 10. */
-            { -1, -1 }, /* Profile 11. */
-            { -1, -1 }, /* Profile 12. */
-            { 368, 370 }, /* Profile 13. */
-            { -1, -1 }, /* Profile 14. */
-            { -1, -1 }, /* Profile 15. */
-            { -1, -1 }, /* Profile 16. */
-            { 372, 374 }, /* Profile 17. */
-            { -1, -1 }, /* Profile 18. */
-            { -1, -1 }, /* Profile 19. */
-            { -1, -1 }, /* Profile 20. */
-            { -1, -1 }, /* Profile 21. */
-            { 372, 374 }, /* Profile 22. */
-            { -1, -1 }, /* Profile 23. */
-            { -1, -1 }, /* Profile 24. */
-            { -1, -1 }, /* Profile 25. */
-            { -1, -1 }, /* Profile 26. */
-            { 368, 370 }, /* Profile 27. */
-            { -1, -1 }, /* Profile 28. */
-            { -1, -1 }, /* Profile 29. */
-            { -1, -1 }, /* Profile 30. */
-            { 372, 374 }, /* Profile 31. */
-            { -1, -1 }, /* Profile 32. */
-            { -1, -1 }, /* Profile 33. */
-            { -1, -1 }, /* Profile 34. */
-            { -1, -1 }, /* Profile 35. */
-            { 372, 374 }, /* Profile 36. */
-            { -1, -1 }, /* Profile 37. */
-            { -1, -1 }, /* Profile 38. */
-            { -1, -1 }, /* Profile 39. */
-            { -1, -1 }, /* Profile 40. */
-            { 368, 370 }, /* Profile 41. */
-            { -1, -1 }, /* Profile 42. */
-            { -1, -1 }, /* Profile 43. */
-            { -1, -1 }, /* Profile 44. */
-            { 372, 374 }, /* Profile 45. */
-            { -1, -1 }, /* Profile 46. */
-            { -1, -1 }, /* Profile 47. */
-            { -1, -1 }, /* Profile 48. */
-            { -1, -1 }, /* Profile 49. */
-            { 372, 374 }, /* Profile 50. */
-            { -1, -1 }, /* Profile 51. */
-            { -1, -1 }, /* Profile 52. */
-            { -1, -1 }, /* Profile 53. */
-            { -1, -1 }, /* Profile 54. */
-            { 368, 370 }, /* Profile 55. */
-        },
-        .profile_cnt = 56,
-    },
-    {
-        .name = "SRV6_SID_AND_PREFIX_LEN_ENC_3_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_SRV6_SID_AND_PREFIX_LEN_ENC_3_0,
-        .profile = {
-            { -1, -1 }, /* Profile 0. */
-            { -1, -1 }, /* Profile 1. */
-            { -1, -1 }, /* Profile 2. */
-            { 368, 371 }, /* Profile 3. */
-            { -1, -1 }, /* Profile 4. */
-            { -1, -1 }, /* Profile 5. */
-            { -1, -1 }, /* Profile 6. */
-            { -1, -1 }, /* Profile 7. */
-            { 368, 371 }, /* Profile 8. */
-            { -1, -1 }, /* Profile 9. */
-            { -1, -1 }, /* Profile 10. */
-            { -1, -1 }, /* Profile 11. */
-            { -1, -1 }, /* Profile 12. */
-            { 364, 367 }, /* Profile 13. */
-            { -1, -1 }, /* Profile 14. */
-            { -1, -1 }, /* Profile 15. */
-            { -1, -1 }, /* Profile 16. */
-            { 368, 371 }, /* Profile 17. */
-            { -1, -1 }, /* Profile 18. */
-            { -1, -1 }, /* Profile 19. */
-            { -1, -1 }, /* Profile 20. */
-            { -1, -1 }, /* Profile 21. */
-            { 368, 371 }, /* Profile 22. */
-            { -1, -1 }, /* Profile 23. */
-            { -1, -1 }, /* Profile 24. */
-            { -1, -1 }, /* Profile 25. */
-            { -1, -1 }, /* Profile 26. */
-            { 364, 367 }, /* Profile 27. */
-            { -1, -1 }, /* Profile 28. */
-            { -1, -1 }, /* Profile 29. */
-            { -1, -1 }, /* Profile 30. */
-            { 368, 371 }, /* Profile 31. */
-            { -1, -1 }, /* Profile 32. */
-            { -1, -1 }, /* Profile 33. */
-            { -1, -1 }, /* Profile 34. */
-            { -1, -1 }, /* Profile 35. */
-            { 368, 371 }, /* Profile 36. */
-            { -1, -1 }, /* Profile 37. */
-            { -1, -1 }, /* Profile 38. */
-            { -1, -1 }, /* Profile 39. */
-            { -1, -1 }, /* Profile 40. */
-            { 364, 367 }, /* Profile 41. */
-            { -1, -1 }, /* Profile 42. */
-            { -1, -1 }, /* Profile 43. */
-            { -1, -1 }, /* Profile 44. */
-            { 368, 371 }, /* Profile 45. */
-            { -1, -1 }, /* Profile 46. */
-            { -1, -1 }, /* Profile 47. */
-            { -1, -1 }, /* Profile 48. */
-            { -1, -1 }, /* Profile 49. */
-            { 368, 371 }, /* Profile 50. */
-            { -1, -1 }, /* Profile 51. */
-            { -1, -1 }, /* Profile 52. */
-            { -1, -1 }, /* Profile 53. */
-            { -1, -1 }, /* Profile 54. */
-            { 364, 367 }, /* Profile 55. */
+            { 420, 423 }, /* Profile 18. */
+            { 420, 423 }, /* Profile 19. */
+            { 420, 423 }, /* Profile 20. */
+            { 420, 423 }, /* Profile 21. */
+            { 420, 423 }, /* Profile 22. */
+            { 420, 423 }, /* Profile 23. */
+            { 416, 419 }, /* Profile 24. */
+            { 416, 419 }, /* Profile 25. */
+            { 420, 423 }, /* Profile 26. */
+            { 420, 423 }, /* Profile 27. */
+            { 420, 423 }, /* Profile 28. */
+            { 420, 423 }, /* Profile 29. */
+            { 420, 423 }, /* Profile 30. */
+            { 420, 423 }, /* Profile 31. */
+            { 416, 419 }, /* Profile 32. */
+            { 416, 419 }, /* Profile 33. */
         },
-        .profile_cnt = 56,
+        .profile_cnt = 34,
     },
     {
-        .name = "SVP_15_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_SVP_15_0,
+        .name = "SYSTEM_DESTINATION_15_0",
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 240, 255 }, /* Profile 2. */
-            { 224, 239 }, /* Profile 3. */
-            { 240, 255 }, /* Profile 4. */
-            { 224, 239 }, /* Profile 5. */
-            { 224, 239 }, /* Profile 6. */
-            { 240, 255 }, /* Profile 7. */
-            { 224, 239 }, /* Profile 8. */
-            { 240, 255 }, /* Profile 9. */
-            { 224, 239 }, /* Profile 10. */
-            { 224, 239 }, /* Profile 11. */
-            { 240, 255 }, /* Profile 12. */
-            { 224, 239 }, /* Profile 13. */
-            { 240, 255 }, /* Profile 14. */
-            { 224, 239 }, /* Profile 15. */
-            { 240, 255 }, /* Profile 16. */
-            { 224, 239 }, /* Profile 17. */
-            { 240, 255 }, /* Profile 18. */
-            { 224, 239 }, /* Profile 19. */
-            { 224, 239 }, /* Profile 20. */
-            { 240, 255 }, /* Profile 21. */
-            { 224, 239 }, /* Profile 22. */
-            { 240, 255 }, /* Profile 23. */
-            { 224, 239 }, /* Profile 24. */
-            { 224, 239 }, /* Profile 25. */
-            { 240, 255 }, /* Profile 26. */
-            { 224, 239 }, /* Profile 27. */
-            { 240, 255 }, /* Profile 28. */
-            { 224, 239 }, /* Profile 29. */
-            { 256, 271 }, /* Profile 30. */
-            { 240, 255 }, /* Profile 31. */
-            { 256, 271 }, /* Profile 32. */
-            { 240, 255 }, /* Profile 33. */
-            { 240, 255 }, /* Profile 34. */
-            { 256, 271 }, /* Profile 35. */
-            { 240, 255 }, /* Profile 36. */
-            { 256, 271 }, /* Profile 37. */
-            { 240, 255 }, /* Profile 38. */
-            { 240, 255 }, /* Profile 39. */
-            { 256, 271 }, /* Profile 40. */
-            { 240, 255 }, /* Profile 41. */
-            { 256, 271 }, /* Profile 42. */
-            { 240, 255 }, /* Profile 43. */
-            { 256, 271 }, /* Profile 44. */
-            { 240, 255 }, /* Profile 45. */
-            { 256, 271 }, /* Profile 46. */
-            { 240, 255 }, /* Profile 47. */
-            { 240, 255 }, /* Profile 48. */
-            { 256, 271 }, /* Profile 49. */
-            { 240, 255 }, /* Profile 50. */
-            { 256, 271 }, /* Profile 51. */
-            { 240, 255 }, /* Profile 52. */
-            { 240, 255 }, /* Profile 53. */
-            { 256, 271 }, /* Profile 54. */
-            { 240, 255 }, /* Profile 55. */
-            { 256, 271 }, /* Profile 56. */
-            { 240, 255 }, /* Profile 57. */
+            { 128, 143 }, /* Profile 2. */
+            { 160, 175 }, /* Profile 3. */
+            { 160, 175 }, /* Profile 4. */
+            { 128, 143 }, /* Profile 5. */
+            { 160, 175 }, /* Profile 6. */
+            { 160, 175 }, /* Profile 7. */
+            { 128, 143 }, /* Profile 8. */
+            { 160, 175 }, /* Profile 9. */
+            { 128, 143 }, /* Profile 10. */
+            { 160, 175 }, /* Profile 11. */
+            { 160, 175 }, /* Profile 12. */
+            { 128, 143 }, /* Profile 13. */
+            { 160, 175 }, /* Profile 14. */
+            { 160, 175 }, /* Profile 15. */
+            { 128, 143 }, /* Profile 16. */
+            { 160, 175 }, /* Profile 17. */
+            { 144, 159 }, /* Profile 18. */
+            { 176, 191 }, /* Profile 19. */
+            { 176, 191 }, /* Profile 20. */
+            { 144, 159 }, /* Profile 21. */
+            { 176, 191 }, /* Profile 22. */
+            { 176, 191 }, /* Profile 23. */
+            { 144, 159 }, /* Profile 24. */
+            { 176, 191 }, /* Profile 25. */
+            { 144, 159 }, /* Profile 26. */
+            { 176, 191 }, /* Profile 27. */
+            { 176, 191 }, /* Profile 28. */
+            { 144, 159 }, /* Profile 29. */
+            { 176, 191 }, /* Profile 30. */
+            { 176, 191 }, /* Profile 31. */
+            { 144, 159 }, /* Profile 32. */
+            { 176, 191 }, /* Profile 33. */
         },
-        .profile_cnt = 58,
+        .profile_cnt = 34,
     },
     {
-        .name = "SVP_NETWORK_GROUP_BITMAP_3_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0,
+        .name = "SYSTEM_OPCODE_3_0",
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 384, 387 }, /* Profile 2. */
-            { 376, 379 }, /* Profile 3. */
-            { 388, 391 }, /* Profile 4. */
-            { 384, 387 }, /* Profile 5. */
-            { 384, 387 }, /* Profile 6. */
-            { 384, 387 }, /* Profile 7. */
-            { 376, 379 }, /* Profile 8. */
-            { 388, 391 }, /* Profile 9. */
-            { 384, 387 }, /* Profile 10. */
-            { 384, 387 }, /* Profile 11. */
-            { 380, 383 }, /* Profile 12. */
-            { 372, 375 }, /* Profile 13. */
-            { 384, 387 }, /* Profile 14. */
-            { 380, 383 }, /* Profile 15. */
-            { 384, 387 }, /* Profile 16. */
-            { 376, 379 }, /* Profile 17. */
-            { 388, 391 }, /* Profile 18. */
-            { 384, 387 }, /* Profile 19. */
-            { 384, 387 }, /* Profile 20. */
-            { 384, 387 }, /* Profile 21. */
-            { 376, 379 }, /* Profile 22. */
-            { 388, 391 }, /* Profile 23. */
-            { 384, 387 }, /* Profile 24. */
-            { 384, 387 }, /* Profile 25. */
-            { 380, 383 }, /* Profile 26. */
-            { 372, 375 }, /* Profile 27. */
-            { 384, 387 }, /* Profile 28. */
-            { 380, 383 }, /* Profile 29. */
-            { 384, 387 }, /* Profile 30. */
-            { 376, 379 }, /* Profile 31. */
-            { 388, 391 }, /* Profile 32. */
-            { 384, 387 }, /* Profile 33. */
-            { 384, 387 }, /* Profile 34. */
-            { 384, 387 }, /* Profile 35. */
-            { 376, 379 }, /* Profile 36. */
-            { 388, 391 }, /* Profile 37. */
-            { 384, 387 }, /* Profile 38. */
-            { 384, 387 }, /* Profile 39. */
-            { 380, 383 }, /* Profile 40. */
-            { 372, 375 }, /* Profile 41. */
-            { 384, 387 }, /* Profile 42. */
-            { 380, 383 }, /* Profile 43. */
-            { 384, 387 }, /* Profile 44. */
-            { 376, 379 }, /* Profile 45. */
-            { 388, 391 }, /* Profile 46. */
-            { 384, 387 }, /* Profile 47. */
-            { 384, 387 }, /* Profile 48. */
-            { 384, 387 }, /* Profile 49. */
-            { 376, 379 }, /* Profile 50. */
-            { 388, 391 }, /* Profile 51. */
-            { 384, 387 }, /* Profile 52. */
-            { 384, 387 }, /* Profile 53. */
-            { 380, 383 }, /* Profile 54. */
-            { 372, 375 }, /* Profile 55. */
-            { 384, 387 }, /* Profile 56. */
-            { 380, 383 }, /* Profile 57. */
+            { 404, 407 }, /* Profile 2. */
+            { 400, 403 }, /* Profile 3. */
+            { 400, 403 }, /* Profile 4. */
+            { 404, 407 }, /* Profile 5. */
+            { 400, 403 }, /* Profile 6. */
+            { 400, 403 }, /* Profile 7. */
+            { 400, 403 }, /* Profile 8. */
+            { 396, 399 }, /* Profile 9. */
+            { 404, 407 }, /* Profile 10. */
+            { 400, 403 }, /* Profile 11. */
+            { 400, 403 }, /* Profile 12. */
+            { 404, 407 }, /* Profile 13. */
+            { 400, 403 }, /* Profile 14. */
+            { 400, 403 }, /* Profile 15. */
+            { 400, 403 }, /* Profile 16. */
+            { 396, 399 }, /* Profile 17. */
+            { 404, 407 }, /* Profile 18. */
+            { 400, 403 }, /* Profile 19. */
+            { 400, 403 }, /* Profile 20. */
+            { 404, 407 }, /* Profile 21. */
+            { 400, 403 }, /* Profile 22. */
+            { 400, 403 }, /* Profile 23. */
+            { 400, 403 }, /* Profile 24. */
+            { 396, 399 }, /* Profile 25. */
+            { 404, 407 }, /* Profile 26. */
+            { 400, 403 }, /* Profile 27. */
+            { 400, 403 }, /* Profile 28. */
+            { 404, 407 }, /* Profile 29. */
+            { 400, 403 }, /* Profile 30. */
+            { 400, 403 }, /* Profile 31. */
+            { 400, 403 }, /* Profile 32. */
+            { 396, 399 }, /* Profile 33. */
         },
-        .profile_cnt = 58,
+        .profile_cnt = 34,
     },
     {
-        .name = "SYSTEM_DESTINATION_15_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0,
+        .name = "SYSTEM_SOURCE_15_0",
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_SYSTEM_SOURCE_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -3102,296 +1984,94 @@ static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_flex_field_
             { 80, 95 }, /* Profile 31. */
             { 80, 95 }, /* Profile 32. */
             { 80, 95 }, /* Profile 33. */
-            { 80, 95 }, /* Profile 34. */
-            { 80, 95 }, /* Profile 35. */
-            { 80, 95 }, /* Profile 36. */
-            { 80, 95 }, /* Profile 37. */
-            { 80, 95 }, /* Profile 38. */
-            { 80, 95 }, /* Profile 39. */
-            { 80, 95 }, /* Profile 40. */
-            { 80, 95 }, /* Profile 41. */
-            { 80, 95 }, /* Profile 42. */
-            { 80, 95 }, /* Profile 43. */
-            { 80, 95 }, /* Profile 44. */
-            { 80, 95 }, /* Profile 45. */
-            { 80, 95 }, /* Profile 46. */
-            { 80, 95 }, /* Profile 47. */
-            { 80, 95 }, /* Profile 48. */
-            { 80, 95 }, /* Profile 49. */
-            { 80, 95 }, /* Profile 50. */
-            { 80, 95 }, /* Profile 51. */
-            { 80, 95 }, /* Profile 52. */
-            { 80, 95 }, /* Profile 53. */
-            { 80, 95 }, /* Profile 54. */
-            { 80, 95 }, /* Profile 55. */
-            { 80, 95 }, /* Profile 56. */
-            { 80, 95 }, /* Profile 57. */
-        },
-        .profile_cnt = 58,
-    },
-    {
-        .name = "SYSTEM_OPCODE_3_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0,
-        .profile = {
-            { -1, -1 }, /* Profile 0. */
-            { -1, -1 }, /* Profile 1. */
-            { 396, 399 }, /* Profile 2. */
-            { 388, 391 }, /* Profile 3. */
-            { 396, 399 }, /* Profile 4. */
-            { 392, 395 }, /* Profile 5. */
-            { 392, 395 }, /* Profile 6. */
-            { 396, 399 }, /* Profile 7. */
-            { 388, 391 }, /* Profile 8. */
-            { 396, 399 }, /* Profile 9. */
-            { 392, 395 }, /* Profile 10. */
-            { 392, 395 }, /* Profile 11. */
-            { 392, 395 }, /* Profile 12. */
-            { 384, 387 }, /* Profile 13. */
-            { 392, 395 }, /* Profile 14. */
-            { 388, 391 }, /* Profile 15. */
-            { 396, 399 }, /* Profile 16. */
-            { 388, 391 }, /* Profile 17. */
-            { 396, 399 }, /* Profile 18. */
-            { 392, 395 }, /* Profile 19. */
-            { 392, 395 }, /* Profile 20. */
-            { 396, 399 }, /* Profile 21. */
-            { 388, 391 }, /* Profile 22. */
-            { 396, 399 }, /* Profile 23. */
-            { 392, 395 }, /* Profile 24. */
-            { 392, 395 }, /* Profile 25. */
-            { 392, 395 }, /* Profile 26. */
-            { 384, 387 }, /* Profile 27. */
-            { 392, 395 }, /* Profile 28. */
-            { 388, 391 }, /* Profile 29. */
-            { 396, 399 }, /* Profile 30. */
-            { 388, 391 }, /* Profile 31. */
-            { 396, 399 }, /* Profile 32. */
-            { 392, 395 }, /* Profile 33. */
-            { 392, 395 }, /* Profile 34. */
-            { 396, 399 }, /* Profile 35. */
-            { 388, 391 }, /* Profile 36. */
-            { 396, 399 }, /* Profile 37. */
-            { 392, 395 }, /* Profile 38. */
-            { 392, 395 }, /* Profile 39. */
-            { 392, 395 }, /* Profile 40. */
-            { 384, 387 }, /* Profile 41. */
-            { 392, 395 }, /* Profile 42. */
-            { 388, 391 }, /* Profile 43. */
-            { 396, 399 }, /* Profile 44. */
-            { 388, 391 }, /* Profile 45. */
-            { 396, 399 }, /* Profile 46. */
-            { 392, 395 }, /* Profile 47. */
-            { 392, 395 }, /* Profile 48. */
-            { 396, 399 }, /* Profile 49. */
-            { 388, 391 }, /* Profile 50. */
-            { 396, 399 }, /* Profile 51. */
-            { 392, 395 }, /* Profile 52. */
-            { 392, 395 }, /* Profile 53. */
-            { 392, 395 }, /* Profile 54. */
-            { 384, 387 }, /* Profile 55. */
-            { 392, 395 }, /* Profile 56. */
-            { 388, 391 }, /* Profile 57. */
-        },
-        .profile_cnt = 58,
-    },
-    {
-        .name = "SYSTEM_SOURCE_15_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_SYSTEM_SOURCE_15_0,
-        .profile = {
-            { -1, -1 }, /* Profile 0. */
-            { -1, -1 }, /* Profile 1. */
-            { 96, 111 }, /* Profile 2. */
-            { 96, 111 }, /* Profile 3. */
-            { 96, 111 }, /* Profile 4. */
-            { 96, 111 }, /* Profile 5. */
-            { 96, 111 }, /* Profile 6. */
-            { 96, 111 }, /* Profile 7. */
-            { 96, 111 }, /* Profile 8. */
-            { 96, 111 }, /* Profile 9. */
-            { 96, 111 }, /* Profile 10. */
-            { 96, 111 }, /* Profile 11. */
-            { 96, 111 }, /* Profile 12. */
-            { 96, 111 }, /* Profile 13. */
-            { 96, 111 }, /* Profile 14. */
-            { 96, 111 }, /* Profile 15. */
-            { 96, 111 }, /* Profile 16. */
-            { 96, 111 }, /* Profile 17. */
-            { 96, 111 }, /* Profile 18. */
-            { 96, 111 }, /* Profile 19. */
-            { 96, 111 }, /* Profile 20. */
-            { 96, 111 }, /* Profile 21. */
-            { 96, 111 }, /* Profile 22. */
-            { 96, 111 }, /* Profile 23. */
-            { 96, 111 }, /* Profile 24. */
-            { 96, 111 }, /* Profile 25. */
-            { 96, 111 }, /* Profile 26. */
-            { 96, 111 }, /* Profile 27. */
-            { 96, 111 }, /* Profile 28. */
-            { 96, 111 }, /* Profile 29. */
-            { 96, 111 }, /* Profile 30. */
-            { 96, 111 }, /* Profile 31. */
-            { 96, 111 }, /* Profile 32. */
-            { 96, 111 }, /* Profile 33. */
-            { 96, 111 }, /* Profile 34. */
-            { 96, 111 }, /* Profile 35. */
-            { 96, 111 }, /* Profile 36. */
-            { 96, 111 }, /* Profile 37. */
-            { 96, 111 }, /* Profile 38. */
-            { 96, 111 }, /* Profile 39. */
-            { 96, 111 }, /* Profile 40. */
-            { 96, 111 }, /* Profile 41. */
-            { 96, 111 }, /* Profile 42. */
-            { 96, 111 }, /* Profile 43. */
-            { 96, 111 }, /* Profile 44. */
-            { 96, 111 }, /* Profile 45. */
-            { 96, 111 }, /* Profile 46. */
-            { 96, 111 }, /* Profile 47. */
-            { 96, 111 }, /* Profile 48. */
-            { 96, 111 }, /* Profile 49. */
-            { 96, 111 }, /* Profile 50. */
-            { 96, 111 }, /* Profile 51. */
-            { 96, 111 }, /* Profile 52. */
-            { 96, 111 }, /* Profile 53. */
-            { 96, 111 }, /* Profile 54. */
-            { 96, 111 }, /* Profile 55. */
-            { 96, 111 }, /* Profile 56. */
-            { 96, 111 }, /* Profile 57. */
         },
-        .profile_cnt = 58,
+        .profile_cnt = 34,
     },
     {
         .name = "TIMESTAMP_CTRL_3_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_TIMESTAMP_CTRL_3_0,
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_TIMESTAMP_CTRL_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { -1, -1 }, /* Profile 2. */
-            { -1, -1 }, /* Profile 3. */
-            { -1, -1 }, /* Profile 4. */
-            { 412, 415 }, /* Profile 5. */
+            { 412, 415 }, /* Profile 3. */
+            { 412, 415 }, /* Profile 4. */
+            { -1, -1 }, /* Profile 5. */
             { 412, 415 }, /* Profile 6. */
-            { -1, -1 }, /* Profile 7. */
+            { 412, 415 }, /* Profile 7. */
             { -1, -1 }, /* Profile 8. */
-            { -1, -1 }, /* Profile 9. */
-            { 412, 415 }, /* Profile 10. */
+            { 408, 411 }, /* Profile 9. */
+            { -1, -1 }, /* Profile 10. */
             { 412, 415 }, /* Profile 11. */
-            { -1, -1 }, /* Profile 12. */
+            { 412, 415 }, /* Profile 12. */
             { -1, -1 }, /* Profile 13. */
-            { -1, -1 }, /* Profile 14. */
-            { 408, 411 }, /* Profile 15. */
+            { 412, 415 }, /* Profile 14. */
+            { 412, 415 }, /* Profile 15. */
             { -1, -1 }, /* Profile 16. */
-            { -1, -1 }, /* Profile 17. */
+            { 408, 411 }, /* Profile 17. */
             { -1, -1 }, /* Profile 18. */
             { 412, 415 }, /* Profile 19. */
             { 412, 415 }, /* Profile 20. */
             { -1, -1 }, /* Profile 21. */
-            { -1, -1 }, /* Profile 22. */
-            { -1, -1 }, /* Profile 23. */
-            { 412, 415 }, /* Profile 24. */
-            { 412, 415 }, /* Profile 25. */
+            { 412, 415 }, /* Profile 22. */
+            { 412, 415 }, /* Profile 23. */
+            { -1, -1 }, /* Profile 24. */
+            { 408, 411 }, /* Profile 25. */
             { -1, -1 }, /* Profile 26. */
-            { -1, -1 }, /* Profile 27. */
-            { -1, -1 }, /* Profile 28. */
-            { 408, 411 }, /* Profile 29. */
-            { -1, -1 }, /* Profile 30. */
-            { -1, -1 }, /* Profile 31. */
+            { 412, 415 }, /* Profile 27. */
+            { 412, 415 }, /* Profile 28. */
+            { -1, -1 }, /* Profile 29. */
+            { 412, 415 }, /* Profile 30. */
+            { 412, 415 }, /* Profile 31. */
             { -1, -1 }, /* Profile 32. */
-            { 412, 415 }, /* Profile 33. */
-            { 412, 415 }, /* Profile 34. */
-            { -1, -1 }, /* Profile 35. */
-            { -1, -1 }, /* Profile 36. */
-            { -1, -1 }, /* Profile 37. */
-            { 412, 415 }, /* Profile 38. */
-            { 412, 415 }, /* Profile 39. */
-            { -1, -1 }, /* Profile 40. */
-            { -1, -1 }, /* Profile 41. */
-            { -1, -1 }, /* Profile 42. */
-            { 408, 411 }, /* Profile 43. */
-            { -1, -1 }, /* Profile 44. */
-            { -1, -1 }, /* Profile 45. */
-            { -1, -1 }, /* Profile 46. */
-            { 412, 415 }, /* Profile 47. */
-            { 412, 415 }, /* Profile 48. */
-            { -1, -1 }, /* Profile 49. */
-            { -1, -1 }, /* Profile 50. */
-            { -1, -1 }, /* Profile 51. */
-            { 412, 415 }, /* Profile 52. */
-            { 412, 415 }, /* Profile 53. */
-            { -1, -1 }, /* Profile 54. */
-            { -1, -1 }, /* Profile 55. */
-            { -1, -1 }, /* Profile 56. */
-            { 408, 411 }, /* Profile 57. */
+            { 408, 411 }, /* Profile 33. */
         },
-        .profile_cnt = 58,
+        .profile_cnt = 34,
     },
     {
         .name = "TUNNEL_PROCESSING_RESULTS_1_3_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0,
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 412, 415 }, /* Profile 2. */
-            { 404, 407 }, /* Profile 3. */
-            { 412, 415 }, /* Profile 4. */
-            { 408, 411 }, /* Profile 5. */
-            { 408, 411 }, /* Profile 6. */
-            { 412, 415 }, /* Profile 7. */
-            { 404, 407 }, /* Profile 8. */
+            { 416, 419 }, /* Profile 2. */
+            { 416, 419 }, /* Profile 3. */
+            { 416, 419 }, /* Profile 4. */
+            { 416, 419 }, /* Profile 5. */
+            { 416, 419 }, /* Profile 6. */
+            { 416, 419 }, /* Profile 7. */
+            { 412, 415 }, /* Profile 8. */
             { 412, 415 }, /* Profile 9. */
-            { 408, 411 }, /* Profile 10. */
-            { 408, 411 }, /* Profile 11. */
-            { 408, 411 }, /* Profile 12. */
-            { 400, 403 }, /* Profile 13. */
-            { 408, 411 }, /* Profile 14. */
-            { 404, 407 }, /* Profile 15. */
+            { 416, 419 }, /* Profile 10. */
+            { 416, 419 }, /* Profile 11. */
+            { 416, 419 }, /* Profile 12. */
+            { 416, 419 }, /* Profile 13. */
+            { 416, 419 }, /* Profile 14. */
+            { 416, 419 }, /* Profile 15. */
             { 412, 415 }, /* Profile 16. */
-            { 404, 407 }, /* Profile 17. */
-            { 412, 415 }, /* Profile 18. */
-            { 408, 411 }, /* Profile 19. */
-            { 408, 411 }, /* Profile 20. */
-            { 412, 415 }, /* Profile 21. */
-            { 404, 407 }, /* Profile 22. */
-            { 412, 415 }, /* Profile 23. */
-            { 408, 411 }, /* Profile 24. */
-            { 408, 411 }, /* Profile 25. */
-            { 408, 411 }, /* Profile 26. */
-            { 400, 403 }, /* Profile 27. */
-            { 408, 411 }, /* Profile 28. */
-            { 404, 407 }, /* Profile 29. */
-            { 412, 415 }, /* Profile 30. */
-            { 404, 407 }, /* Profile 31. */
+            { 412, 415 }, /* Profile 17. */
+            { 416, 419 }, /* Profile 18. */
+            { 416, 419 }, /* Profile 19. */
+            { 416, 419 }, /* Profile 20. */
+            { 416, 419 }, /* Profile 21. */
+            { 416, 419 }, /* Profile 22. */
+            { 416, 419 }, /* Profile 23. */
+            { 412, 415 }, /* Profile 24. */
+            { 412, 415 }, /* Profile 25. */
+            { 416, 419 }, /* Profile 26. */
+            { 416, 419 }, /* Profile 27. */
+            { 416, 419 }, /* Profile 28. */
+            { 416, 419 }, /* Profile 29. */
+            { 416, 419 }, /* Profile 30. */
+            { 416, 419 }, /* Profile 31. */
             { 412, 415 }, /* Profile 32. */
-            { 408, 411 }, /* Profile 33. */
-            { 408, 411 }, /* Profile 34. */
-            { 412, 415 }, /* Profile 35. */
-            { 404, 407 }, /* Profile 36. */
-            { 412, 415 }, /* Profile 37. */
-            { 408, 411 }, /* Profile 38. */
-            { 408, 411 }, /* Profile 39. */
-            { 408, 411 }, /* Profile 40. */
-            { 400, 403 }, /* Profile 41. */
-            { 408, 411 }, /* Profile 42. */
-            { 404, 407 }, /* Profile 43. */
-            { 412, 415 }, /* Profile 44. */
-            { 404, 407 }, /* Profile 45. */
-            { 412, 415 }, /* Profile 46. */
-            { 408, 411 }, /* Profile 47. */
-            { 408, 411 }, /* Profile 48. */
-            { 412, 415 }, /* Profile 49. */
-            { 404, 407 }, /* Profile 50. */
-            { 412, 415 }, /* Profile 51. */
-            { 408, 411 }, /* Profile 52. */
-            { 408, 411 }, /* Profile 53. */
-            { 408, 411 }, /* Profile 54. */
-            { 400, 403 }, /* Profile 55. */
-            { 408, 411 }, /* Profile 56. */
-            { 404, 407 }, /* Profile 57. */
+            { 412, 415 }, /* Profile 33. */
         },
-        .profile_cnt = 58,
+        .profile_cnt = 34,
     },
     {
         .name = "VFI_15_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_VFI_15_0,
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_VFI_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -3427,112 +2107,69 @@ static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_flex_field_
             { 112, 127 }, /* Profile 31. */
             { 112, 127 }, /* Profile 32. */
             { 112, 127 }, /* Profile 33. */
-            { 112, 127 }, /* Profile 34. */
-            { 112, 127 }, /* Profile 35. */
-            { 112, 127 }, /* Profile 36. */
-            { 112, 127 }, /* Profile 37. */
-            { 112, 127 }, /* Profile 38. */
-            { 112, 127 }, /* Profile 39. */
-            { 112, 127 }, /* Profile 40. */
-            { 112, 127 }, /* Profile 41. */
-            { 112, 127 }, /* Profile 42. */
-            { 112, 127 }, /* Profile 43. */
-            { 112, 127 }, /* Profile 44. */
-            { 112, 127 }, /* Profile 45. */
-            { 112, 127 }, /* Profile 46. */
-            { 112, 127 }, /* Profile 47. */
-            { 112, 127 }, /* Profile 48. */
-            { 112, 127 }, /* Profile 49. */
-            { 112, 127 }, /* Profile 50. */
-            { 112, 127 }, /* Profile 51. */
-            { 112, 127 }, /* Profile 52. */
-            { 112, 127 }, /* Profile 53. */
-            { 112, 127 }, /* Profile 54. */
-            { 112, 127 }, /* Profile 55. */
-            { 112, 127 }, /* Profile 56. */
-            { 112, 127 }, /* Profile 57. */
         },
-        .profile_cnt = 58,
+        .profile_cnt = 34,
     },
     {
         .name = "VLAN_TAG_PRESERVE_CTRL_SVP_MIRROR_ENABLE_3_0",
-        .fid = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_VLAN_TAG_PRESERVE_CTRL_SVP_MIRROR_ENABLE_3_0,
+        .fid = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_VLAN_TAG_PRESERVE_CTRL_SVP_MIRROR_ENABLE_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 380, 383 }, /* Profile 2. */
-            { 364, 367 }, /* Profile 3. */
-            { 384, 387 }, /* Profile 4. */
-            { 380, 383 }, /* Profile 5. */
-            { 380, 383 }, /* Profile 6. */
-            { 380, 383 }, /* Profile 7. */
-            { 364, 367 }, /* Profile 8. */
-            { 384, 387 }, /* Profile 9. */
-            { 380, 383 }, /* Profile 10. */
-            { 380, 383 }, /* Profile 11. */
-            { 376, 379 }, /* Profile 12. */
-            { 360, 363 }, /* Profile 13. */
-            { 380, 383 }, /* Profile 14. */
-            { 376, 379 }, /* Profile 15. */
-            { 380, 383 }, /* Profile 16. */
-            { 364, 367 }, /* Profile 17. */
-            { 384, 387 }, /* Profile 18. */
-            { 380, 383 }, /* Profile 19. */
-            { 380, 383 }, /* Profile 20. */
-            { 380, 383 }, /* Profile 21. */
-            { 364, 367 }, /* Profile 22. */
-            { 384, 387 }, /* Profile 23. */
-            { 380, 383 }, /* Profile 24. */
-            { 380, 383 }, /* Profile 25. */
-            { 376, 379 }, /* Profile 26. */
-            { 360, 363 }, /* Profile 27. */
-            { 380, 383 }, /* Profile 28. */
-            { 376, 379 }, /* Profile 29. */
-            { 380, 383 }, /* Profile 30. */
-            { 364, 367 }, /* Profile 31. */
-            { 384, 387 }, /* Profile 32. */
-            { 380, 383 }, /* Profile 33. */
-            { 380, 383 }, /* Profile 34. */
-            { 380, 383 }, /* Profile 35. */
-            { 364, 367 }, /* Profile 36. */
-            { 384, 387 }, /* Profile 37. */
-            { 380, 383 }, /* Profile 38. */
-            { 380, 383 }, /* Profile 39. */
-            { 376, 379 }, /* Profile 40. */
-            { 360, 363 }, /* Profile 41. */
-            { 380, 383 }, /* Profile 42. */
-            { 376, 379 }, /* Profile 43. */
-            { 380, 383 }, /* Profile 44. */
-            { 364, 367 }, /* Profile 45. */
-            { 384, 387 }, /* Profile 46. */
-            { 380, 383 }, /* Profile 47. */
-            { 380, 383 }, /* Profile 48. */
-            { 380, 383 }, /* Profile 49. */
-            { 364, 367 }, /* Profile 50. */
-            { 384, 387 }, /* Profile 51. */
-            { 380, 383 }, /* Profile 52. */
-            { 380, 383 }, /* Profile 53. */
-            { 376, 379 }, /* Profile 54. */
-            { 360, 363 }, /* Profile 55. */
-            { 380, 383 }, /* Profile 56. */
-            { 376, 379 }, /* Profile 57. */
+            { 372, 375 }, /* Profile 2. */
+            { 368, 371 }, /* Profile 3. */
+            { 368, 371 }, /* Profile 4. */
+            { 372, 375 }, /* Profile 5. */
+            { 368, 371 }, /* Profile 6. */
+            { 368, 371 }, /* Profile 7. */
+            { 372, 375 }, /* Profile 8. */
+            { 368, 371 }, /* Profile 9. */
+            { 372, 375 }, /* Profile 10. */
+            { 368, 371 }, /* Profile 11. */
+            { 368, 371 }, /* Profile 12. */
+            { 372, 375 }, /* Profile 13. */
+            { 368, 371 }, /* Profile 14. */
+            { 368, 371 }, /* Profile 15. */
+            { 372, 375 }, /* Profile 16. */
+            { 368, 371 }, /* Profile 17. */
+            { 372, 375 }, /* Profile 18. */
+            { 368, 371 }, /* Profile 19. */
+            { 368, 371 }, /* Profile 20. */
+            { 372, 375 }, /* Profile 21. */
+            { 368, 371 }, /* Profile 22. */
+            { 368, 371 }, /* Profile 23. */
+            { 372, 375 }, /* Profile 24. */
+            { 368, 371 }, /* Profile 25. */
+            { 372, 375 }, /* Profile 26. */
+            { 368, 371 }, /* Profile 27. */
+            { 368, 371 }, /* Profile 28. */
+            { 372, 375 }, /* Profile 29. */
+            { 368, 371 }, /* Profile 30. */
+            { 368, 371 }, /* Profile 31. */
+            { 372, 375 }, /* Profile 32. */
+            { 368, 371 }, /* Profile 33. */
         },
-        .profile_cnt = 58,
+        .profile_cnt = 34,
     },
-};static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_flex_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_rxpmd_flex_field_data,
+};
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_flex_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_rxpmd_flex_field_data,
+    .profile_bmp_cnt = 2,
+    .profile_bmp[0] = 0xfffffffc,
+    .profile_bmp[1] = 0x3,
+
 };
 
-static shr_enum_map_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_flex_reason_names[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT
+static shr_enum_map_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_flex_reason_names[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_reasons_info_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_flex_reasons_info = {
-    .num_reasons = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_FLEX_REASON_COUNT,
-    .reason_names = bcm78800_a0_dna_6_5_30_3_1_rxpmd_flex_reason_names,
-    .reason_encode = bcm78800_a0_dna_6_5_30_3_1_rxpmd_flex_reason_encode,
-    .reason_decode = bcm78800_a0_dna_6_5_30_3_1_rxpmd_flex_reason_decode,
+static bcmpkt_flex_reasons_info_t bcm56690_a0_dna_6_5_31_7_0_rxpmd_flex_reasons_info = {
+    .num_reasons = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_COUNT,
+    .reason_names = bcm56690_a0_dna_6_5_31_7_0_rxpmd_flex_reason_names,
+    .reason_encode = bcm56690_a0_dna_6_5_31_7_0_rxpmd_flex_reason_encode,
+    .reason_decode = bcm56690_a0_dna_6_5_31_7_0_rxpmd_flex_reason_decode,
 };
 
 
@@ -3675,7 +2312,7 @@ static int32_t bcmpkt_arp_t_target_ip_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_arp_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ARP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_arp_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_FID_COUNT] = {
     bcmpkt_arp_t_hardware_len_get,
     bcmpkt_arp_t_hardware_type_get,
     bcmpkt_arp_t_operation_get,
@@ -3687,7 +2324,7 @@ bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_arp_t_fget[BCM78800_A0_DNA_6_
     bcmpkt_arp_t_target_ip_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_arp_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ARP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_arp_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_FID_COUNT] = {
     bcmpkt_arp_t_hardware_len_set,
     bcmpkt_arp_t_hardware_type_set,
     bcmpkt_arp_t_operation_set,
@@ -3699,13 +2336,13 @@ bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_arp_t_fset[BCM78800_A0_DNA_6_
     bcmpkt_arp_t_target_ip_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_arp_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_arp_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_arp_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ARP_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_arp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_arp_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_arp_t_field_data,
 };
 
 
@@ -3802,7 +2439,7 @@ static int32_t bcmpkt_authen_t_spi_set(uint32_t *data, int profile, uint32_t val
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_authen_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_AUTHEN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_authen_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T_FID_COUNT] = {
     bcmpkt_authen_t_data_get,
     bcmpkt_authen_t_next_header_get,
     bcmpkt_authen_t_payload_len_get,
@@ -3811,7 +2448,7 @@ bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_authen_t_fget[BCM78800_A0_DNA
     bcmpkt_authen_t_spi_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_authen_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_AUTHEN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_authen_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T_FID_COUNT] = {
     bcmpkt_authen_t_data_set,
     bcmpkt_authen_t_next_header_set,
     bcmpkt_authen_t_payload_len_set,
@@ -3820,13 +2457,13 @@ bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_authen_t_fset[BCM78800_A0_DNA
     bcmpkt_authen_t_spi_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_authen_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_AUTHEN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_authen_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_authen_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_AUTHEN_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_authen_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_authen_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_authen_t_field_data,
 };
 
 
@@ -4075,7 +2712,7 @@ static int32_t bcmpkt_bfd_t_version_set(uint32_t *data, int profile, uint32_t va
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_bfd_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_bfd_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_FID_COUNT] = {
     bcmpkt_bfd_t_ap_get,
     bcmpkt_bfd_t_bfd_length_get,
     bcmpkt_bfd_t_cpi_get,
@@ -4094,7 +2731,7 @@ bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_bfd_t_fget[BCM78800_A0_DNA_6_
     bcmpkt_bfd_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_bfd_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_bfd_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_FID_COUNT] = {
     bcmpkt_bfd_t_ap_set,
     bcmpkt_bfd_t_bfd_length_set,
     bcmpkt_bfd_t_cpi_set,
@@ -4113,13 +2750,13 @@ bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_bfd_t_fset[BCM78800_A0_DNA_6_
     bcmpkt_bfd_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_bfd_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_bfd_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_bfd_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_BFD_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_bfd_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_bfd_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_bfd_t_field_data,
 };
 
 
@@ -4153,23 +2790,23 @@ static int32_t bcmpkt_cntag_t_tpid_set(uint32_t *data, int profile, uint32_t val
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_cntag_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CNTAG_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_cntag_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CNTAG_T_FID_COUNT] = {
     bcmpkt_cntag_t_rpid_get,
     bcmpkt_cntag_t_tpid_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_cntag_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CNTAG_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_cntag_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CNTAG_T_FID_COUNT] = {
     bcmpkt_cntag_t_rpid_set,
     bcmpkt_cntag_t_tpid_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_cntag_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CNTAG_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_cntag_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CNTAG_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_cntag_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CNTAG_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_cntag_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_cntag_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CNTAG_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_cntag_t_field_data,
 };
 
 
@@ -4285,7 +2922,7 @@ static int32_t bcmpkt_cpu_composites_0_t_dma_cont6_set(uint32_t *data, int profi
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_cpu_composites_0_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_cpu_composites_0_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
     bcmpkt_cpu_composites_0_t_dma_cont0_get,
     bcmpkt_cpu_composites_0_t_dma_cont1_get,
     bcmpkt_cpu_composites_0_t_dma_cont2_get,
@@ -4295,7 +2932,7 @@ bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_cpu_composites_0_t_fget[BCM78
     bcmpkt_cpu_composites_0_t_dma_cont6_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_cpu_composites_0_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_cpu_composites_0_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
     bcmpkt_cpu_composites_0_t_dma_cont0_set,
     bcmpkt_cpu_composites_0_t_dma_cont1_set,
     bcmpkt_cpu_composites_0_t_dma_cont2_set,
@@ -4305,13 +2942,13 @@ bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_cpu_composites_0_t_fset[BCM78
     bcmpkt_cpu_composites_0_t_dma_cont6_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_cpu_composites_0_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_cpu_composites_0_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_cpu_composites_0_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_cpu_composites_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_cpu_composites_0_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_cpu_composites_0_t_field_data,
 };
 
 
@@ -4462,205 +3099,70 @@ static int32_t bcmpkt_cpu_composites_1_t_dma_cont7_set(uint32_t *data, int profi
 static int32_t bcmpkt_cpu_composites_1_t_dma_cont8_get(uint32_t *data, int profile, uint32_t *val) {
     int32_t ret = SHR_E_NONE;
 
-    ret = SHR_E_PARAM;
-
-    return ret;
-}
-
-static int32_t bcmpkt_cpu_composites_1_t_dma_cont8_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    ret = SHR_E_PARAM;
-
-    return ret;
-}
-
-static int32_t bcmpkt_cpu_composites_1_t_dma_cont9_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    ret = SHR_E_PARAM;
-
-    return ret;
-}
-
-static int32_t bcmpkt_cpu_composites_1_t_dma_cont9_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    ret = SHR_E_PARAM;
-
-    return ret;
-}
-
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_cpu_composites_1_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
-    bcmpkt_cpu_composites_1_t_dma_cont10_get,
-    bcmpkt_cpu_composites_1_t_dma_cont11_get,
-    bcmpkt_cpu_composites_1_t_dma_cont12_get,
-    bcmpkt_cpu_composites_1_t_dma_cont13_get,
-    bcmpkt_cpu_composites_1_t_dma_cont14_get,
-    bcmpkt_cpu_composites_1_t_dma_cont15_get,
-    bcmpkt_cpu_composites_1_t_dma_cont16_get,
-    bcmpkt_cpu_composites_1_t_dma_cont17_get,
-    bcmpkt_cpu_composites_1_t_dma_cont7_get,
-    bcmpkt_cpu_composites_1_t_dma_cont8_get,
-    bcmpkt_cpu_composites_1_t_dma_cont9_get,
-};
-
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_cpu_composites_1_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
-    bcmpkt_cpu_composites_1_t_dma_cont10_set,
-    bcmpkt_cpu_composites_1_t_dma_cont11_set,
-    bcmpkt_cpu_composites_1_t_dma_cont12_set,
-    bcmpkt_cpu_composites_1_t_dma_cont13_set,
-    bcmpkt_cpu_composites_1_t_dma_cont14_set,
-    bcmpkt_cpu_composites_1_t_dma_cont15_set,
-    bcmpkt_cpu_composites_1_t_dma_cont16_set,
-    bcmpkt_cpu_composites_1_t_dma_cont17_set,
-    bcmpkt_cpu_composites_1_t_dma_cont7_set,
-    bcmpkt_cpu_composites_1_t_dma_cont8_set,
-    bcmpkt_cpu_composites_1_t_dma_cont9_set,
-};
-
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_cpu_composites_1_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT
-};
-
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_cpu_composites_1_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_cpu_composites_1_t_field_data,
-};
-
-
-static int32_t bcmpkt_dcn_t_flags_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[0], 24, 8);
-
-    return ret;
-}
-
-static int32_t bcmpkt_dcn_t_flags_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[0], 24, 8, val);
-    return ret;
-}
-
-static int32_t bcmpkt_dcn_t_next_protocol_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[1], 0, 8);
-
-    return ret;
-}
-
-static int32_t bcmpkt_dcn_t_next_protocol_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[1], 0, 8, val);
-    return ret;
-}
-
-static int32_t bcmpkt_dcn_t_reserved0_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[0], 16, 8);
-
-    return ret;
-}
-
-static int32_t bcmpkt_dcn_t_reserved0_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[0], 16, 8, val);
-    return ret;
-}
-
-static int32_t bcmpkt_dcn_t_reserved1_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[0], 0, 16);
-
-    return ret;
-}
-
-static int32_t bcmpkt_dcn_t_reserved1_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[0], 0, 16, val);
-    return ret;
-}
-
-static int32_t bcmpkt_dcn_t_reserved2_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[1], 24, 8);
-
-    return ret;
-}
-
-static int32_t bcmpkt_dcn_t_reserved2_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[1], 24, 8, val);
-    return ret;
-}
-
-static int32_t bcmpkt_dcn_t_reserved3_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[1], 16, 8);
+    ret = SHR_E_PARAM;
 
     return ret;
 }
 
-static int32_t bcmpkt_dcn_t_reserved3_set(uint32_t *data, int profile, uint32_t val) {
+static int32_t bcmpkt_cpu_composites_1_t_dma_cont8_set(uint32_t *data, int profile, uint32_t val) {
     int32_t ret = SHR_E_NONE;
 
-    WORD_FIELD_SET(data[1], 16, 8, val);
+    ret = SHR_E_PARAM;
+
     return ret;
 }
 
-static int32_t bcmpkt_dcn_t_reserved4_get(uint32_t *data, int profile, uint32_t *val) {
+static int32_t bcmpkt_cpu_composites_1_t_dma_cont9_get(uint32_t *data, int profile, uint32_t *val) {
     int32_t ret = SHR_E_NONE;
 
-    *val = WORD_FIELD_GET(data[1], 8, 8);
+    ret = SHR_E_PARAM;
 
     return ret;
 }
 
-static int32_t bcmpkt_dcn_t_reserved4_set(uint32_t *data, int profile, uint32_t val) {
+static int32_t bcmpkt_cpu_composites_1_t_dma_cont9_set(uint32_t *data, int profile, uint32_t val) {
     int32_t ret = SHR_E_NONE;
 
-    WORD_FIELD_SET(data[1], 8, 8, val);
+    ret = SHR_E_PARAM;
+
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_dcn_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_DCN_T_FID_COUNT] = {
-    bcmpkt_dcn_t_flags_get,
-    bcmpkt_dcn_t_next_protocol_get,
-    bcmpkt_dcn_t_reserved0_get,
-    bcmpkt_dcn_t_reserved1_get,
-    bcmpkt_dcn_t_reserved2_get,
-    bcmpkt_dcn_t_reserved3_get,
-    bcmpkt_dcn_t_reserved4_get,
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_cpu_composites_1_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
+    bcmpkt_cpu_composites_1_t_dma_cont10_get,
+    bcmpkt_cpu_composites_1_t_dma_cont11_get,
+    bcmpkt_cpu_composites_1_t_dma_cont12_get,
+    bcmpkt_cpu_composites_1_t_dma_cont13_get,
+    bcmpkt_cpu_composites_1_t_dma_cont14_get,
+    bcmpkt_cpu_composites_1_t_dma_cont15_get,
+    bcmpkt_cpu_composites_1_t_dma_cont16_get,
+    bcmpkt_cpu_composites_1_t_dma_cont17_get,
+    bcmpkt_cpu_composites_1_t_dma_cont7_get,
+    bcmpkt_cpu_composites_1_t_dma_cont8_get,
+    bcmpkt_cpu_composites_1_t_dma_cont9_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_dcn_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_DCN_T_FID_COUNT] = {
-    bcmpkt_dcn_t_flags_set,
-    bcmpkt_dcn_t_next_protocol_set,
-    bcmpkt_dcn_t_reserved0_set,
-    bcmpkt_dcn_t_reserved1_set,
-    bcmpkt_dcn_t_reserved2_set,
-    bcmpkt_dcn_t_reserved3_set,
-    bcmpkt_dcn_t_reserved4_set,
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_cpu_composites_1_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
+    bcmpkt_cpu_composites_1_t_dma_cont10_set,
+    bcmpkt_cpu_composites_1_t_dma_cont11_set,
+    bcmpkt_cpu_composites_1_t_dma_cont12_set,
+    bcmpkt_cpu_composites_1_t_dma_cont13_set,
+    bcmpkt_cpu_composites_1_t_dma_cont14_set,
+    bcmpkt_cpu_composites_1_t_dma_cont15_set,
+    bcmpkt_cpu_composites_1_t_dma_cont16_set,
+    bcmpkt_cpu_composites_1_t_dma_cont17_set,
+    bcmpkt_cpu_composites_1_t_dma_cont7_set,
+    bcmpkt_cpu_composites_1_t_dma_cont8_set,
+    bcmpkt_cpu_composites_1_t_dma_cont9_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_dcn_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_DCN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_cpu_composites_1_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_dcn_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_DCN_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_dcn_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_cpu_composites_1_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_cpu_composites_1_t_field_data,
 };
 
 
@@ -4710,25 +3212,25 @@ static int32_t bcmpkt_dest_option_t_option_set(uint32_t *data, int profile, uint
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_dest_option_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_DEST_OPTION_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_dest_option_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_DEST_OPTION_T_FID_COUNT] = {
     bcmpkt_dest_option_t_hdr_ext_len_get,
     bcmpkt_dest_option_t_next_header_get,
     bcmpkt_dest_option_t_option_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_dest_option_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_DEST_OPTION_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_dest_option_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_DEST_OPTION_T_FID_COUNT] = {
     bcmpkt_dest_option_t_hdr_ext_len_set,
     bcmpkt_dest_option_t_next_header_set,
     bcmpkt_dest_option_t_option_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_dest_option_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_DEST_OPTION_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_dest_option_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_DEST_OPTION_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_dest_option_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_DEST_OPTION_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_dest_option_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_dest_option_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_DEST_OPTION_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_dest_option_t_field_data,
 };
 
 
@@ -4914,7 +3416,7 @@ static int32_t bcmpkt_ep_nih_header_t_timestamp_set(uint32_t *data, int profile,
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_ep_nih_header_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_EP_NIH_HEADER_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_ep_nih_header_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT] = {
     bcmpkt_ep_nih_header_t_header_subtype_get,
     bcmpkt_ep_nih_header_t_header_type_get,
     bcmpkt_ep_nih_header_t_opaque_ctrl_a_get,
@@ -4929,7 +3431,7 @@ bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_ep_nih_header_t_fget[BCM78800
     bcmpkt_ep_nih_header_t_timestamp_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_ep_nih_header_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_EP_NIH_HEADER_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_ep_nih_header_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT] = {
     bcmpkt_ep_nih_header_t_header_subtype_set,
     bcmpkt_ep_nih_header_t_header_type_set,
     bcmpkt_ep_nih_header_t_opaque_ctrl_a_set,
@@ -4944,13 +3446,13 @@ bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_ep_nih_header_t_fset[BCM78800
     bcmpkt_ep_nih_header_t_timestamp_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_ep_nih_header_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_EP_NIH_HEADER_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_ep_nih_header_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_ep_nih_header_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_EP_NIH_HEADER_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_ep_nih_header_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_ep_nih_header_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_ep_nih_header_t_field_data,
 };
 
 
@@ -5090,7 +3592,7 @@ static int32_t bcmpkt_erspan3_fixed_hdr_t_vlan_set(uint32_t *data, int profile,
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_erspan3_fixed_hdr_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_erspan3_fixed_hdr_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
     bcmpkt_erspan3_fixed_hdr_t_bso_get,
     bcmpkt_erspan3_fixed_hdr_t_cos_get,
     bcmpkt_erspan3_fixed_hdr_t_gbp_sid_get,
@@ -5102,7 +3604,7 @@ bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_erspan3_fixed_hdr_t_fget[BCM7
     bcmpkt_erspan3_fixed_hdr_t_vlan_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_erspan3_fixed_hdr_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_erspan3_fixed_hdr_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
     bcmpkt_erspan3_fixed_hdr_t_bso_set,
     bcmpkt_erspan3_fixed_hdr_t_cos_set,
     bcmpkt_erspan3_fixed_hdr_t_gbp_sid_set,
@@ -5114,13 +3616,13 @@ bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_erspan3_fixed_hdr_t_fset[BCM7
     bcmpkt_erspan3_fixed_hdr_t_vlan_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_erspan3_fixed_hdr_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_erspan3_fixed_hdr_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_erspan3_fixed_hdr_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_erspan3_fixed_hdr_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_erspan3_fixed_hdr_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_erspan3_fixed_hdr_t_field_data,
 };
 
 
@@ -5185,27 +3687,27 @@ static int32_t bcmpkt_erspan3_subhdr_5_t_timestamp_set(uint32_t *data, int profi
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_erspan3_subhdr_5_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_erspan3_subhdr_5_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
     bcmpkt_erspan3_subhdr_5_t_platform_id_get,
     bcmpkt_erspan3_subhdr_5_t_port_id_get,
     bcmpkt_erspan3_subhdr_5_t_switch_id_get,
     bcmpkt_erspan3_subhdr_5_t_timestamp_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_erspan3_subhdr_5_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_erspan3_subhdr_5_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
     bcmpkt_erspan3_subhdr_5_t_platform_id_set,
     bcmpkt_erspan3_subhdr_5_t_port_id_set,
     bcmpkt_erspan3_subhdr_5_t_switch_id_set,
     bcmpkt_erspan3_subhdr_5_t_timestamp_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_erspan3_subhdr_5_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_erspan3_subhdr_5_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_erspan3_subhdr_5_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_erspan3_subhdr_5_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_erspan3_subhdr_5_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_erspan3_subhdr_5_t_field_data,
 };
 
 
@@ -5286,7 +3788,7 @@ static int32_t bcmpkt_esp_t_spi_set(uint32_t *data, int profile, uint32_t val) {
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_esp_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ESP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_esp_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ESP_T_FID_COUNT] = {
     bcmpkt_esp_t_next_header_get,
     bcmpkt_esp_t_pad_get,
     bcmpkt_esp_t_pad_len_get,
@@ -5294,7 +3796,7 @@ bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_esp_t_fget[BCM78800_A0_DNA_6_
     bcmpkt_esp_t_spi_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_esp_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ESP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_esp_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ESP_T_FID_COUNT] = {
     bcmpkt_esp_t_next_header_set,
     bcmpkt_esp_t_pad_set,
     bcmpkt_esp_t_pad_len_set,
@@ -5302,13 +3804,13 @@ bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_esp_t_fset[BCM78800_A0_DNA_6_
     bcmpkt_esp_t_spi_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_esp_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ESP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_esp_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ESP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_esp_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ESP_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_esp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_esp_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ESP_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_esp_t_field_data,
 };
 
 
@@ -5327,21 +3829,21 @@ static int32_t bcmpkt_ethertype_t_type_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_ethertype_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_ethertype_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
     bcmpkt_ethertype_t_type_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_ethertype_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_ethertype_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
     bcmpkt_ethertype_t_type_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_ethertype_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_ethertype_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_ethertype_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ETHERTYPE_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_ethertype_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_ethertype_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ETHERTYPE_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_ethertype_t_field_data,
 };
 
 
@@ -5406,27 +3908,27 @@ static int32_t bcmpkt_frag_t_reserved_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_frag_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_FRAG_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_frag_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_FRAG_T_FID_COUNT] = {
     bcmpkt_frag_t_frag_info_get,
     bcmpkt_frag_t_id_get,
     bcmpkt_frag_t_next_header_get,
     bcmpkt_frag_t_reserved_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_frag_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_FRAG_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_frag_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_FRAG_T_FID_COUNT] = {
     bcmpkt_frag_t_frag_info_set,
     bcmpkt_frag_t_id_set,
     bcmpkt_frag_t_next_header_set,
     bcmpkt_frag_t_reserved_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_frag_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_FRAG_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_frag_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_FRAG_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_frag_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_FRAG_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_frag_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_frag_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_FRAG_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_frag_t_field_data,
 };
 
 
@@ -5520,7 +4022,7 @@ static int32_t bcmpkt_gbp_ethernet_shim_t_ver_set(uint32_t *data, int profile, u
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_gbp_ethernet_shim_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GBP_ETHERNET_SHIM_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_gbp_ethernet_shim_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GBP_ETHERNET_SHIM_T_FID_COUNT] = {
     bcmpkt_gbp_ethernet_shim_t_ethertype_get,
     bcmpkt_gbp_ethernet_shim_t_flags_get,
     bcmpkt_gbp_ethernet_shim_t_reserved_get,
@@ -5529,7 +4031,7 @@ bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_gbp_ethernet_shim_t_fget[BCM7
     bcmpkt_gbp_ethernet_shim_t_ver_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_gbp_ethernet_shim_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GBP_ETHERNET_SHIM_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_gbp_ethernet_shim_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GBP_ETHERNET_SHIM_T_FID_COUNT] = {
     bcmpkt_gbp_ethernet_shim_t_ethertype_set,
     bcmpkt_gbp_ethernet_shim_t_flags_set,
     bcmpkt_gbp_ethernet_shim_t_reserved_set,
@@ -5538,13 +4040,13 @@ bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_gbp_ethernet_shim_t_fset[BCM7
     bcmpkt_gbp_ethernet_shim_t_ver_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_gbp_ethernet_shim_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GBP_ETHERNET_SHIM_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_gbp_ethernet_shim_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GBP_ETHERNET_SHIM_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_gbp_ethernet_shim_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GBP_ETHERNET_SHIM_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_gbp_ethernet_shim_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_gbp_ethernet_shim_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GBP_ETHERNET_SHIM_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_gbp_ethernet_shim_t_field_data,
 };
 
 
@@ -5773,7 +4275,7 @@ static int32_t bcmpkt_generic_loopback_t_start_byte_set(uint32_t *data, int prof
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_generic_loopback_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_generic_loopback_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
     bcmpkt_generic_loopback_t_destination_obj_get,
     bcmpkt_generic_loopback_t_destination_type_get,
     bcmpkt_generic_loopback_t_entropy_obj_get,
@@ -5791,7 +4293,7 @@ bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_generic_loopback_t_fget[BCM78
     bcmpkt_generic_loopback_t_start_byte_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_generic_loopback_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_generic_loopback_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
     bcmpkt_generic_loopback_t_destination_obj_set,
     bcmpkt_generic_loopback_t_destination_type_set,
     bcmpkt_generic_loopback_t_entropy_obj_set,
@@ -5809,13 +4311,13 @@ bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_generic_loopback_t_fset[BCM78
     bcmpkt_generic_loopback_t_start_byte_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_generic_loopback_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_generic_loopback_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_generic_loopback_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_generic_loopback_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_generic_loopback_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_generic_loopback_t_field_data,
 };
 
 
@@ -5894,7 +4396,7 @@ static int32_t bcmpkt_gpe_t_vni_set(uint32_t *data, int profile, uint32_t val) {
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_gpe_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GPE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_gpe_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GPE_T_FID_COUNT] = {
     bcmpkt_gpe_t_flags_get,
     bcmpkt_gpe_t_next_protocol_get,
     bcmpkt_gpe_t_reserved0_get,
@@ -5902,7 +4404,7 @@ bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_gpe_t_fget[BCM78800_A0_DNA_6_
     bcmpkt_gpe_t_vni_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_gpe_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GPE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_gpe_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GPE_T_FID_COUNT] = {
     bcmpkt_gpe_t_flags_set,
     bcmpkt_gpe_t_next_protocol_set,
     bcmpkt_gpe_t_reserved0_set,
@@ -5910,13 +4412,13 @@ bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_gpe_t_fset[BCM78800_A0_DNA_6_
     bcmpkt_gpe_t_vni_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_gpe_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GPE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_gpe_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GPE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_gpe_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GPE_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_gpe_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_gpe_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GPE_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_gpe_t_field_data,
 };
 
 
@@ -5950,23 +4452,23 @@ static int32_t bcmpkt_gre_chksum_t_offset_set(uint32_t *data, int profile, uint3
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_gre_chksum_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_CHKSUM_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_gre_chksum_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT] = {
     bcmpkt_gre_chksum_t_checksum_get,
     bcmpkt_gre_chksum_t_offset_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_gre_chksum_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_CHKSUM_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_gre_chksum_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT] = {
     bcmpkt_gre_chksum_t_checksum_set,
     bcmpkt_gre_chksum_t_offset_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_gre_chksum_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_CHKSUM_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_gre_chksum_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_CHKSUM_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_gre_chksum_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_CHKSUM_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_gre_chksum_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_gre_chksum_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_gre_chksum_t_field_data,
 };
 
 
@@ -5986,21 +4488,21 @@ static int32_t bcmpkt_gre_key_t_key_set(uint32_t *data, int profile, uint32_t va
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_gre_key_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_KEY_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_gre_key_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_KEY_T_FID_COUNT] = {
     bcmpkt_gre_key_t_key_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_gre_key_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_KEY_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_gre_key_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_KEY_T_FID_COUNT] = {
     bcmpkt_gre_key_t_key_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_gre_key_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_KEY_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_gre_key_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_KEY_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_gre_key_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_KEY_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_gre_key_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_gre_key_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_KEY_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_gre_key_t_field_data,
 };
 
 
@@ -6020,21 +4522,21 @@ static int32_t bcmpkt_gre_rout_t_routing_set(uint32_t *data, int profile, uint32
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_gre_rout_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_ROUT_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_gre_rout_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_ROUT_T_FID_COUNT] = {
     bcmpkt_gre_rout_t_routing_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_gre_rout_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_ROUT_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_gre_rout_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_ROUT_T_FID_COUNT] = {
     bcmpkt_gre_rout_t_routing_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_gre_rout_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_ROUT_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_gre_rout_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_ROUT_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_gre_rout_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_ROUT_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_gre_rout_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_gre_rout_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_ROUT_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_gre_rout_t_field_data,
 };
 
 
@@ -6054,21 +4556,21 @@ static int32_t bcmpkt_gre_seq_t_sequence_set(uint32_t *data, int profile, uint32
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_gre_seq_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_SEQ_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_gre_seq_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_SEQ_T_FID_COUNT] = {
     bcmpkt_gre_seq_t_sequence_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_gre_seq_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_SEQ_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_gre_seq_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_SEQ_T_FID_COUNT] = {
     bcmpkt_gre_seq_t_sequence_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_gre_seq_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_SEQ_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_gre_seq_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_SEQ_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_gre_seq_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_SEQ_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_gre_seq_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_gre_seq_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_SEQ_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_gre_seq_t_field_data,
 };
 
 
@@ -6132,27 +4634,27 @@ static int32_t bcmpkt_gre_t_version_set(uint32_t *data, int profile, uint32_t va
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_gre_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_gre_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_T_FID_COUNT] = {
     bcmpkt_gre_t_c_r_k_s_get,
     bcmpkt_gre_t_protocol_get,
     bcmpkt_gre_t_reserved_get,
     bcmpkt_gre_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_gre_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_gre_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_T_FID_COUNT] = {
     bcmpkt_gre_t_c_r_k_s_set,
     bcmpkt_gre_t_protocol_set,
     bcmpkt_gre_t_reserved_set,
     bcmpkt_gre_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_gre_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_gre_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_gre_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_GRE_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_gre_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_gre_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_GRE_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_gre_t_field_data,
 };
 
 
@@ -6351,7 +4853,7 @@ static int32_t bcmpkt_hg3_base_t_version_set(uint32_t *data, int profile, uint32
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_hg3_base_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_hg3_base_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_FID_COUNT] = {
     bcmpkt_hg3_base_t_cn_get,
     bcmpkt_hg3_base_t_cng_get,
     bcmpkt_hg3_base_t_entropy_get,
@@ -6367,7 +4869,7 @@ bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_hg3_base_t_fget[BCM78800_A0_D
     bcmpkt_hg3_base_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_hg3_base_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_hg3_base_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_FID_COUNT] = {
     bcmpkt_hg3_base_t_cn_set,
     bcmpkt_hg3_base_t_cng_set,
     bcmpkt_hg3_base_t_entropy_set,
@@ -6383,13 +4885,13 @@ bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_hg3_base_t_fset[BCM78800_A0_D
     bcmpkt_hg3_base_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_hg3_base_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_hg3_base_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_hg3_base_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_BASE_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_hg3_base_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_hg3_base_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_hg3_base_t_field_data,
 };
 
 
@@ -6483,7 +4985,7 @@ static int32_t bcmpkt_hg3_extension_0_t_svp_set(uint32_t *data, int profile, uin
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_hg3_extension_0_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_hg3_extension_0_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT] = {
     bcmpkt_hg3_extension_0_t_class_id_lsb_get,
     bcmpkt_hg3_extension_0_t_class_id_msb_get,
     bcmpkt_hg3_extension_0_t_dvp_or_l3_iif_get,
@@ -6492,7 +4994,7 @@ bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_hg3_extension_0_t_fget[BCM788
     bcmpkt_hg3_extension_0_t_svp_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_hg3_extension_0_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_hg3_extension_0_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT] = {
     bcmpkt_hg3_extension_0_t_class_id_lsb_set,
     bcmpkt_hg3_extension_0_t_class_id_msb_set,
     bcmpkt_hg3_extension_0_t_dvp_or_l3_iif_set,
@@ -6501,13 +5003,13 @@ bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_hg3_extension_0_t_fset[BCM788
     bcmpkt_hg3_extension_0_t_svp_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_hg3_extension_0_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_EXTENSION_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_hg3_extension_0_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_hg3_extension_0_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_hg3_extension_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_hg3_extension_0_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_hg3_extension_0_t_field_data,
 };
 
 
@@ -6557,25 +5059,25 @@ static int32_t bcmpkt_hop_by_hop_t_option_set(uint32_t *data, int profile, uint3
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_hop_by_hop_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HOP_BY_HOP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_hop_by_hop_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT] = {
     bcmpkt_hop_by_hop_t_hdr_ext_len_get,
     bcmpkt_hop_by_hop_t_next_header_get,
     bcmpkt_hop_by_hop_t_option_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_hop_by_hop_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HOP_BY_HOP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_hop_by_hop_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT] = {
     bcmpkt_hop_by_hop_t_hdr_ext_len_set,
     bcmpkt_hop_by_hop_t_next_header_set,
     bcmpkt_hop_by_hop_t_option_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_hop_by_hop_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HOP_BY_HOP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_hop_by_hop_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HOP_BY_HOP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_hop_by_hop_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_HOP_BY_HOP_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_hop_by_hop_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_hop_by_hop_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_hop_by_hop_t_field_data,
 };
 
 
@@ -6624,25 +5126,25 @@ static int32_t bcmpkt_icmp_t_icmp_type_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_icmp_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ICMP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_icmp_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ICMP_T_FID_COUNT] = {
     bcmpkt_icmp_t_checksum_get,
     bcmpkt_icmp_t_code_get,
     bcmpkt_icmp_t_icmp_type_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_icmp_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ICMP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_icmp_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ICMP_T_FID_COUNT] = {
     bcmpkt_icmp_t_checksum_set,
     bcmpkt_icmp_t_code_set,
     bcmpkt_icmp_t_icmp_type_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_icmp_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_icmp_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_icmp_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ICMP_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_icmp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_icmp_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ICMP_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_icmp_t_field_data,
 };
 
 
@@ -6721,7 +5223,7 @@ static int32_t bcmpkt_ifa_header_t_ver_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_ifa_header_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_HEADER_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_ifa_header_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_HEADER_T_FID_COUNT] = {
     bcmpkt_ifa_header_t_flags_get,
     bcmpkt_ifa_header_t_gns_get,
     bcmpkt_ifa_header_t_max_length_get,
@@ -6729,7 +5231,7 @@ bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_ifa_header_t_fget[BCM78800_A0
     bcmpkt_ifa_header_t_ver_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_ifa_header_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_HEADER_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_ifa_header_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_HEADER_T_FID_COUNT] = {
     bcmpkt_ifa_header_t_flags_set,
     bcmpkt_ifa_header_t_gns_set,
     bcmpkt_ifa_header_t_max_length_set,
@@ -6737,13 +5239,13 @@ bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_ifa_header_t_fset[BCM78800_A0
     bcmpkt_ifa_header_t_ver_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_ifa_header_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_HEADER_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_ifa_header_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_HEADER_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_ifa_header_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_HEADER_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_ifa_header_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_ifa_header_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_HEADER_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_ifa_header_t_field_data,
 };
 
 
@@ -6837,7 +5339,7 @@ static int32_t bcmpkt_ifa_metadata_a_t_rx_timestamp_sec_set(uint32_t *data, int
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_ifa_metadata_a_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_A_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_ifa_metadata_a_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_A_T_FID_COUNT] = {
     bcmpkt_ifa_metadata_a_t_cn_get,
     bcmpkt_ifa_metadata_a_t_fwd_hdr_ttl_get,
     bcmpkt_ifa_metadata_a_t_lns_device_id_get,
@@ -6846,7 +5348,7 @@ bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_ifa_metadata_a_t_fget[BCM7880
     bcmpkt_ifa_metadata_a_t_rx_timestamp_sec_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_ifa_metadata_a_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_A_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_ifa_metadata_a_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_A_T_FID_COUNT] = {
     bcmpkt_ifa_metadata_a_t_cn_set,
     bcmpkt_ifa_metadata_a_t_fwd_hdr_ttl_set,
     bcmpkt_ifa_metadata_a_t_lns_device_id_set,
@@ -6855,13 +5357,13 @@ bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_ifa_metadata_a_t_fset[BCM7880
     bcmpkt_ifa_metadata_a_t_rx_timestamp_sec_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_ifa_metadata_a_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_A_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_ifa_metadata_a_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_A_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_ifa_metadata_a_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_A_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_ifa_metadata_a_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_ifa_metadata_a_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_A_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_ifa_metadata_a_t_field_data,
 };
 
 
@@ -6975,7 +5477,7 @@ static int32_t bcmpkt_ifa_metadata_b_t_tx_queue_byte_count_set(uint32_t *data, i
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_ifa_metadata_b_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_B_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_ifa_metadata_b_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_B_T_FID_COUNT] = {
     bcmpkt_ifa_metadata_b_t_egress_port_id_get,
     bcmpkt_ifa_metadata_b_t_ingress_port_id_get,
     bcmpkt_ifa_metadata_b_t_mmu_stat_0_get,
@@ -6985,7 +5487,7 @@ bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_ifa_metadata_b_t_fget[BCM7880
     bcmpkt_ifa_metadata_b_t_tx_queue_byte_count_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_ifa_metadata_b_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_B_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_ifa_metadata_b_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_B_T_FID_COUNT] = {
     bcmpkt_ifa_metadata_b_t_egress_port_id_set,
     bcmpkt_ifa_metadata_b_t_ingress_port_id_set,
     bcmpkt_ifa_metadata_b_t_mmu_stat_0_set,
@@ -6995,13 +5497,13 @@ bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_ifa_metadata_b_t_fset[BCM7880
     bcmpkt_ifa_metadata_b_t_tx_queue_byte_count_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_ifa_metadata_b_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_B_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_ifa_metadata_b_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_B_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_ifa_metadata_b_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_B_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_ifa_metadata_b_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_ifa_metadata_b_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_B_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_ifa_metadata_b_t_field_data,
 };
 
 
@@ -7050,25 +5552,25 @@ static int32_t bcmpkt_ifa_metadata_base_t_request_vector_set(uint32_t *data, int
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_ifa_metadata_base_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_BASE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_ifa_metadata_base_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_BASE_T_FID_COUNT] = {
     bcmpkt_ifa_metadata_base_t_action_vector_get,
     bcmpkt_ifa_metadata_base_t_hop_limit_current_length_get,
     bcmpkt_ifa_metadata_base_t_request_vector_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_ifa_metadata_base_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_BASE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_ifa_metadata_base_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_BASE_T_FID_COUNT] = {
     bcmpkt_ifa_metadata_base_t_action_vector_set,
     bcmpkt_ifa_metadata_base_t_hop_limit_current_length_set,
     bcmpkt_ifa_metadata_base_t_request_vector_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_ifa_metadata_base_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_BASE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_ifa_metadata_base_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_BASE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_ifa_metadata_base_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IFA_METADATA_BASE_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_ifa_metadata_base_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_ifa_metadata_base_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_BASE_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_ifa_metadata_base_t_field_data,
 };
 
 
@@ -7133,27 +5635,27 @@ static int32_t bcmpkt_igmp_t_max_resp_time_set(uint32_t *data, int profile, uint
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_igmp_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IGMP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_igmp_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IGMP_T_FID_COUNT] = {
     bcmpkt_igmp_t_checksum_get,
     bcmpkt_igmp_t_group_address_get,
     bcmpkt_igmp_t_igmp_type_get,
     bcmpkt_igmp_t_max_resp_time_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_igmp_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IGMP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_igmp_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IGMP_T_FID_COUNT] = {
     bcmpkt_igmp_t_checksum_set,
     bcmpkt_igmp_t_group_address_set,
     bcmpkt_igmp_t_igmp_type_set,
     bcmpkt_igmp_t_max_resp_time_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_igmp_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IGMP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_igmp_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IGMP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_igmp_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IGMP_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_igmp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_igmp_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IGMP_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_igmp_t_field_data,
 };
 
 
@@ -7263,7 +5765,7 @@ static int32_t bcmpkt_ioam_e2e_t_type_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_ioam_e2e_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IOAM_E2E_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_ioam_e2e_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IOAM_E2E_T_FID_COUNT] = {
     bcmpkt_ioam_e2e_t_ioam_e2e_data_get,
     bcmpkt_ioam_e2e_t_ioam_e2e_type_get,
     bcmpkt_ioam_e2e_t_ioam_hdr_len_get,
@@ -7273,7 +5775,7 @@ bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_ioam_e2e_t_fget[BCM78800_A0_D
     bcmpkt_ioam_e2e_t_type_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_ioam_e2e_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IOAM_E2E_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_ioam_e2e_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IOAM_E2E_T_FID_COUNT] = {
     bcmpkt_ioam_e2e_t_ioam_e2e_data_set,
     bcmpkt_ioam_e2e_t_ioam_e2e_type_set,
     bcmpkt_ioam_e2e_t_ioam_hdr_len_set,
@@ -7283,13 +5785,13 @@ bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_ioam_e2e_t_fset[BCM78800_A0_D
     bcmpkt_ioam_e2e_t_type_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_ioam_e2e_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IOAM_E2E_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_ioam_e2e_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IOAM_E2E_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_ioam_e2e_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IOAM_E2E_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_ioam_e2e_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_ioam_e2e_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IOAM_E2E_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_ioam_e2e_t_field_data,
 };
 
 
@@ -7371,7 +5873,7 @@ static int32_t bcmpkt_ipfix_t_version_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_ipfix_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPFIX_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_ipfix_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPFIX_T_FID_COUNT] = {
     bcmpkt_ipfix_t_export_time_get,
     bcmpkt_ipfix_t_length_get,
     bcmpkt_ipfix_t_obs_domain_id_get,
@@ -7379,7 +5881,7 @@ bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_ipfix_t_fget[BCM78800_A0_DNA_
     bcmpkt_ipfix_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_ipfix_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPFIX_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_ipfix_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPFIX_T_FID_COUNT] = {
     bcmpkt_ipfix_t_export_time_set,
     bcmpkt_ipfix_t_length_set,
     bcmpkt_ipfix_t_obs_domain_id_set,
@@ -7387,13 +5889,13 @@ bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_ipfix_t_fset[BCM78800_A0_DNA_
     bcmpkt_ipfix_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_ipfix_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_ipfix_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_ipfix_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPFIX_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_ipfix_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_ipfix_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPFIX_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_ipfix_t_field_data,
 };
 
 
@@ -7565,7 +6067,7 @@ static int32_t bcmpkt_ipv4_t_version_hdr_len_set(uint32_t *data, int profile, ui
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_ipv4_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV4_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_ipv4_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_FID_COUNT] = {
     bcmpkt_ipv4_t_da_get,
     bcmpkt_ipv4_t_flags_frag_offset_get,
     bcmpkt_ipv4_t_hdr_checksum_get,
@@ -7579,7 +6081,7 @@ bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_ipv4_t_fget[BCM78800_A0_DNA_6
     bcmpkt_ipv4_t_version_hdr_len_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_ipv4_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV4_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_ipv4_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_FID_COUNT] = {
     bcmpkt_ipv4_t_da_set,
     bcmpkt_ipv4_t_flags_frag_offset_set,
     bcmpkt_ipv4_t_hdr_checksum_set,
@@ -7593,13 +6095,13 @@ bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_ipv4_t_fset[BCM78800_A0_DNA_6
     bcmpkt_ipv4_t_version_hdr_len_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_ipv4_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_ipv4_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_ipv4_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV4_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_ipv4_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_ipv4_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_ipv4_t_field_data,
 };
 
 
@@ -7725,7 +6227,7 @@ static int32_t bcmpkt_ipv6_t_version_set(uint32_t *data, int profile, uint32_t v
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_ipv6_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV6_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_ipv6_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_FID_COUNT] = {
     bcmpkt_ipv6_t_da_get,
     bcmpkt_ipv6_t_flow_label_get,
     bcmpkt_ipv6_t_hop_limit_get,
@@ -7736,7 +6238,7 @@ bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_ipv6_t_fget[BCM78800_A0_DNA_6
     bcmpkt_ipv6_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_ipv6_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV6_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_ipv6_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_FID_COUNT] = {
     bcmpkt_ipv6_t_da_set,
     bcmpkt_ipv6_t_flow_label_set,
     bcmpkt_ipv6_t_hop_limit_set,
@@ -7747,13 +6249,13 @@ bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_ipv6_t_fset[BCM78800_A0_DNA_6
     bcmpkt_ipv6_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_ipv6_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_ipv6_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_ipv6_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_IPV6_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_ipv6_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_ipv6_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_ipv6_t_field_data,
 };
 
 
@@ -7789,23 +6291,23 @@ static int32_t bcmpkt_l2_t_macsa_set(uint32_t *data, int profile, uint32_t val)
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_l2_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_L2_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_l2_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_L2_T_FID_COUNT] = {
     bcmpkt_l2_t_macda_get,
     bcmpkt_l2_t_macsa_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_l2_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_L2_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_l2_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_L2_T_FID_COUNT] = {
     bcmpkt_l2_t_macda_set,
     bcmpkt_l2_t_macsa_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_l2_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_L2_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_l2_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_L2_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_l2_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_L2_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_l2_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_l2_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_L2_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_l2_t_field_data,
 };
 
 
@@ -7825,21 +6327,21 @@ static int32_t bcmpkt_mirror_erspan_sn_t_seq_num_set(uint32_t *data, int profile
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_mirror_erspan_sn_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_mirror_erspan_sn_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
     bcmpkt_mirror_erspan_sn_t_seq_num_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_mirror_erspan_sn_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_mirror_erspan_sn_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
     bcmpkt_mirror_erspan_sn_t_seq_num_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_mirror_erspan_sn_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_mirror_erspan_sn_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_mirror_erspan_sn_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_mirror_erspan_sn_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_mirror_erspan_sn_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_mirror_erspan_sn_t_field_data,
 };
 
 
@@ -7859,21 +6361,21 @@ static int32_t bcmpkt_mirror_transport_t_data_set(uint32_t *data, int profile, u
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_mirror_transport_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_mirror_transport_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
     bcmpkt_mirror_transport_t_data_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_mirror_transport_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_mirror_transport_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
     bcmpkt_mirror_transport_t_data_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_mirror_transport_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_mirror_transport_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_mirror_transport_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_mirror_transport_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_mirror_transport_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_mirror_transport_t_field_data,
 };
 
 
@@ -7937,27 +6439,27 @@ static int32_t bcmpkt_mpls_ach_t_version_set(uint32_t *data, int profile, uint32
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_mpls_ach_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_ACH_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_mpls_ach_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_ACH_T_FID_COUNT] = {
     bcmpkt_mpls_ach_t_channel_type_get,
     bcmpkt_mpls_ach_t_cw_type_get,
     bcmpkt_mpls_ach_t_reserved_get,
     bcmpkt_mpls_ach_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_mpls_ach_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_ACH_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_mpls_ach_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_ACH_T_FID_COUNT] = {
     bcmpkt_mpls_ach_t_channel_type_set,
     bcmpkt_mpls_ach_t_cw_type_set,
     bcmpkt_mpls_ach_t_reserved_set,
     bcmpkt_mpls_ach_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_mpls_ach_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_ACH_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_mpls_ach_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_ACH_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_mpls_ach_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_ACH_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_mpls_ach_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_mpls_ach_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_ACH_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_mpls_ach_t_field_data,
 };
 
 
@@ -7977,21 +6479,21 @@ static int32_t bcmpkt_mpls_bv_t_value_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_mpls_bv_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_BV_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_mpls_bv_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_BV_T_FID_COUNT] = {
     bcmpkt_mpls_bv_t_value_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_mpls_bv_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_BV_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_mpls_bv_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_BV_T_FID_COUNT] = {
     bcmpkt_mpls_bv_t_value_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_mpls_bv_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_BV_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_mpls_bv_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_BV_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_mpls_bv_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_BV_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_mpls_bv_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_mpls_bv_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_BV_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_mpls_bv_t_field_data,
 };
 
 
@@ -8040,25 +6542,25 @@ static int32_t bcmpkt_mpls_cw_t_seq_number_set(uint32_t *data, int profile, uint
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_mpls_cw_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_CW_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_mpls_cw_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_CW_T_FID_COUNT] = {
     bcmpkt_mpls_cw_t_cw_type_get,
     bcmpkt_mpls_cw_t_reserved_get,
     bcmpkt_mpls_cw_t_seq_number_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_mpls_cw_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_CW_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_mpls_cw_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_CW_T_FID_COUNT] = {
     bcmpkt_mpls_cw_t_cw_type_set,
     bcmpkt_mpls_cw_t_reserved_set,
     bcmpkt_mpls_cw_t_seq_number_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_mpls_cw_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_CW_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_mpls_cw_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_CW_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_mpls_cw_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_CW_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_mpls_cw_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_mpls_cw_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_CW_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_mpls_cw_t_field_data,
 };
 
 
@@ -8122,27 +6624,27 @@ static int32_t bcmpkt_mpls_t_ttl_set(uint32_t *data, int profile, uint32_t val)
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_mpls_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_mpls_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_T_FID_COUNT] = {
     bcmpkt_mpls_t_bos_get,
     bcmpkt_mpls_t_exp_get,
     bcmpkt_mpls_t_label_get,
     bcmpkt_mpls_t_ttl_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_mpls_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_mpls_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_T_FID_COUNT] = {
     bcmpkt_mpls_t_bos_set,
     bcmpkt_mpls_t_exp_set,
     bcmpkt_mpls_t_label_set,
     bcmpkt_mpls_t_ttl_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_mpls_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_mpls_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_mpls_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_MPLS_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_mpls_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_mpls_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_mpls_t_field_data,
 };
 
 
@@ -8359,7 +6861,7 @@ static int32_t bcmpkt_p_1588_t_version_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_p_1588_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_P_1588_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_p_1588_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_FID_COUNT] = {
     bcmpkt_p_1588_t_cntrl_get,
     bcmpkt_p_1588_t_correction_get,
     bcmpkt_p_1588_t_domain_nb_get,
@@ -8376,7 +6878,7 @@ bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_p_1588_t_fget[BCM78800_A0_DNA
     bcmpkt_p_1588_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_p_1588_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_P_1588_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_p_1588_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_FID_COUNT] = {
     bcmpkt_p_1588_t_cntrl_set,
     bcmpkt_p_1588_t_correction_set,
     bcmpkt_p_1588_t_domain_nb_set,
@@ -8393,13 +6895,13 @@ bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_p_1588_t_fset[BCM78800_A0_DNA
     bcmpkt_p_1588_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_p_1588_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_P_1588_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_p_1588_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_p_1588_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_P_1588_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_p_1588_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_p_1588_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_p_1588_t_field_data,
 };
 
 
@@ -8449,25 +6951,25 @@ static int32_t bcmpkt_prog_ext_hdr_t_option_set(uint32_t *data, int profile, uin
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_prog_ext_hdr_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PROG_EXT_HDR_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_prog_ext_hdr_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT] = {
     bcmpkt_prog_ext_hdr_t_hdr_ext_len_get,
     bcmpkt_prog_ext_hdr_t_next_header_get,
     bcmpkt_prog_ext_hdr_t_option_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_prog_ext_hdr_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PROG_EXT_HDR_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_prog_ext_hdr_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT] = {
     bcmpkt_prog_ext_hdr_t_hdr_ext_len_set,
     bcmpkt_prog_ext_hdr_t_next_header_set,
     bcmpkt_prog_ext_hdr_t_option_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_prog_ext_hdr_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PROG_EXT_HDR_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_prog_ext_hdr_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PROG_EXT_HDR_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_prog_ext_hdr_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PROG_EXT_HDR_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_prog_ext_hdr_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_prog_ext_hdr_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_prog_ext_hdr_t_field_data,
 };
 
 
@@ -8563,7 +7065,7 @@ static int32_t bcmpkt_psamp_0_t_template_id_set(uint32_t *data, int profile, uin
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_psamp_0_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_psamp_0_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T_FID_COUNT] = {
     bcmpkt_psamp_0_t_flowset_get,
     bcmpkt_psamp_0_t_length_get,
     bcmpkt_psamp_0_t_next_hop_index_get,
@@ -8572,7 +7074,7 @@ bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_psamp_0_t_fget[BCM78800_A0_DN
     bcmpkt_psamp_0_t_template_id_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_psamp_0_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_psamp_0_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T_FID_COUNT] = {
     bcmpkt_psamp_0_t_flowset_set,
     bcmpkt_psamp_0_t_length_set,
     bcmpkt_psamp_0_t_next_hop_index_set,
@@ -8581,13 +7083,13 @@ bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_psamp_0_t_fset[BCM78800_A0_DN
     bcmpkt_psamp_0_t_template_id_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_psamp_0_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_psamp_0_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_psamp_0_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_0_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_psamp_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_psamp_0_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_psamp_0_t_field_data,
 };
 
 
@@ -8696,7 +7198,7 @@ static int32_t bcmpkt_psamp_1_t_variable_flag_set(uint32_t *data, int profile, u
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_psamp_1_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_1_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_psamp_1_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_FID_COUNT] = {
     bcmpkt_psamp_1_t_dlb_id_get,
     bcmpkt_psamp_1_t_egress_port_get,
     bcmpkt_psamp_1_t_epoch_get,
@@ -8706,7 +7208,7 @@ bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_psamp_1_t_fget[BCM78800_A0_DN
     bcmpkt_psamp_1_t_variable_flag_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_psamp_1_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_1_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_psamp_1_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_FID_COUNT] = {
     bcmpkt_psamp_1_t_dlb_id_set,
     bcmpkt_psamp_1_t_egress_port_set,
     bcmpkt_psamp_1_t_epoch_set,
@@ -8716,13 +7218,13 @@ bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_psamp_1_t_fset[BCM78800_A0_DN
     bcmpkt_psamp_1_t_variable_flag_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_psamp_1_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_1_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_psamp_1_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_psamp_1_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_1_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_psamp_1_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_psamp_1_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_psamp_1_t_field_data,
 };
 
 
@@ -8834,7 +7336,7 @@ static int32_t bcmpkt_psamp_mirror_on_drop_0_t_template_id_set(uint32_t *data, i
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_psamp_mirror_on_drop_0_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_psamp_mirror_on_drop_0_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_0_t_egress_mod_port_get,
     bcmpkt_psamp_mirror_on_drop_0_t_ingress_port_get,
     bcmpkt_psamp_mirror_on_drop_0_t_length_get,
@@ -8844,7 +7346,7 @@ bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_psamp_mirror_on_drop_0_t_fget
     bcmpkt_psamp_mirror_on_drop_0_t_template_id_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_psamp_mirror_on_drop_0_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_psamp_mirror_on_drop_0_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_0_t_egress_mod_port_set,
     bcmpkt_psamp_mirror_on_drop_0_t_ingress_port_set,
     bcmpkt_psamp_mirror_on_drop_0_t_length_set,
@@ -8854,13 +7356,13 @@ bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_psamp_mirror_on_drop_0_t_fset
     bcmpkt_psamp_mirror_on_drop_0_t_template_id_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_psamp_mirror_on_drop_0_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_psamp_mirror_on_drop_0_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_psamp_mirror_on_drop_0_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_psamp_mirror_on_drop_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_psamp_mirror_on_drop_0_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_psamp_mirror_on_drop_0_t_field_data,
 };
 
 
@@ -8969,325 +7471,33 @@ static int32_t bcmpkt_psamp_mirror_on_drop_3_t_var_len_indicator_set(uint32_t *d
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_psamp_mirror_on_drop_3_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_psamp_mirror_on_drop_3_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_3_t_drop_reason_get,
     bcmpkt_psamp_mirror_on_drop_3_t_reserved_0_get,
     bcmpkt_psamp_mirror_on_drop_3_t_sampled_length_get,
     bcmpkt_psamp_mirror_on_drop_3_t_smod_state_get,
     bcmpkt_psamp_mirror_on_drop_3_t_uc_cos__color__prob_idx_get,
     bcmpkt_psamp_mirror_on_drop_3_t_user_meta_data_get,
-    bcmpkt_psamp_mirror_on_drop_3_t_var_len_indicator_get,
-};
-
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_psamp_mirror_on_drop_3_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT] = {
-    bcmpkt_psamp_mirror_on_drop_3_t_drop_reason_set,
-    bcmpkt_psamp_mirror_on_drop_3_t_reserved_0_set,
-    bcmpkt_psamp_mirror_on_drop_3_t_sampled_length_set,
-    bcmpkt_psamp_mirror_on_drop_3_t_smod_state_set,
-    bcmpkt_psamp_mirror_on_drop_3_t_uc_cos__color__prob_idx_set,
-    bcmpkt_psamp_mirror_on_drop_3_t_user_meta_data_set,
-    bcmpkt_psamp_mirror_on_drop_3_t_var_len_indicator_set,
-};
-
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_psamp_mirror_on_drop_3_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FIELD_NAME_MAP_INIT
-};
-
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_psamp_mirror_on_drop_3_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_psamp_mirror_on_drop_3_t_field_data,
-};
-
-
-static int32_t bcmpkt_psamp_postcard_0_t_egress_mod_port_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[3], 0, 16);
-
-    return ret;
-}
-
-static int32_t bcmpkt_psamp_postcard_0_t_egress_mod_port_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[3], 0, 16, val);
-    return ret;
-}
-
-static int32_t bcmpkt_psamp_postcard_0_t_ingress_port_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[3], 16, 16);
-
-    return ret;
-}
-
-static int32_t bcmpkt_psamp_postcard_0_t_ingress_port_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[3], 16, 16, val);
-    return ret;
-}
-
-static int32_t bcmpkt_psamp_postcard_0_t_obs_time_ns_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    ret = SHR_E_PARAM;
-
-    return ret;
-}
-
-static int32_t bcmpkt_psamp_postcard_0_t_obs_time_ns_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    ret = SHR_E_PARAM;
-
-    return ret;
-}
-
-static int32_t bcmpkt_psamp_postcard_0_t_obs_time_s_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    ret = SHR_E_PARAM;
-
-    return ret;
-}
-
-static int32_t bcmpkt_psamp_postcard_0_t_obs_time_s_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    ret = SHR_E_PARAM;
-
-    return ret;
-}
-
-static int32_t bcmpkt_psamp_postcard_0_t_psamp_length_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[0], 0, 16);
-
-    return ret;
-}
-
-static int32_t bcmpkt_psamp_postcard_0_t_psamp_length_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[0], 0, 16, val);
-    return ret;
-}
-
-static int32_t bcmpkt_psamp_postcard_0_t_template_id_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[0], 16, 16);
-
-    return ret;
-}
-
-static int32_t bcmpkt_psamp_postcard_0_t_template_id_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[0], 16, 16, val);
-    return ret;
-}
-
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_psamp_postcard_0_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_0_T_FID_COUNT] = {
-    bcmpkt_psamp_postcard_0_t_egress_mod_port_get,
-    bcmpkt_psamp_postcard_0_t_ingress_port_get,
-    bcmpkt_psamp_postcard_0_t_obs_time_ns_get,
-    bcmpkt_psamp_postcard_0_t_obs_time_s_get,
-    bcmpkt_psamp_postcard_0_t_psamp_length_get,
-    bcmpkt_psamp_postcard_0_t_template_id_get,
-};
-
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_psamp_postcard_0_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_0_T_FID_COUNT] = {
-    bcmpkt_psamp_postcard_0_t_egress_mod_port_set,
-    bcmpkt_psamp_postcard_0_t_ingress_port_set,
-    bcmpkt_psamp_postcard_0_t_obs_time_ns_set,
-    bcmpkt_psamp_postcard_0_t_obs_time_s_set,
-    bcmpkt_psamp_postcard_0_t_psamp_length_set,
-    bcmpkt_psamp_postcard_0_t_template_id_set,
-};
-
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_psamp_postcard_0_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_0_T_FIELD_NAME_MAP_INIT
-};
-
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_psamp_postcard_0_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_0_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_psamp_postcard_0_t_field_data,
-};
-
-
-static int32_t bcmpkt_psamp_postcard_1_t_color_idx_cos_droploc_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[0], 16, 16);
-
-    return ret;
-}
-
-static int32_t bcmpkt_psamp_postcard_1_t_color_idx_cos_droploc_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[0], 16, 16, val);
-    return ret;
-}
-
-static int32_t bcmpkt_psamp_postcard_1_t_drop_reason_code_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[0], 8, 8);
-
-    return ret;
-}
-
-static int32_t bcmpkt_psamp_postcard_1_t_drop_reason_code_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[0], 8, 8, val);
-    return ret;
-}
-
-static int32_t bcmpkt_psamp_postcard_1_t_mmu_stat_0_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    ret = SHR_E_PARAM;
-
-    return ret;
-}
-
-static int32_t bcmpkt_psamp_postcard_1_t_mmu_stat_0_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    ret = SHR_E_PARAM;
-
-    return ret;
-}
-
-static int32_t bcmpkt_psamp_postcard_1_t_mmu_stat_1_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    ret = SHR_E_PARAM;
-
-    return ret;
-}
-
-static int32_t bcmpkt_psamp_postcard_1_t_mmu_stat_1_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    ret = SHR_E_PARAM;
-
-    return ret;
-}
-
-static int32_t bcmpkt_psamp_postcard_1_t_queue_id_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[0], 0, 8);
-
-    return ret;
-}
-
-static int32_t bcmpkt_psamp_postcard_1_t_queue_id_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[0], 0, 8, val);
-    return ret;
-}
-
-static int32_t bcmpkt_psamp_postcard_1_t_reserved_1_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[4], 24, 8);
-
-    return ret;
-}
-
-static int32_t bcmpkt_psamp_postcard_1_t_reserved_1_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[4], 24, 8, val);
-    return ret;
-}
-
-static int32_t bcmpkt_psamp_postcard_1_t_residence_time_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    ret = SHR_E_PARAM;
-
-    return ret;
-}
-
-static int32_t bcmpkt_psamp_postcard_1_t_residence_time_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    ret = SHR_E_PARAM;
-
-    return ret;
-}
-
-static int32_t bcmpkt_psamp_postcard_1_t_sampled_length_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[4], 0, 16);
-
-    return ret;
-}
-
-static int32_t bcmpkt_psamp_postcard_1_t_sampled_length_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[4], 0, 16, val);
-    return ret;
-}
-
-static int32_t bcmpkt_psamp_postcard_1_t_var_len_indicator_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[4], 16, 8);
-
-    return ret;
-}
-
-static int32_t bcmpkt_psamp_postcard_1_t_var_len_indicator_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[4], 16, 8, val);
-    return ret;
-}
-
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_psamp_postcard_1_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_1_T_FID_COUNT] = {
-    bcmpkt_psamp_postcard_1_t_color_idx_cos_droploc_get,
-    bcmpkt_psamp_postcard_1_t_drop_reason_code_get,
-    bcmpkt_psamp_postcard_1_t_mmu_stat_0_get,
-    bcmpkt_psamp_postcard_1_t_mmu_stat_1_get,
-    bcmpkt_psamp_postcard_1_t_queue_id_get,
-    bcmpkt_psamp_postcard_1_t_reserved_1_get,
-    bcmpkt_psamp_postcard_1_t_residence_time_get,
-    bcmpkt_psamp_postcard_1_t_sampled_length_get,
-    bcmpkt_psamp_postcard_1_t_var_len_indicator_get,
+    bcmpkt_psamp_mirror_on_drop_3_t_var_len_indicator_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_psamp_postcard_1_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_1_T_FID_COUNT] = {
-    bcmpkt_psamp_postcard_1_t_color_idx_cos_droploc_set,
-    bcmpkt_psamp_postcard_1_t_drop_reason_code_set,
-    bcmpkt_psamp_postcard_1_t_mmu_stat_0_set,
-    bcmpkt_psamp_postcard_1_t_mmu_stat_1_set,
-    bcmpkt_psamp_postcard_1_t_queue_id_set,
-    bcmpkt_psamp_postcard_1_t_reserved_1_set,
-    bcmpkt_psamp_postcard_1_t_residence_time_set,
-    bcmpkt_psamp_postcard_1_t_sampled_length_set,
-    bcmpkt_psamp_postcard_1_t_var_len_indicator_set,
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_psamp_mirror_on_drop_3_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT] = {
+    bcmpkt_psamp_mirror_on_drop_3_t_drop_reason_set,
+    bcmpkt_psamp_mirror_on_drop_3_t_reserved_0_set,
+    bcmpkt_psamp_mirror_on_drop_3_t_sampled_length_set,
+    bcmpkt_psamp_mirror_on_drop_3_t_smod_state_set,
+    bcmpkt_psamp_mirror_on_drop_3_t_uc_cos__color__prob_idx_set,
+    bcmpkt_psamp_mirror_on_drop_3_t_user_meta_data_set,
+    bcmpkt_psamp_mirror_on_drop_3_t_var_len_indicator_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_psamp_postcard_1_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_1_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_psamp_mirror_on_drop_3_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_psamp_postcard_1_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_PSAMP_POSTCARD_1_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_psamp_postcard_1_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_psamp_mirror_on_drop_3_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_psamp_mirror_on_drop_3_t_field_data,
 };
 
 
@@ -9430,7 +7640,7 @@ static int32_t bcmpkt_rarp_t_target_ip_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_rarp_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RARP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_rarp_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_FID_COUNT] = {
     bcmpkt_rarp_t_hardware_len_get,
     bcmpkt_rarp_t_hardware_type_get,
     bcmpkt_rarp_t_operation_get,
@@ -9442,7 +7652,7 @@ bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_rarp_t_fget[BCM78800_A0_DNA_6
     bcmpkt_rarp_t_target_ip_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_rarp_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RARP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_rarp_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_FID_COUNT] = {
     bcmpkt_rarp_t_hardware_len_set,
     bcmpkt_rarp_t_hardware_type_set,
     bcmpkt_rarp_t_operation_set,
@@ -9454,13 +7664,13 @@ bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_rarp_t_fset[BCM78800_A0_DNA_6
     bcmpkt_rarp_t_target_ip_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_rarp_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_rarp_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_rarp_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RARP_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_rarp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_rarp_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_rarp_t_field_data,
 };
 
 
@@ -9540,7 +7750,7 @@ static int32_t bcmpkt_routing_t_segments_left_set(uint32_t *data, int profile, u
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_routing_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ROUTING_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_routing_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ROUTING_T_FID_COUNT] = {
     bcmpkt_routing_t_data_get,
     bcmpkt_routing_t_hdr_ext_len_get,
     bcmpkt_routing_t_next_header_get,
@@ -9548,7 +7758,7 @@ bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_routing_t_fget[BCM78800_A0_DN
     bcmpkt_routing_t_segments_left_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_routing_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ROUTING_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_routing_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ROUTING_T_FID_COUNT] = {
     bcmpkt_routing_t_data_set,
     bcmpkt_routing_t_hdr_ext_len_set,
     bcmpkt_routing_t_next_header_set,
@@ -9556,13 +7766,13 @@ bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_routing_t_fset[BCM78800_A0_DN
     bcmpkt_routing_t_segments_left_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_routing_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ROUTING_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_routing_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ROUTING_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_routing_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_ROUTING_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_routing_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_routing_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_ROUTING_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_routing_t_field_data,
 };
 
 
@@ -9596,294 +7806,23 @@ static int32_t bcmpkt_rspan_t_tpid_set(uint32_t *data, int profile, uint32_t val
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_rspan_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RSPAN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_rspan_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RSPAN_T_FID_COUNT] = {
     bcmpkt_rspan_t_tag_get,
     bcmpkt_rspan_t_tpid_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_rspan_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RSPAN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_rspan_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RSPAN_T_FID_COUNT] = {
     bcmpkt_rspan_t_tag_set,
     bcmpkt_rspan_t_tpid_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_rspan_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RSPAN_T_FIELD_NAME_MAP_INIT
-};
-
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_rspan_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RSPAN_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_rspan_t_field_data,
-};
-
-
-static int32_t bcmpkt_segment_routing_srh_t_flags_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[1], 16, 8);
-
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_srh_t_flags_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[1], 16, 8, val);
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_srh_t_hdr_ext_len_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[0], 16, 8);
-
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_srh_t_hdr_ext_len_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[0], 16, 8, val);
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_srh_t_last_entry_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[1], 24, 8);
-
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_srh_t_last_entry_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[1], 24, 8, val);
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_srh_t_next_header_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[0], 24, 8);
-
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_srh_t_next_header_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[0], 24, 8, val);
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_srh_t_routing_type_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[0], 8, 8);
-
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_srh_t_routing_type_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[0], 8, 8, val);
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_srh_t_segments_left_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[0], 0, 8);
-
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_srh_t_segments_left_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[0], 0, 8, val);
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_srh_t_tag_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[1], 0, 16);
-
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_srh_t_tag_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[1], 0, 16, val);
-    return ret;
-}
-
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_segment_routing_srh_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_SRH_T_FID_COUNT] = {
-    bcmpkt_segment_routing_srh_t_flags_get,
-    bcmpkt_segment_routing_srh_t_hdr_ext_len_get,
-    bcmpkt_segment_routing_srh_t_last_entry_get,
-    bcmpkt_segment_routing_srh_t_next_header_get,
-    bcmpkt_segment_routing_srh_t_routing_type_get,
-    bcmpkt_segment_routing_srh_t_segments_left_get,
-    bcmpkt_segment_routing_srh_t_tag_get,
-};
-
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_segment_routing_srh_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_SRH_T_FID_COUNT] = {
-    bcmpkt_segment_routing_srh_t_flags_set,
-    bcmpkt_segment_routing_srh_t_hdr_ext_len_set,
-    bcmpkt_segment_routing_srh_t_last_entry_set,
-    bcmpkt_segment_routing_srh_t_next_header_set,
-    bcmpkt_segment_routing_srh_t_routing_type_set,
-    bcmpkt_segment_routing_srh_t_segments_left_set,
-    bcmpkt_segment_routing_srh_t_tag_set,
-};
-
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_segment_routing_srh_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_SRH_T_FIELD_NAME_MAP_INIT
-};
-
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_segment_routing_srh_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_SRH_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_segment_routing_srh_t_field_data,
-};
-
-
-static int32_t bcmpkt_segment_routing_t_hdr_ext_len_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[0], 16, 8);
-
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_t_hdr_ext_len_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[0], 16, 8, val);
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_t_last_entry_flags_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[1], 16, 16);
-
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_t_last_entry_flags_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[1], 16, 16, val);
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_t_next_header_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[0], 24, 8);
-
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_t_next_header_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[0], 24, 8, val);
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_t_routing_type_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[0], 8, 8);
-
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_t_routing_type_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[0], 8, 8, val);
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_t_seg_list_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    ret = SHR_E_PARAM;
-
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_t_seg_list_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    ret = SHR_E_PARAM;
-
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_t_segments_left_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[0], 0, 8);
-
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_t_segments_left_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[0], 0, 8, val);
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_t_tag_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[1], 0, 16);
-
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_t_tag_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[1], 0, 16, val);
-    return ret;
-}
-
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_segment_routing_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_T_FID_COUNT] = {
-    bcmpkt_segment_routing_t_hdr_ext_len_get,
-    bcmpkt_segment_routing_t_last_entry_flags_get,
-    bcmpkt_segment_routing_t_next_header_get,
-    bcmpkt_segment_routing_t_routing_type_get,
-    bcmpkt_segment_routing_t_seg_list_get,
-    bcmpkt_segment_routing_t_segments_left_get,
-    bcmpkt_segment_routing_t_tag_get,
-};
-
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_segment_routing_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_T_FID_COUNT] = {
-    bcmpkt_segment_routing_t_hdr_ext_len_set,
-    bcmpkt_segment_routing_t_last_entry_flags_set,
-    bcmpkt_segment_routing_t_next_header_set,
-    bcmpkt_segment_routing_t_routing_type_set,
-    bcmpkt_segment_routing_t_seg_list_set,
-    bcmpkt_segment_routing_t_segments_left_set,
-    bcmpkt_segment_routing_t_tag_set,
-};
-
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_segment_routing_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_rspan_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RSPAN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_segment_routing_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SEGMENT_ROUTING_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_segment_routing_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_rspan_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_RSPAN_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_rspan_t_field_data,
 };
 
 
@@ -9933,25 +7872,25 @@ static int32_t bcmpkt_sflow_shim_0_t_version_set(uint32_t *data, int profile, ui
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_sflow_shim_0_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_sflow_shim_0_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT] = {
     bcmpkt_sflow_shim_0_t_sys_destination_get,
     bcmpkt_sflow_shim_0_t_sys_source_get,
     bcmpkt_sflow_shim_0_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_sflow_shim_0_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_sflow_shim_0_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT] = {
     bcmpkt_sflow_shim_0_t_sys_destination_set,
     bcmpkt_sflow_shim_0_t_sys_source_set,
     bcmpkt_sflow_shim_0_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_sflow_shim_0_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_sflow_shim_0_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_sflow_shim_0_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_sflow_shim_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_sflow_shim_0_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_sflow_shim_0_t_field_data,
 };
 
 
@@ -10075,7 +8014,7 @@ static int32_t bcmpkt_sflow_shim_1_t_sys_opcode_set(uint32_t *data, int profile,
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_sflow_shim_1_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_sflow_shim_1_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT] = {
     bcmpkt_sflow_shim_1_t_flag_dest_sample_get,
     bcmpkt_sflow_shim_1_t_flag_discarded_get,
     bcmpkt_sflow_shim_1_t_flag_flex_sample_get,
@@ -10086,7 +8025,7 @@ bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_sflow_shim_1_t_fget[BCM78800_
     bcmpkt_sflow_shim_1_t_sys_opcode_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_sflow_shim_1_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_sflow_shim_1_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT] = {
     bcmpkt_sflow_shim_1_t_flag_dest_sample_set,
     bcmpkt_sflow_shim_1_t_flag_discarded_set,
     bcmpkt_sflow_shim_1_t_flag_flex_sample_set,
@@ -10097,13 +8036,13 @@ bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_sflow_shim_1_t_fset[BCM78800_
     bcmpkt_sflow_shim_1_t_sys_opcode_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_sflow_shim_1_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_1_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_sflow_shim_1_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_sflow_shim_1_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_sflow_shim_1_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_sflow_shim_1_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_sflow_shim_1_t_field_data,
 };
 
 
@@ -10138,23 +8077,23 @@ static int32_t bcmpkt_sflow_shim_2_t_user_meta_data_set(uint32_t *data, int prof
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_sflow_shim_2_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_sflow_shim_2_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT] = {
     bcmpkt_sflow_shim_2_t_sequence_num_get,
     bcmpkt_sflow_shim_2_t_user_meta_data_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_sflow_shim_2_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_sflow_shim_2_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT] = {
     bcmpkt_sflow_shim_2_t_sequence_num_set,
     bcmpkt_sflow_shim_2_t_user_meta_data_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_sflow_shim_2_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_2_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_sflow_shim_2_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_2_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_sflow_shim_2_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_sflow_shim_2_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_sflow_shim_2_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_sflow_shim_2_t_field_data,
 };
 
 
@@ -10189,57 +8128,23 @@ static int32_t bcmpkt_snap_llc_t_snap_llc_set(uint32_t *data, int profile, uint3
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_snap_llc_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SNAP_LLC_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_snap_llc_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SNAP_LLC_T_FID_COUNT] = {
     bcmpkt_snap_llc_t_length_get,
     bcmpkt_snap_llc_t_snap_llc_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_snap_llc_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SNAP_LLC_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_snap_llc_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SNAP_LLC_T_FID_COUNT] = {
     bcmpkt_snap_llc_t_length_set,
     bcmpkt_snap_llc_t_snap_llc_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_snap_llc_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SNAP_LLC_T_FIELD_NAME_MAP_INIT
-};
-
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_snap_llc_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_SNAP_LLC_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_snap_llc_t_field_data,
-};
-
-
-static int32_t bcmpkt_std_segment_id_t_data_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    ret = SHR_E_PARAM;
-
-    return ret;
-}
-
-static int32_t bcmpkt_std_segment_id_t_data_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    ret = SHR_E_PARAM;
-
-    return ret;
-}
-
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_std_segment_id_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_STD_SEGMENT_ID_T_FID_COUNT] = {
-    bcmpkt_std_segment_id_t_data_get,
-};
-
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_std_segment_id_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_STD_SEGMENT_ID_T_FID_COUNT] = {
-    bcmpkt_std_segment_id_t_data_set,
-};
-
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_std_segment_id_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_STD_SEGMENT_ID_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_snap_llc_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SNAP_LLC_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_std_segment_id_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_STD_SEGMENT_ID_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_std_segment_id_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_snap_llc_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_SNAP_LLC_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_snap_llc_t_field_data,
 };
 
 
@@ -10273,23 +8178,23 @@ static int32_t bcmpkt_tcp_first_4bytes_t_src_port_set(uint32_t *data, int profil
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_tcp_first_4bytes_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_tcp_first_4bytes_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_first_4bytes_t_dst_port_get,
     bcmpkt_tcp_first_4bytes_t_src_port_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_tcp_first_4bytes_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_tcp_first_4bytes_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_first_4bytes_t_dst_port_set,
     bcmpkt_tcp_first_4bytes_t_src_port_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_tcp_first_4bytes_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_tcp_first_4bytes_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_tcp_first_4bytes_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_tcp_first_4bytes_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_tcp_first_4bytes_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_tcp_first_4bytes_t_field_data,
 };
 
 
@@ -10385,7 +8290,7 @@ static int32_t bcmpkt_tcp_last_16bytes_t_win_size_set(uint32_t *data, int profil
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_tcp_last_16bytes_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_tcp_last_16bytes_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_last_16bytes_t_ack_num_get,
     bcmpkt_tcp_last_16bytes_t_checksum_get,
     bcmpkt_tcp_last_16bytes_t_hdr_len_and_flags_get,
@@ -10394,7 +8299,7 @@ bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_tcp_last_16bytes_t_fget[BCM78
     bcmpkt_tcp_last_16bytes_t_win_size_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_tcp_last_16bytes_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_tcp_last_16bytes_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_last_16bytes_t_ack_num_set,
     bcmpkt_tcp_last_16bytes_t_checksum_set,
     bcmpkt_tcp_last_16bytes_t_hdr_len_and_flags_set,
@@ -10403,13 +8308,13 @@ bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_tcp_last_16bytes_t_fset[BCM78
     bcmpkt_tcp_last_16bytes_t_win_size_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_tcp_last_16bytes_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_tcp_last_16bytes_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_tcp_last_16bytes_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_tcp_last_16bytes_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_tcp_last_16bytes_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_tcp_last_16bytes_t_field_data,
 };
 
 
@@ -10473,27 +8378,27 @@ static int32_t bcmpkt_udp_t_udp_length_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_udp_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UDP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_udp_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UDP_T_FID_COUNT] = {
     bcmpkt_udp_t_checksum_get,
     bcmpkt_udp_t_dst_port_get,
     bcmpkt_udp_t_src_port_get,
     bcmpkt_udp_t_udp_length_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_udp_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UDP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_udp_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UDP_T_FID_COUNT] = {
     bcmpkt_udp_t_checksum_set,
     bcmpkt_udp_t_dst_port_set,
     bcmpkt_udp_t_src_port_set,
     bcmpkt_udp_t_udp_length_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_udp_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_udp_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_udp_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UDP_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_udp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_udp_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UDP_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_udp_t_field_data,
 };
 
 
@@ -10529,23 +8434,23 @@ static int32_t bcmpkt_unknown_l3_t_next_16bytes_of_l3_payload_set(uint32_t *data
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_unknown_l3_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_unknown_l3_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
     bcmpkt_unknown_l3_t_first_16bytes_of_l3_payload_get,
     bcmpkt_unknown_l3_t_next_16bytes_of_l3_payload_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_unknown_l3_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_unknown_l3_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
     bcmpkt_unknown_l3_t_first_16bytes_of_l3_payload_set,
     bcmpkt_unknown_l3_t_next_16bytes_of_l3_payload_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_unknown_l3_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_unknown_l3_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_unknown_l3_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L3_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_unknown_l3_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_unknown_l3_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_unknown_l3_t_field_data,
 };
 
 
@@ -10565,21 +8470,21 @@ static int32_t bcmpkt_unknown_l4_t_first_4bytes_of_l4_payload_set(uint32_t *data
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_unknown_l4_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_unknown_l4_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
     bcmpkt_unknown_l4_t_first_4bytes_of_l4_payload_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_unknown_l4_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_unknown_l4_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
     bcmpkt_unknown_l4_t_first_4bytes_of_l4_payload_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_unknown_l4_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_unknown_l4_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_unknown_l4_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L4_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_unknown_l4_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_unknown_l4_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_unknown_l4_t_field_data,
 };
 
 
@@ -10644,27 +8549,27 @@ static int32_t bcmpkt_unknown_l5_t_l5_bytes_8_9_set(uint32_t *data, int profile,
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_unknown_l5_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_unknown_l5_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
     bcmpkt_unknown_l5_t_l5_bytes_0_1_get,
     bcmpkt_unknown_l5_t_l5_bytes_2_3_get,
     bcmpkt_unknown_l5_t_l5_bytes_4_7_get,
     bcmpkt_unknown_l5_t_l5_bytes_8_9_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_unknown_l5_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_unknown_l5_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
     bcmpkt_unknown_l5_t_l5_bytes_0_1_set,
     bcmpkt_unknown_l5_t_l5_bytes_2_3_set,
     bcmpkt_unknown_l5_t_l5_bytes_4_7_set,
     bcmpkt_unknown_l5_t_l5_bytes_8_9_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_unknown_l5_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_unknown_l5_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_unknown_l5_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_UNKNOWN_L5_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_unknown_l5_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_unknown_l5_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_unknown_l5_t_field_data,
 };
 
 
@@ -10728,27 +8633,27 @@ static int32_t bcmpkt_vlan_t_vid_set(uint32_t *data, int profile, uint32_t val)
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_vlan_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_VLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_vlan_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_VLAN_T_FID_COUNT] = {
     bcmpkt_vlan_t_cfi_get,
     bcmpkt_vlan_t_pcp_get,
     bcmpkt_vlan_t_tpid_get,
     bcmpkt_vlan_t_vid_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_vlan_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_VLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_vlan_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_VLAN_T_FID_COUNT] = {
     bcmpkt_vlan_t_cfi_set,
     bcmpkt_vlan_t_pcp_set,
     bcmpkt_vlan_t_tpid_set,
     bcmpkt_vlan_t_vid_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_vlan_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_vlan_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_vlan_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_VLAN_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_vlan_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_vlan_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_VLAN_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_vlan_t_field_data,
 };
 
 
@@ -10798,25 +8703,25 @@ static int32_t bcmpkt_vxlan_t_vn_id_set(uint32_t *data, int profile, uint32_t va
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_vxlan_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_VXLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_vxlan_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_VXLAN_T_FID_COUNT] = {
     bcmpkt_vxlan_t_flags_reserved_1_get,
     bcmpkt_vxlan_t_reserved2_get,
     bcmpkt_vxlan_t_vn_id_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_vxlan_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_VXLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_vxlan_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_VXLAN_T_FID_COUNT] = {
     bcmpkt_vxlan_t_flags_reserved_1_set,
     bcmpkt_vxlan_t_reserved2_set,
     bcmpkt_vxlan_t_vn_id_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_vxlan_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_vxlan_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_vxlan_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_VXLAN_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_vxlan_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_vxlan_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_VXLAN_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_vxlan_t_field_data,
 };
 
 
@@ -10928,7 +8833,7 @@ static int32_t bcmpkt_wesp_t_wesp_iv_set(uint32_t *data, int profile, uint32_t v
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_wesp_t_fget[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_WESP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_31_7_0_wesp_t_fget[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_FID_COUNT] = {
     bcmpkt_wesp_t_flags_get,
     bcmpkt_wesp_t_header_len_get,
     bcmpkt_wesp_t_next_header_get,
@@ -10938,7 +8843,7 @@ bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_30_3_1_wesp_t_fget[BCM78800_A0_DNA_6
     bcmpkt_wesp_t_wesp_iv_get,
 };
 
-bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_wesp_t_fset[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_WESP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_31_7_0_wesp_t_fset[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_FID_COUNT] = {
     bcmpkt_wesp_t_flags_set,
     bcmpkt_wesp_t_header_len_set,
     bcmpkt_wesp_t_next_header_set,
@@ -10948,529 +8853,487 @@ bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_30_3_1_wesp_t_fset[BCM78800_A0_DNA_6
     bcmpkt_wesp_t_wesp_iv_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_30_3_1_wesp_t_field_data[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_WESP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_31_7_0_wesp_t_field_data[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_30_3_1_wesp_t_field_info = {
-    .num_fields = BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_WESP_T_FID_COUNT,
-    .info = bcm78800_a0_dna_6_5_30_3_1_wesp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_31_7_0_wesp_t_field_info = {
+    .num_fields = BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_FID_COUNT,
+    .info = bcm56690_a0_dna_6_5_31_7_0_wesp_t_field_data,
 };
 
-static bcmpkt_flex_pmd_info_t bcm78800_a0_dna_6_5_30_3_1_flexhdr_info_list[BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_FLEXHDR_COUNT] = {
-    {
-        .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_arp_t_field_info,
-        .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_arp_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_arp_t_fset,
-    },
-    {
-        .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_authen_t_field_info,
-        .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_authen_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_authen_t_fset,
-    },
-    {
-        .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_bfd_t_field_info,
-        .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_bfd_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_bfd_t_fset,
-    },
-    {
-        .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_cntag_t_field_info,
-        .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_cntag_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_cntag_t_fset,
-    },
-    {
-        .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_cpu_composites_0_t_field_info,
-        .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_cpu_composites_0_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_cpu_composites_0_t_fset,
-    },
-    {
-        .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_cpu_composites_1_t_field_info,
-        .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_cpu_composites_1_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_cpu_composites_1_t_fset,
-    },
+static bcmpkt_flex_pmd_info_t bcm56690_a0_dna_6_5_31_7_0_flexhdr_info_list[BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_FLEXHDR_COUNT] = {
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_dcn_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_arp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_dcn_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_dcn_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_arp_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_arp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_dest_option_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_authen_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_dest_option_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_dest_option_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_authen_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_authen_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_ep_nih_header_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_bfd_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_ep_nih_header_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_ep_nih_header_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_bfd_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_bfd_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_erspan3_fixed_hdr_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_cntag_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_erspan3_fixed_hdr_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_erspan3_fixed_hdr_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_cntag_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_cntag_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_erspan3_subhdr_5_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_cpu_composites_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_erspan3_subhdr_5_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_erspan3_subhdr_5_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_cpu_composites_0_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_cpu_composites_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_esp_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_cpu_composites_1_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_esp_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_esp_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_cpu_composites_1_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_cpu_composites_1_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_ethertype_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_dest_option_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_ethertype_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_ethertype_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_dest_option_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_dest_option_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_frag_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_ep_nih_header_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_frag_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_frag_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_ep_nih_header_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_ep_nih_header_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_gbp_ethernet_shim_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_erspan3_fixed_hdr_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_gbp_ethernet_shim_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_gbp_ethernet_shim_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_erspan3_fixed_hdr_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_erspan3_fixed_hdr_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_generic_loopback_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_erspan3_subhdr_5_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_generic_loopback_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_generic_loopback_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_erspan3_subhdr_5_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_erspan3_subhdr_5_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_gpe_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_esp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_gpe_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_gpe_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_esp_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_esp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_gre_chksum_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_ethertype_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_gre_chksum_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_gre_chksum_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_ethertype_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_ethertype_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_gre_key_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_frag_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_gre_key_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_gre_key_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_frag_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_frag_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_gre_rout_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_gbp_ethernet_shim_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_gre_rout_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_gre_rout_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_gbp_ethernet_shim_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_gbp_ethernet_shim_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_gre_seq_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_generic_loopback_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_gre_seq_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_gre_seq_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_generic_loopback_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_generic_loopback_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_gre_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_gpe_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_gre_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_gre_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_gpe_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_gpe_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_hg3_base_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_gre_chksum_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_hg3_base_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_hg3_base_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_gre_chksum_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_gre_chksum_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_hg3_extension_0_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_gre_key_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_hg3_extension_0_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_hg3_extension_0_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_gre_key_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_gre_key_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_hop_by_hop_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_gre_rout_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_hop_by_hop_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_hop_by_hop_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_gre_rout_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_gre_rout_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_icmp_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_gre_seq_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_icmp_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_icmp_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_gre_seq_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_gre_seq_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_ifa_header_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_gre_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_ifa_header_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_ifa_header_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_gre_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_gre_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_ifa_metadata_a_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_hg3_base_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_ifa_metadata_a_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_ifa_metadata_a_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_hg3_base_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_hg3_base_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_ifa_metadata_b_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_hg3_extension_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_ifa_metadata_b_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_ifa_metadata_b_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_hg3_extension_0_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_hg3_extension_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_ifa_metadata_base_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_hop_by_hop_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_ifa_metadata_base_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_ifa_metadata_base_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_hop_by_hop_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_hop_by_hop_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_igmp_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_icmp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_igmp_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_igmp_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_icmp_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_icmp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_ioam_e2e_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_ifa_header_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_ioam_e2e_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_ioam_e2e_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_ifa_header_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_ifa_header_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_ipfix_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_ifa_metadata_a_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_ipfix_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_ipfix_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_ifa_metadata_a_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_ifa_metadata_a_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_ipv4_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_ifa_metadata_b_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_ipv4_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_ipv4_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_ifa_metadata_b_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_ifa_metadata_b_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_ipv6_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_ifa_metadata_base_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_ipv6_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_ipv6_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_ifa_metadata_base_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_ifa_metadata_base_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_l2_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_igmp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_l2_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_l2_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_igmp_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_igmp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_mirror_erspan_sn_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_ioam_e2e_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_mirror_erspan_sn_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_mirror_erspan_sn_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_ioam_e2e_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_ioam_e2e_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_mirror_transport_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_ipfix_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_mirror_transport_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_mirror_transport_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_ipfix_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_ipfix_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_mpls_ach_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_ipv4_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_mpls_ach_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_mpls_ach_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_ipv4_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_ipv4_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_mpls_bv_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_ipv6_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_mpls_bv_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_mpls_bv_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_ipv6_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_ipv6_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_mpls_cw_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_l2_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_mpls_cw_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_mpls_cw_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_l2_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_l2_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_mpls_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_mirror_erspan_sn_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_mpls_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_mpls_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_mirror_erspan_sn_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_mirror_erspan_sn_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_p_1588_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_mirror_transport_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_p_1588_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_p_1588_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_mirror_transport_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_mirror_transport_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_prog_ext_hdr_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_mpls_ach_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_prog_ext_hdr_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_prog_ext_hdr_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_mpls_ach_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_mpls_ach_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_psamp_0_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_mpls_bv_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_psamp_0_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_psamp_0_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_mpls_bv_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_mpls_bv_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_psamp_1_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_mpls_cw_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_psamp_1_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_psamp_1_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_mpls_cw_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_mpls_cw_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_psamp_mirror_on_drop_0_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_mpls_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_psamp_mirror_on_drop_0_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_psamp_mirror_on_drop_0_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_mpls_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_mpls_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_psamp_mirror_on_drop_3_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_p_1588_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_psamp_mirror_on_drop_3_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_psamp_mirror_on_drop_3_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_p_1588_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_p_1588_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_psamp_postcard_0_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_prog_ext_hdr_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_psamp_postcard_0_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_psamp_postcard_0_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_prog_ext_hdr_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_prog_ext_hdr_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_psamp_postcard_1_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_psamp_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_psamp_postcard_1_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_psamp_postcard_1_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_psamp_0_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_psamp_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_rarp_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_psamp_1_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_rarp_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_rarp_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_psamp_1_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_psamp_1_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_routing_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_psamp_mirror_on_drop_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_routing_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_routing_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_psamp_mirror_on_drop_0_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_psamp_mirror_on_drop_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_rspan_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_psamp_mirror_on_drop_3_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_rspan_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_rspan_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_psamp_mirror_on_drop_3_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_psamp_mirror_on_drop_3_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_segment_routing_srh_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_rarp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_segment_routing_srh_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_segment_routing_srh_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_rarp_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_rarp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_segment_routing_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_routing_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_segment_routing_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_segment_routing_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_routing_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_routing_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_sflow_shim_0_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_rspan_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_sflow_shim_0_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_sflow_shim_0_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_rspan_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_rspan_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_sflow_shim_1_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_sflow_shim_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_sflow_shim_1_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_sflow_shim_1_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_sflow_shim_0_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_sflow_shim_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_sflow_shim_2_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_sflow_shim_1_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_sflow_shim_2_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_sflow_shim_2_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_sflow_shim_1_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_sflow_shim_1_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_snap_llc_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_sflow_shim_2_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_snap_llc_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_snap_llc_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_sflow_shim_2_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_sflow_shim_2_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_std_segment_id_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_snap_llc_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_std_segment_id_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_std_segment_id_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_snap_llc_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_snap_llc_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_tcp_first_4bytes_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_tcp_first_4bytes_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_tcp_first_4bytes_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_tcp_first_4bytes_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_tcp_first_4bytes_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_tcp_first_4bytes_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_tcp_last_16bytes_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_tcp_last_16bytes_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_tcp_last_16bytes_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_tcp_last_16bytes_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_tcp_last_16bytes_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_tcp_last_16bytes_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_udp_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_udp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_udp_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_udp_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_udp_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_udp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_unknown_l3_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_unknown_l3_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_unknown_l3_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_unknown_l3_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_unknown_l3_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_unknown_l3_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_unknown_l4_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_unknown_l4_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_unknown_l4_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_unknown_l4_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_unknown_l4_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_unknown_l4_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_unknown_l5_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_unknown_l5_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_unknown_l5_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_unknown_l5_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_unknown_l5_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_unknown_l5_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_vlan_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_vlan_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_vlan_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_vlan_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_vlan_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_vlan_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_vxlan_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_vxlan_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_vxlan_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_vxlan_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_vxlan_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_vxlan_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_wesp_t_field_info,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_wesp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm78800_a0_dna_6_5_30_3_1_wesp_t_fget,
-        .flex_fset = bcm78800_a0_dna_6_5_30_3_1_wesp_t_fset,
+        .flex_fget = bcm56690_a0_dna_6_5_31_7_0_wesp_t_fget,
+        .flex_fset = bcm56690_a0_dna_6_5_31_7_0_wesp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm78800_a0_dna_6_5_30_3_1_rxpmd_flex_field_info,
-        .reasons_info = &bcm78800_a0_dna_6_5_30_3_1_rxpmd_flex_reasons_info,
-        .flex_common_fget = bcm78800_a0_rxpmd_flex_fget,
-        .flex_common_fset = bcm78800_a0_rxpmd_flex_fset,
+        .field_info = &bcm56690_a0_dna_6_5_31_7_0_rxpmd_flex_field_info,
+        .reasons_info = &bcm56690_a0_dna_6_5_31_7_0_rxpmd_flex_reasons_info,
+        .flex_common_fget = bcm56690_a0_rxpmd_flex_fget,
+        .flex_common_fset = bcm56690_a0_rxpmd_flex_fset,
     },
 };
 
-static shr_enum_map_t bcm78800_a0_dna_6_5_30_3_1_flexhdr_id_map[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_FLEXHDR_NAME_MAP_INIT
+static shr_enum_map_t bcm56690_a0_dna_6_5_31_7_0_flexhdr_id_map[] = {
+    BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_FLEXHDR_NAME_MAP_INIT
 };
 
-shr_enum_map_t * bcm78800_a0_dna_6_5_30_3_1_flexhdr_map_get(void)
+shr_enum_map_t * bcm56690_a0_dna_6_5_31_7_0_flexhdr_map_get(void)
 {
-    return bcm78800_a0_dna_6_5_30_3_1_flexhdr_id_map;
+    return bcm56690_a0_dna_6_5_31_7_0_flexhdr_id_map;
 }
 
-bcmpkt_flex_pmd_info_t * bcm78800_a0_dna_6_5_30_3_1_flex_pmd_info_get(uint32_t hid)
+bcmpkt_flex_pmd_info_t * bcm56690_a0_dna_6_5_31_7_0_flex_pmd_info_get(uint32_t hid)
 {
-    if (hid >= BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_FLEXHDR_COUNT) {
+    if (hid >= BCM56690_A0_DNA_6_5_31_7_0_BCMPKT_FLEXHDR_COUNT) {
         return NULL;
     }
 
-    return &bcm78800_a0_dna_6_5_30_3_1_flexhdr_info_list[hid];
+    return &bcm56690_a0_dna_6_5_31_7_0_flexhdr_info_list[hid];
 }
 
-int bcm78800_a0_dna_6_5_30_3_1_flexhdr_variant_support_map[BCMPKT_PMD_COUNT] = {
-    15,
+int bcm56690_a0_dna_6_5_31_7_0_flexhdr_variant_support_map[BCMPKT_PMD_COUNT] = {
+    14,
+    21,
     22,
-    23,
-    69,
+    63,
 };
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_bcmpkt_rxpmd_match_id.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_bcmpkt_rxpmd_match_id.c
similarity index 82%
rename from platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_bcmpkt_rxpmd_match_id.c
rename to platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_bcmpkt_rxpmd_match_id.c
index 4f381c8b4034..579afded4718 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_bcmpkt_rxpmd_match_id.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_bcmpkt_rxpmd_match_id.c
@@ -2,8 +2,8 @@
  *
  * DO NOT EDIT THIS FILE!
  * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) bcm56780_a0_cna_6_5_30_2_0_sf_match_id_info.yml
- * for device bcm56780_a0 and variant cna_6_5_30_2_0.
+ * from the NPL output file(s) bcm56780_a0_cna_6_5_31_3_0_sf_match_id_info.yml
+ * for device bcm56780_a0 and variant cna_6_5_31_3_0.
  * Edits to this file will be lost when it is regenerated.
  *
  * $Id: $
@@ -29,13 +29,13 @@
 
 
 #include <bcmpkt/bcmpkt_rxpmd_match_id.h>
-#include <bcmpkt/xfcr/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_bcmpkt_rxpmd_match_id_defs.h>
+#include <bcmpkt/xfcr/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_bcmpkt_rxpmd_match_id_defs.h>
 
 
 static bcmpkt_rxpmd_match_id_db_t
-bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_COUNT] = {
+bcm56780_a0_cna_6_5_31_3_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_COUNT] = {
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG */
         .name         = "EGRESS_PKT_FWD_L2_HDR_ITAG",
         .match        = 0x2,
         .match_mask   = 0x2,
@@ -49,7 +49,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2 */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2 */
         .name         = "EGRESS_PKT_FWD_L2_HDR_L2",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -63,7 +63,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE */
         .name         = "EGRESS_PKT_FWD_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x7,
@@ -77,7 +77,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG */
         .name         = "EGRESS_PKT_FWD_L2_HDR_OTAG",
         .match        = 0x4,
         .match_mask   = 0x4,
@@ -91,7 +91,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ARP",
         .match        = 0x20,
         .match_mask   = 0x66,
@@ -105,7 +105,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -119,7 +119,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ICMP",
         .match        = 0x40,
         .match_mask   = 0x66,
@@ -133,7 +133,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4 */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IPV4",
         .match        = 0x8,
         .match_mask   = 0x18,
@@ -147,7 +147,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6 */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IPV6",
         .match        = 0x10,
         .match_mask   = 0x18,
@@ -161,7 +161,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x7f,
@@ -175,7 +175,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_RARP",
         .match        = 0x2,
         .match_mask   = 0x6,
@@ -189,7 +189,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x4,
         .match_mask   = 0x6,
@@ -203,7 +203,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x24,
         .match_mask   = 0x66,
@@ -217,7 +217,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UDP",
         .match        = 0x6,
         .match_mask   = 0x6,
@@ -231,7 +231,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3",
         .match        = 0x18,
         .match_mask   = 0x18,
@@ -245,7 +245,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x60,
         .match_mask   = 0x60,
@@ -259,7 +259,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x46,
         .match_mask   = 0x66,
@@ -273,7 +273,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_VXLAN",
         .match        = 0x26,
         .match_mask   = 0x66,
@@ -287,7 +287,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH */
         .name         = "EGRESS_PKT_SYS_HDR_EP_NIH",
         .match        = 0x2,
         .match_mask   = 0x3,
@@ -301,7 +301,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK */
         .name         = "EGRESS_PKT_SYS_HDR_LOOPBACK",
         .match        = 0x1,
         .match_mask   = 0x3,
@@ -315,7 +315,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE */
         .name         = "EGRESS_PKT_SYS_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3,
@@ -329,7 +329,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_ITAG",
         .match        = 0x2,
         .match_mask   = 0x2,
@@ -343,7 +343,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2 */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2 */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_L2",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -357,7 +357,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x7,
@@ -371,7 +371,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_OTAG",
         .match        = 0x4,
         .match_mask   = 0x4,
@@ -385,7 +385,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP",
         .match        = 0x20,
         .match_mask   = 0x66,
@@ -399,7 +399,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -413,7 +413,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP",
         .match        = 0x40,
         .match_mask   = 0x66,
@@ -427,7 +427,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4 */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4",
         .match        = 0x8,
         .match_mask   = 0x18,
@@ -441,7 +441,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6 */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6",
         .match        = 0x10,
         .match_mask   = 0x18,
@@ -455,7 +455,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x7f,
@@ -469,7 +469,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP",
         .match        = 0x2,
         .match_mask   = 0x6,
@@ -483,7 +483,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x4,
         .match_mask   = 0x6,
@@ -497,7 +497,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x24,
         .match_mask   = 0x66,
@@ -511,7 +511,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP",
         .match        = 0x6,
         .match_mask   = 0x6,
@@ -525,7 +525,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3",
         .match        = 0x18,
         .match_mask   = 0x18,
@@ -539,7 +539,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x60,
         .match_mask   = 0x60,
@@ -553,7 +553,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x46,
         .match_mask   = 0x66,
@@ -567,7 +567,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN",
         .match        = 0x26,
         .match_mask   = 0x66,
@@ -581,7 +581,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG */
         .name         = "INGRESS_PKT_INNER_L2_HDR_ITAG",
         .match        = 0x2,
         .match_mask   = 0x2,
@@ -595,7 +595,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2 */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2 */
         .name         = "INGRESS_PKT_INNER_L2_HDR_L2",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -609,7 +609,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE */
         .name         = "INGRESS_PKT_INNER_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x7,
@@ -623,7 +623,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG */
         .name         = "INGRESS_PKT_INNER_L2_HDR_OTAG",
         .match        = 0x4,
         .match_mask   = 0x4,
@@ -637,7 +637,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ARP",
         .match        = 0x20,
         .match_mask   = 0x66,
@@ -651,7 +651,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -665,7 +665,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ICMP",
         .match        = 0x40,
         .match_mask   = 0x66,
@@ -679,7 +679,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4 */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_IPV4",
         .match        = 0x8,
         .match_mask   = 0x18,
@@ -693,7 +693,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6 */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_IPV6",
         .match        = 0x10,
         .match_mask   = 0x18,
@@ -707,7 +707,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x7f,
@@ -721,7 +721,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_RARP",
         .match        = 0x2,
         .match_mask   = 0x6,
@@ -735,7 +735,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x4,
         .match_mask   = 0x6,
@@ -749,7 +749,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x24,
         .match_mask   = 0x66,
@@ -763,7 +763,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UDP",
         .match        = 0x6,
         .match_mask   = 0x6,
@@ -777,7 +777,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3",
         .match        = 0x18,
         .match_mask   = 0x18,
@@ -791,7 +791,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x60,
         .match_mask   = 0x60,
@@ -805,7 +805,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x46,
         .match_mask   = 0x66,
@@ -819,7 +819,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_ITAG",
         .match        = 0x2,
         .match_mask   = 0x2,
@@ -833,7 +833,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2 */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2 */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_L2",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -847,7 +847,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x7,
@@ -861,7 +861,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_OTAG",
         .match        = 0x4,
         .match_mask   = 0x4,
@@ -875,7 +875,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ARP",
         .match        = 0x20,
         .match_mask   = 0x66,
@@ -889,7 +889,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -903,7 +903,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ICMP",
         .match        = 0x40,
         .match_mask   = 0x66,
@@ -917,7 +917,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4 */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IPV4",
         .match        = 0x8,
         .match_mask   = 0x18,
@@ -931,7 +931,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6 */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IPV6",
         .match        = 0x10,
         .match_mask   = 0x18,
@@ -945,7 +945,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x7f,
@@ -959,7 +959,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_RARP",
         .match        = 0x2,
         .match_mask   = 0x6,
@@ -973,7 +973,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x4,
         .match_mask   = 0x6,
@@ -987,7 +987,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x24,
         .match_mask   = 0x66,
@@ -1001,7 +1001,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UDP",
         .match        = 0x6,
         .match_mask   = 0x6,
@@ -1015,7 +1015,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3",
         .match        = 0x18,
         .match_mask   = 0x18,
@@ -1029,7 +1029,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x60,
         .match_mask   = 0x60,
@@ -1043,7 +1043,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x46,
         .match_mask   = 0x66,
@@ -1057,7 +1057,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN",
         .match        = 0x26,
         .match_mask   = 0x66,
@@ -1071,7 +1071,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH */
         .name         = "INGRESS_PKT_SYS_HDR_EP_NIH",
         .match        = 0x2,
         .match_mask   = 0x3,
@@ -1085,7 +1085,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK */
         .name         = "INGRESS_PKT_SYS_HDR_LOOPBACK",
         .match        = 0x1,
         .match_mask   = 0x3,
@@ -1099,7 +1099,7 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE */
+        /* BCM56780_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE */
         .name         = "INGRESS_PKT_SYS_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3,
@@ -1114,23 +1114,23 @@ bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_CNA_6_5_30_2_0_RXPMD_MA
     },
 };
 
-static bcmpkt_rxpmd_match_id_db_info_t bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db_info = {
+static bcmpkt_rxpmd_match_id_db_info_t bcm56780_a0_cna_6_5_31_3_0_rxpmd_match_id_db_info = {
     .num_entries = 77,
-    .db = bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db
+    .db = bcm56780_a0_cna_6_5_31_3_0_rxpmd_match_id_db
 };
-bcmpkt_rxpmd_match_id_db_info_t * bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db_info_get(void) {
-    return &bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_db_info;
+bcmpkt_rxpmd_match_id_db_info_t * bcm56780_a0_cna_6_5_31_3_0_rxpmd_match_id_db_info_get(void) {
+    return &bcm56780_a0_cna_6_5_31_3_0_rxpmd_match_id_db_info;
 }
 
-static shr_enum_map_t bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_map[] = {
-    BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT
+static shr_enum_map_t bcm56780_a0_cna_6_5_31_3_0_rxpmd_match_id_map[] = {
+    BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_rxpmd_match_id_map_info_t bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_map_info = {
+static bcmpkt_rxpmd_match_id_map_info_t bcm56780_a0_cna_6_5_31_3_0_rxpmd_match_id_map_info = {
     .num_entries = 77,
-    .map = bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_map
+    .map = bcm56780_a0_cna_6_5_31_3_0_rxpmd_match_id_map
 };
 
-bcmpkt_rxpmd_match_id_map_info_t * bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_map_info_get(void) {
-    return &bcm56780_a0_cna_6_5_30_2_0_rxpmd_match_id_map_info;
+bcmpkt_rxpmd_match_id_map_info_t * bcm56780_a0_cna_6_5_31_3_0_rxpmd_match_id_map_info_get(void) {
+    return &bcm56780_a0_cna_6_5_31_3_0_rxpmd_match_id_map_info;
 }
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_pkt_flexhdr.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_pkt_flexhdr.c
similarity index 73%
rename from platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_pkt_flexhdr.c
rename to platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_pkt_flexhdr.c
index e0fd5d917d7c..88676df6b79f 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_pkt_flexhdr.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_pkt_flexhdr.c
@@ -3,7 +3,7 @@
  * DO NOT EDIT THIS FILE!
  * This file is auto-generated by xfc_map_parser
  * from the NPL output file(s) map.yml
- * for device bcm56780_a0 and variant cna_6_5_30_2_0.
+ * for device bcm56780_a0 and variant cna_6_5_31_3_0.
  * Edits to this file will be lost when it is regenerated.
  *
  * $Id: $
@@ -31,543 +31,468 @@
 #include <shr/shr_error.h>
 #include <bcmpkt/bcmpkt_flexhdr.h>
 #include <bcmpkt/chip/bcm56780_a0/bcmpkt_bcm56780_a0_rxpmd.h>
-#include <bcmpkt/xfcr/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_bcmpkt_flexhdr.h>
-#include <bcmpkt/xfcr/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_bcmpkt_flexhdr_data.h>
-#include <bcmpkt/xfcr/bcm56780_a0/cna_6_5_30_2_0/bcm56780_a0_cna_6_5_30_2_0_bcmpkt_rxpmd_flex_data.h>
+#include <bcmpkt/xfcr/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_bcmpkt_flexhdr.h>
+#include <bcmpkt/xfcr/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_bcmpkt_flexhdr_data.h>
+#include <bcmpkt/xfcr/bcm56780_a0/cna_6_5_31_3_0/bcm56780_a0_cna_6_5_31_3_0_bcmpkt_rxpmd_flex_data.h>
 
 #define MASK(_bn) (((uint32_t)0x1<<(_bn))-1)
 #define WORD_FIELD_GET(_d,_s,_l) (((_d) >> (_s)) & MASK(_l))
 #define WORD_FIELD_SET(_d,_s,_l,_v) (_d)=(((_d) & ~(MASK(_l) << (_s))) | (((_v) & MASK(_l)) << (_s)))
 #define WORD_FIELD_MASK(_d,_s,_l) (_d)=((_d) | (MASK(_l) << (_s)))
 
-static void bcm56780_a0_cna_6_5_30_2_0_rxpmd_flex_reason_decode(uint32_t *data, bcmpkt_bitmap_t *reasons)
+static void bcm56780_a0_cna_6_5_31_3_0_rxpmd_flex_reason_decode(uint32_t *data, bcmpkt_bitmap_t *reasons)
 {
     uint32_t *reason = data + 0;
 
     if (reason[13] & (0x1 << 0)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU);
     }
     if (reason[13] & (0x1 << 1)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS);
     }
     if (reason[13] & (0x1 << 2)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE);
     }
     if (reason[13] & (0x1 << 3)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_DISCARD);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_DISCARD);
     }
     if (reason[13] & (0x1 << 4)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST);
     }
     if (reason[13] & (0x1 << 5)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED);
     }
     if (reason[13] & (0x1 << 6)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT);
     }
     if (reason[13] & (0x1 << 7)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED);
     }
     if (reason[13] & (0x1 << 8)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED);
     }
     if (reason[13] & (0x1 << 9)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS);
     }
     if (reason[13] & (0x1 << 10)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP);
     }
     if (reason[13] & (0x1 << 11)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS);
     }
     if (reason[13] & (0x1 << 12)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP);
     }
     if (reason[13] & (0x1 << 13)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR);
     }
     if (reason[13] & (0x1 << 14)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR);
     }
     if (reason[13] & (0x1 << 16)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL);
     }
     if (reason[13] & (0x1 << 17)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_VFP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_VFP);
     }
     if (reason[13] & (0x1 << 18)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IFP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP);
     }
     if (reason[13] & (0x1 << 19)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER);
     }
     if (reason[13] & (0x1 << 23)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT);
     }
     if (reason[12] & (0x1 << 15)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP);
     }
 }
 
-static void bcm56780_a0_cna_6_5_30_2_0_rxpmd_flex_reason_encode(bcmpkt_bitmap_t *reasons, uint32_t *data)
+static void bcm56780_a0_cna_6_5_31_3_0_rxpmd_flex_reason_encode(bcmpkt_bitmap_t *reasons, uint32_t *data)
 {
     uint32_t *reason = data + 0;
 
     reason[13] = 0;
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU)) {
         reason[13] |= (0x1 << 0);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS)) {
         reason[13] |= (0x1 << 1);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE)) {
         reason[13] |= (0x1 << 2);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_DISCARD)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_DISCARD)) {
         reason[13] |= (0x1 << 3);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST)) {
         reason[13] |= (0x1 << 4);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED)) {
         reason[13] |= (0x1 << 5);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT)) {
         reason[13] |= (0x1 << 6);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED)) {
         reason[13] |= (0x1 << 7);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED)) {
         reason[13] |= (0x1 << 8);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS)) {
         reason[13] |= (0x1 << 9);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP)) {
         reason[13] |= (0x1 << 10);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS)) {
         reason[13] |= (0x1 << 11);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP)) {
         reason[13] |= (0x1 << 12);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR)) {
         reason[13] |= (0x1 << 13);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR)) {
         reason[13] |= (0x1 << 14);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL)) {
         reason[13] |= (0x1 << 16);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_VFP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_VFP)) {
         reason[13] |= (0x1 << 17);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IFP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP)) {
         reason[13] |= (0x1 << 18);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER)) {
         reason[13] |= (0x1 << 19);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT)) {
         reason[13] |= (0x1 << 23);
     }
     reason[12] = 0;
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP)) {
         reason[12] |= (0x1 << 15);
     }
 }
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_30_2_0_rxpmd_flex_field_data[] = {
+static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_31_3_0_rxpmd_flex_field_data[] = {
     {
         .name = "DROP_CODE_15_0",
-        .fid = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0,
+        .fid = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 48, 63 }, /* Profile 2. */
             { -1, -1 }, /* Profile 3. */
             { 48, 63 }, /* Profile 4. */
-            { 48, 63 }, /* Profile 5. */
-            { -1, -1 }, /* Profile 6. */
-            { 48, 63 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "DVP_15_0",
-        .fid = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_DVP_15_0,
+        .fid = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_DVP_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 336, 351 }, /* Profile 2. */
             { 336, 351 }, /* Profile 3. */
             { 336, 351 }, /* Profile 4. */
-            { 320, 335 }, /* Profile 5. */
-            { 320, 335 }, /* Profile 6. */
-            { 320, 335 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "EFFECTIVE_TTL_7_0",
-        .fid = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_7_0,
+        .fid = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_7_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 128, 135 }, /* Profile 2. */
             { 128, 135 }, /* Profile 3. */
             { 128, 135 }, /* Profile 4. */
-            { 128, 135 }, /* Profile 5. */
-            { 128, 135 }, /* Profile 6. */
-            { 128, 135 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "ENTROPY_LABEL_HIGH_3_0",
-        .fid = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_HIGH_3_0,
+        .fid = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_HIGH_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 416, 419 }, /* Profile 2. */
             { 416, 419 }, /* Profile 3. */
             { 416, 419 }, /* Profile 4. */
-            { 384, 387 }, /* Profile 5. */
-            { 384, 387 }, /* Profile 6. */
-            { 384, 387 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "ENTROPY_LABEL_LOW_15_0",
-        .fid = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0,
+        .fid = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 160, 175 }, /* Profile 2. */
             { 160, 175 }, /* Profile 3. */
             { 160, 175 }, /* Profile 4. */
-            { 160, 175 }, /* Profile 5. */
-            { 160, 175 }, /* Profile 6. */
-            { 160, 175 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "EP_NIH_HDR_DROP_CODE_15_0",
-        .fid = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_DROP_CODE_15_0,
+        .fid = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_DROP_CODE_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { -1, -1 }, /* Profile 2. */
             { 48, 63 }, /* Profile 3. */
-            { -1, -1 }, /* Profile 4. */
-            { -1, -1 }, /* Profile 5. */
-            { 48, 63 }, /* Profile 6. */
         },
-        .profile_cnt = 7,
+        .profile_cnt = 4,
     },
     {
         .name = "EP_NIH_HDR_RECIRC_CODE_3_0",
-        .fid = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_RECIRC_CODE_3_0,
+        .fid = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_RECIRC_CODE_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 396, 399 }, /* Profile 2. */
             { 396, 399 }, /* Profile 3. */
             { 396, 399 }, /* Profile 4. */
-            { 364, 367 }, /* Profile 5. */
-            { 364, 367 }, /* Profile 6. */
-            { 364, 367 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "EP_NIH_HDR_TIMESTAMP_15_0",
-        .fid = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_15_0,
+        .fid = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 256, 271 }, /* Profile 2. */
-            { 256, 271 }, /* Profile 3. */
-            { -1, -1 }, /* Profile 4. */
-            { 240, 255 }, /* Profile 5. */
-            { 240, 255 }, /* Profile 6. */
+            { 272, 287 }, /* Profile 2. */
+            { 272, 287 }, /* Profile 3. */
         },
-        .profile_cnt = 7,
+        .profile_cnt = 4,
     },
     {
         .name = "EP_NIH_HDR_TIMESTAMP_31_16",
-        .fid = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_31_16,
+        .fid = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_31_16,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 272, 287 }, /* Profile 2. */
-            { 272, 287 }, /* Profile 3. */
-            { -1, -1 }, /* Profile 4. */
-            { 256, 271 }, /* Profile 5. */
-            { 256, 271 }, /* Profile 6. */
+            { 288, 303 }, /* Profile 2. */
+            { 288, 303 }, /* Profile 3. */
         },
-        .profile_cnt = 7,
+        .profile_cnt = 4,
     },
     {
         .name = "ERSPAN3_GBP_SID_15_0",
-        .fid = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_ERSPAN3_GBP_SID_15_0,
+        .fid = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_ERSPAN3_GBP_SID_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 144, 159 }, /* Profile 2. */
             { 144, 159 }, /* Profile 3. */
             { 144, 159 }, /* Profile 4. */
-            { 144, 159 }, /* Profile 5. */
-            { 144, 159 }, /* Profile 6. */
-            { 144, 159 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "EVENT_TRACE_VECTOR_15_0",
-        .fid = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_15_0,
+        .fid = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 0, 15 }, /* Profile 2. */
             { 0, 15 }, /* Profile 3. */
             { 0, 15 }, /* Profile 4. */
-            { 0, 15 }, /* Profile 5. */
-            { 0, 15 }, /* Profile 6. */
-            { 0, 15 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "EVENT_TRACE_VECTOR_31_16",
-        .fid = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_16,
+        .fid = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_16,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 16, 31 }, /* Profile 2. */
             { 16, 31 }, /* Profile 3. */
             { 16, 31 }, /* Profile 4. */
-            { 16, 31 }, /* Profile 5. */
-            { 16, 31 }, /* Profile 6. */
-            { 16, 31 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "EVENT_TRACE_VECTOR_47_32",
-        .fid = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32,
+        .fid = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 32, 47 }, /* Profile 2. */
             { 32, 47 }, /* Profile 3. */
             { 32, 47 }, /* Profile 4. */
-            { 32, 47 }, /* Profile 5. */
-            { 32, 47 }, /* Profile 6. */
-            { 32, 47 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "I2E_CLASS_ID_15_0",
-        .fid = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0,
+        .fid = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 320, 335 }, /* Profile 2. */
             { 320, 335 }, /* Profile 3. */
             { 320, 335 }, /* Profile 4. */
-            { 304, 319 }, /* Profile 5. */
-            { 304, 319 }, /* Profile 6. */
-            { 304, 319 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "ING_TIMESTAMP_15_0",
-        .fid = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_15_0,
+        .fid = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { -1, -1 }, /* Profile 2. */
             { -1, -1 }, /* Profile 3. */
-            { 256, 271 }, /* Profile 4. */
-            { -1, -1 }, /* Profile 5. */
-            { -1, -1 }, /* Profile 6. */
-            { 240, 255 }, /* Profile 7. */
+            { 272, 287 }, /* Profile 4. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "ING_TIMESTAMP_31_16",
-        .fid = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_16,
+        .fid = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_16,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { -1, -1 }, /* Profile 2. */
             { -1, -1 }, /* Profile 3. */
-            { 272, 287 }, /* Profile 4. */
-            { -1, -1 }, /* Profile 5. */
-            { -1, -1 }, /* Profile 6. */
-            { 256, 271 }, /* Profile 7. */
+            { 288, 303 }, /* Profile 4. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "INGRESS_PP_PORT_7_0",
-        .fid = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_INGRESS_PP_PORT_7_0,
+        .fid = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_INGRESS_PP_PORT_7_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 240, 247 }, /* Profile 2. */
-            { 240, 247 }, /* Profile 3. */
-            { 240, 247 }, /* Profile 4. */
-            { 224, 231 }, /* Profile 5. */
-            { 224, 231 }, /* Profile 6. */
-            { 224, 231 }, /* Profile 7. */
+            { 256, 263 }, /* Profile 2. */
+            { 256, 263 }, /* Profile 3. */
+            { 256, 263 }, /* Profile 4. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0",
-        .fid = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0,
+        .fid = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 176, 191 }, /* Profile 2. */
             { 176, 191 }, /* Profile 3. */
             { 176, 191 }, /* Profile 4. */
-            { 176, 191 }, /* Profile 5. */
-            { 176, 191 }, /* Profile 6. */
-            { 176, 191 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "INGRESS_QOS_REMARK_CTRL_3_0",
-        .fid = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0,
+        .fid = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 404, 407 }, /* Profile 2. */
             { 404, 407 }, /* Profile 3. */
             { 404, 407 }, /* Profile 4. */
-            { 372, 375 }, /* Profile 5. */
-            { 372, 375 }, /* Profile 6. */
-            { 372, 375 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "INT_PRI_3_0",
-        .fid = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_INT_PRI_3_0,
+        .fid = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_INT_PRI_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 392, 395 }, /* Profile 2. */
-            { 392, 395 }, /* Profile 3. */
-            { 392, 395 }, /* Profile 4. */
-            { 360, 363 }, /* Profile 5. */
-            { 360, 363 }, /* Profile 6. */
-            { 360, 363 }, /* Profile 7. */
+            { 384, 387 }, /* Profile 2. */
+            { 384, 387 }, /* Profile 3. */
+            { 384, 387 }, /* Profile 4. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "L2_IIF_10_0",
-        .fid = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_L2_IIF_10_0,
+        .fid = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_L2_IIF_10_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 304, 314 }, /* Profile 2. */
             { 304, 314 }, /* Profile 3. */
             { 304, 314 }, /* Profile 4. */
-            { 288, 298 }, /* Profile 5. */
-            { 288, 298 }, /* Profile 6. */
-            { 288, 298 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "L2_OIF_10_0",
-        .fid = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_L2_OIF_10_0,
+        .fid = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_L2_OIF_10_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 208, 218 }, /* Profile 2. */
-            { 208, 218 }, /* Profile 3. */
-            { 208, 218 }, /* Profile 4. */
-            { 208, 218 }, /* Profile 5. */
-            { 208, 218 }, /* Profile 6. */
-            { 208, 218 }, /* Profile 7. */
+            { 224, 234 }, /* Profile 2. */
+            { 224, 234 }, /* Profile 3. */
+            { 224, 234 }, /* Profile 4. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "L2_TUNNEL_SVP_15_0",
-        .fid = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_L2_TUNNEL_SVP_15_0,
+        .fid = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_L2_TUNNEL_SVP_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 288, 303 }, /* Profile 2. */
-            { 288, 303 }, /* Profile 3. */
-            { 288, 303 }, /* Profile 4. */
-            { 272, 287 }, /* Profile 5. */
-            { 272, 287 }, /* Profile 6. */
-            { 272, 287 }, /* Profile 7. */
+            { 192, 207 }, /* Profile 2. */
+            { 192, 207 }, /* Profile 3. */
+            { 192, 207 }, /* Profile 4. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "L3_IIF_13_0",
-        .fid = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_L3_IIF_13_0,
+        .fid = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_L3_IIF_13_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 352, 365 }, /* Profile 2. */
             { 352, 365 }, /* Profile 3. */
             { 352, 365 }, /* Profile 4. */
-            { 336, 349 }, /* Profile 5. */
-            { 336, 349 }, /* Profile 6. */
-            { 336, 349 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "L3_OIF_1_13_0",
-        .fid = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0,
+        .fid = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 224, 237 }, /* Profile 2. */
-            { 224, 237 }, /* Profile 3. */
-            { 224, 237 }, /* Profile 4. */
+            { 240, 253 }, /* Profile 2. */
+            { 240, 253 }, /* Profile 3. */
+            { 240, 253 }, /* Profile 4. */
         },
         .profile_cnt = 5,
     },
     {
         .name = "NHOP_2_OR_ECMP_GROUP_INDEX_1_14_0",
-        .fid = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_14_0,
+        .fid = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_14_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 80, 94 }, /* Profile 2. */
             { 80, 94 }, /* Profile 3. */
             { 80, 94 }, /* Profile 4. */
-            { 80, 94 }, /* Profile 5. */
-            { 80, 94 }, /* Profile 6. */
-            { 80, 94 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "NHOP_INDEX_1_14_0",
-        .fid = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_14_0,
+        .fid = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_14_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -579,153 +504,130 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_30_2_0_rxpmd_flex_field_
     },
     {
         .name = "PARSER_VHLEN_0_15_0",
-        .fid = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0,
+        .fid = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 64, 79 }, /* Profile 2. */
             { 64, 79 }, /* Profile 3. */
             { 64, 79 }, /* Profile 4. */
-            { 64, 79 }, /* Profile 5. */
-            { 64, 79 }, /* Profile 6. */
-            { 64, 79 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "PKT_MISC_CTRL_0_3_0",
-        .fid = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0,
+        .fid = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 400, 403 }, /* Profile 2. */
             { 400, 403 }, /* Profile 3. */
             { 400, 403 }, /* Profile 4. */
-            { 368, 371 }, /* Profile 5. */
-            { 368, 371 }, /* Profile 6. */
-            { 368, 371 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "SVP_NETWORK_GROUP_BITMAP_3_0",
-        .fid = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0,
+        .fid = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 384, 387 }, /* Profile 2. */
-            { 384, 387 }, /* Profile 3. */
-            { 384, 387 }, /* Profile 4. */
-            { 352, 355 }, /* Profile 5. */
-            { 352, 355 }, /* Profile 6. */
-            { 352, 355 }, /* Profile 7. */
+            { 388, 391 }, /* Profile 2. */
+            { 388, 391 }, /* Profile 3. */
+            { 388, 391 }, /* Profile 4. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "SYSTEM_DESTINATION_15_0",
-        .fid = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0,
+        .fid = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 112, 127 }, /* Profile 2. */
             { 112, 127 }, /* Profile 3. */
             { 112, 127 }, /* Profile 4. */
-            { 112, 127 }, /* Profile 5. */
-            { 112, 127 }, /* Profile 6. */
-            { 112, 127 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "SYSTEM_OPCODE_3_0",
-        .fid = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0,
+        .fid = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 412, 415 }, /* Profile 2. */
             { 412, 415 }, /* Profile 3. */
             { 412, 415 }, /* Profile 4. */
-            { 380, 383 }, /* Profile 5. */
-            { 380, 383 }, /* Profile 6. */
-            { 380, 383 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "SYSTEM_SOURCE_15_0",
-        .fid = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_SYSTEM_SOURCE_15_0,
+        .fid = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_SYSTEM_SOURCE_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 96, 111 }, /* Profile 2. */
             { 96, 111 }, /* Profile 3. */
             { 96, 111 }, /* Profile 4. */
-            { 96, 111 }, /* Profile 5. */
-            { 96, 111 }, /* Profile 6. */
-            { 96, 111 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "TAG_ACTION_CTRL_1_0",
-        .fid = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_TAG_ACTION_CTRL_1_0,
+        .fid = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_TAG_ACTION_CTRL_1_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 408, 409 }, /* Profile 2. */
             { 408, 409 }, /* Profile 3. */
             { 408, 409 }, /* Profile 4. */
-            { 376, 377 }, /* Profile 5. */
-            { 376, 377 }, /* Profile 6. */
-            { 376, 377 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "TUNNEL_PROCESSING_RESULTS_1_3_0",
-        .fid = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0,
+        .fid = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 388, 391 }, /* Profile 2. */
-            { 388, 391 }, /* Profile 3. */
-            { 388, 391 }, /* Profile 4. */
-            { 356, 359 }, /* Profile 5. */
-            { 356, 359 }, /* Profile 6. */
-            { 356, 359 }, /* Profile 7. */
+            { 392, 395 }, /* Profile 2. */
+            { 392, 395 }, /* Profile 3. */
+            { 392, 395 }, /* Profile 4. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "VFI_15_0",
-        .fid = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_VFI_15_0,
+        .fid = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_VFI_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 192, 207 }, /* Profile 2. */
-            { 192, 207 }, /* Profile 3. */
-            { 192, 207 }, /* Profile 4. */
-            { 192, 207 }, /* Profile 5. */
-            { 192, 207 }, /* Profile 6. */
-            { 192, 207 }, /* Profile 7. */
+            { 208, 223 }, /* Profile 2. */
+            { 208, 223 }, /* Profile 3. */
+            { 208, 223 }, /* Profile 4. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
-};static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_30_2_0_rxpmd_flex_field_info = {
-    .num_fields = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_FID_COUNT,
-    .info = bcm56780_a0_cna_6_5_30_2_0_rxpmd_flex_field_data,
+};
+static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_31_3_0_rxpmd_flex_field_info = {
+    .num_fields = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_FID_COUNT,
+    .info = bcm56780_a0_cna_6_5_31_3_0_rxpmd_flex_field_data,
+    .profile_bmp_cnt = 1,
+    .profile_bmp[0] = 0x1c,
+
 };
 
-static shr_enum_map_t bcm56780_a0_cna_6_5_30_2_0_rxpmd_flex_reason_names[] = {
-    BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT
+static shr_enum_map_t bcm56780_a0_cna_6_5_31_3_0_rxpmd_flex_reason_names[] = {
+    BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_reasons_info_t bcm56780_a0_cna_6_5_30_2_0_rxpmd_flex_reasons_info = {
-    .num_reasons = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_COUNT,
-    .reason_names = bcm56780_a0_cna_6_5_30_2_0_rxpmd_flex_reason_names,
-    .reason_encode = bcm56780_a0_cna_6_5_30_2_0_rxpmd_flex_reason_encode,
-    .reason_decode = bcm56780_a0_cna_6_5_30_2_0_rxpmd_flex_reason_decode,
+static bcmpkt_flex_reasons_info_t bcm56780_a0_cna_6_5_31_3_0_rxpmd_flex_reasons_info = {
+    .num_reasons = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_COUNT,
+    .reason_names = bcm56780_a0_cna_6_5_31_3_0_rxpmd_flex_reason_names,
+    .reason_encode = bcm56780_a0_cna_6_5_31_3_0_rxpmd_flex_reason_encode,
+    .reason_decode = bcm56780_a0_cna_6_5_31_3_0_rxpmd_flex_reason_decode,
 };
 
 
@@ -868,7 +770,7 @@ static int32_t bcmpkt_arp_t_target_ip_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_arp_t_fget[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_31_3_0_arp_t_fget[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_FID_COUNT] = {
     bcmpkt_arp_t_hardware_len_get,
     bcmpkt_arp_t_hardware_type_get,
     bcmpkt_arp_t_operation_get,
@@ -880,7 +782,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_arp_t_fget[BCM56780_A0_CNA_6_
     bcmpkt_arp_t_target_ip_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_arp_t_fset[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_31_3_0_arp_t_fset[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_FID_COUNT] = {
     bcmpkt_arp_t_hardware_len_set,
     bcmpkt_arp_t_hardware_type_set,
     bcmpkt_arp_t_operation_set,
@@ -892,13 +794,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_arp_t_fset[BCM56780_A0_CNA_6_
     bcmpkt_arp_t_target_ip_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_30_2_0_arp_t_field_data[] = {
-    BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_31_3_0_arp_t_field_data[] = {
+    BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_30_2_0_arp_t_field_info = {
-    .num_fields = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_FID_COUNT,
-    .info = bcm56780_a0_cna_6_5_30_2_0_arp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_31_3_0_arp_t_field_info = {
+    .num_fields = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_FID_COUNT,
+    .info = bcm56780_a0_cna_6_5_31_3_0_arp_t_field_data,
 };
 
 
@@ -1014,7 +916,7 @@ static int32_t bcmpkt_cpu_composites_0_t_dma_cont6_set(uint32_t *data, int profi
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_cpu_composites_0_t_fget[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_31_3_0_cpu_composites_0_t_fget[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
     bcmpkt_cpu_composites_0_t_dma_cont0_get,
     bcmpkt_cpu_composites_0_t_dma_cont1_get,
     bcmpkt_cpu_composites_0_t_dma_cont2_get,
@@ -1024,7 +926,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_cpu_composites_0_t_fget[BCM56
     bcmpkt_cpu_composites_0_t_dma_cont6_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_cpu_composites_0_t_fset[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_31_3_0_cpu_composites_0_t_fset[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
     bcmpkt_cpu_composites_0_t_dma_cont0_set,
     bcmpkt_cpu_composites_0_t_dma_cont1_set,
     bcmpkt_cpu_composites_0_t_dma_cont2_set,
@@ -1034,13 +936,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_cpu_composites_0_t_fset[BCM56
     bcmpkt_cpu_composites_0_t_dma_cont6_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_30_2_0_cpu_composites_0_t_field_data[] = {
-    BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_31_3_0_cpu_composites_0_t_field_data[] = {
+    BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_30_2_0_cpu_composites_0_t_field_info = {
-    .num_fields = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT,
-    .info = bcm56780_a0_cna_6_5_30_2_0_cpu_composites_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_31_3_0_cpu_composites_0_t_field_info = {
+    .num_fields = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT,
+    .info = bcm56780_a0_cna_6_5_31_3_0_cpu_composites_0_t_field_data,
 };
 
 
@@ -1220,7 +1122,7 @@ static int32_t bcmpkt_cpu_composites_1_t_dma_cont9_set(uint32_t *data, int profi
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_cpu_composites_1_t_fget[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_31_3_0_cpu_composites_1_t_fget[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
     bcmpkt_cpu_composites_1_t_dma_cont10_get,
     bcmpkt_cpu_composites_1_t_dma_cont11_get,
     bcmpkt_cpu_composites_1_t_dma_cont12_get,
@@ -1234,7 +1136,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_cpu_composites_1_t_fget[BCM56
     bcmpkt_cpu_composites_1_t_dma_cont9_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_cpu_composites_1_t_fset[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_31_3_0_cpu_composites_1_t_fset[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
     bcmpkt_cpu_composites_1_t_dma_cont10_set,
     bcmpkt_cpu_composites_1_t_dma_cont11_set,
     bcmpkt_cpu_composites_1_t_dma_cont12_set,
@@ -1248,13 +1150,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_cpu_composites_1_t_fset[BCM56
     bcmpkt_cpu_composites_1_t_dma_cont9_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_30_2_0_cpu_composites_1_t_field_data[] = {
-    BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_31_3_0_cpu_composites_1_t_field_data[] = {
+    BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_30_2_0_cpu_composites_1_t_field_info = {
-    .num_fields = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT,
-    .info = bcm56780_a0_cna_6_5_30_2_0_cpu_composites_1_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_31_3_0_cpu_composites_1_t_field_info = {
+    .num_fields = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT,
+    .info = bcm56780_a0_cna_6_5_31_3_0_cpu_composites_1_t_field_data,
 };
 
 
@@ -1440,7 +1342,7 @@ static int32_t bcmpkt_ep_nih_header_t_timestamp_set(uint32_t *data, int profile,
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_ep_nih_header_t_fget[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_31_3_0_ep_nih_header_t_fget[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT] = {
     bcmpkt_ep_nih_header_t_header_subtype_get,
     bcmpkt_ep_nih_header_t_header_type_get,
     bcmpkt_ep_nih_header_t_opaque_ctrl_a_get,
@@ -1455,7 +1357,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_ep_nih_header_t_fget[BCM56780
     bcmpkt_ep_nih_header_t_timestamp_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_ep_nih_header_t_fset[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_31_3_0_ep_nih_header_t_fset[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT] = {
     bcmpkt_ep_nih_header_t_header_subtype_set,
     bcmpkt_ep_nih_header_t_header_type_set,
     bcmpkt_ep_nih_header_t_opaque_ctrl_a_set,
@@ -1470,13 +1372,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_ep_nih_header_t_fset[BCM56780
     bcmpkt_ep_nih_header_t_timestamp_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_30_2_0_ep_nih_header_t_field_data[] = {
-    BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_31_3_0_ep_nih_header_t_field_data[] = {
+    BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_30_2_0_ep_nih_header_t_field_info = {
-    .num_fields = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT,
-    .info = bcm56780_a0_cna_6_5_30_2_0_ep_nih_header_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_31_3_0_ep_nih_header_t_field_info = {
+    .num_fields = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT,
+    .info = bcm56780_a0_cna_6_5_31_3_0_ep_nih_header_t_field_data,
 };
 
 
@@ -1616,7 +1518,7 @@ static int32_t bcmpkt_erspan3_fixed_hdr_t_vlan_set(uint32_t *data, int profile,
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_erspan3_fixed_hdr_t_fget[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_31_3_0_erspan3_fixed_hdr_t_fget[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
     bcmpkt_erspan3_fixed_hdr_t_bso_get,
     bcmpkt_erspan3_fixed_hdr_t_cos_get,
     bcmpkt_erspan3_fixed_hdr_t_gbp_sid_get,
@@ -1628,7 +1530,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_erspan3_fixed_hdr_t_fget[BCM5
     bcmpkt_erspan3_fixed_hdr_t_vlan_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_erspan3_fixed_hdr_t_fset[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_31_3_0_erspan3_fixed_hdr_t_fset[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
     bcmpkt_erspan3_fixed_hdr_t_bso_set,
     bcmpkt_erspan3_fixed_hdr_t_cos_set,
     bcmpkt_erspan3_fixed_hdr_t_gbp_sid_set,
@@ -1640,13 +1542,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_erspan3_fixed_hdr_t_fset[BCM5
     bcmpkt_erspan3_fixed_hdr_t_vlan_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_30_2_0_erspan3_fixed_hdr_t_field_data[] = {
-    BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_31_3_0_erspan3_fixed_hdr_t_field_data[] = {
+    BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_30_2_0_erspan3_fixed_hdr_t_field_info = {
-    .num_fields = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT,
-    .info = bcm56780_a0_cna_6_5_30_2_0_erspan3_fixed_hdr_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_31_3_0_erspan3_fixed_hdr_t_field_info = {
+    .num_fields = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT,
+    .info = bcm56780_a0_cna_6_5_31_3_0_erspan3_fixed_hdr_t_field_data,
 };
 
 
@@ -1711,27 +1613,27 @@ static int32_t bcmpkt_erspan3_subhdr_5_t_timestamp_set(uint32_t *data, int profi
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_erspan3_subhdr_5_t_fget[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_31_3_0_erspan3_subhdr_5_t_fget[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
     bcmpkt_erspan3_subhdr_5_t_platform_id_get,
     bcmpkt_erspan3_subhdr_5_t_port_id_get,
     bcmpkt_erspan3_subhdr_5_t_switch_id_get,
     bcmpkt_erspan3_subhdr_5_t_timestamp_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_erspan3_subhdr_5_t_fset[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_31_3_0_erspan3_subhdr_5_t_fset[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
     bcmpkt_erspan3_subhdr_5_t_platform_id_set,
     bcmpkt_erspan3_subhdr_5_t_port_id_set,
     bcmpkt_erspan3_subhdr_5_t_switch_id_set,
     bcmpkt_erspan3_subhdr_5_t_timestamp_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_30_2_0_erspan3_subhdr_5_t_field_data[] = {
-    BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_31_3_0_erspan3_subhdr_5_t_field_data[] = {
+    BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_30_2_0_erspan3_subhdr_5_t_field_info = {
-    .num_fields = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT,
-    .info = bcm56780_a0_cna_6_5_30_2_0_erspan3_subhdr_5_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_31_3_0_erspan3_subhdr_5_t_field_info = {
+    .num_fields = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT,
+    .info = bcm56780_a0_cna_6_5_31_3_0_erspan3_subhdr_5_t_field_data,
 };
 
 
@@ -1750,21 +1652,21 @@ static int32_t bcmpkt_ethertype_t_type_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_ethertype_t_fget[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_31_3_0_ethertype_t_fget[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
     bcmpkt_ethertype_t_type_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_ethertype_t_fset[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_31_3_0_ethertype_t_fset[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
     bcmpkt_ethertype_t_type_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_30_2_0_ethertype_t_field_data[] = {
-    BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_31_3_0_ethertype_t_field_data[] = {
+    BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_30_2_0_ethertype_t_field_info = {
-    .num_fields = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ETHERTYPE_T_FID_COUNT,
-    .info = bcm56780_a0_cna_6_5_30_2_0_ethertype_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_31_3_0_ethertype_t_field_info = {
+    .num_fields = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T_FID_COUNT,
+    .info = bcm56780_a0_cna_6_5_31_3_0_ethertype_t_field_data,
 };
 
 
@@ -1993,7 +1895,7 @@ static int32_t bcmpkt_generic_loopback_t_start_byte_set(uint32_t *data, int prof
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_generic_loopback_t_fget[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_31_3_0_generic_loopback_t_fget[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
     bcmpkt_generic_loopback_t_destination_obj_get,
     bcmpkt_generic_loopback_t_destination_type_get,
     bcmpkt_generic_loopback_t_entropy_obj_get,
@@ -2011,7 +1913,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_generic_loopback_t_fget[BCM56
     bcmpkt_generic_loopback_t_start_byte_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_generic_loopback_t_fset[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_31_3_0_generic_loopback_t_fset[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
     bcmpkt_generic_loopback_t_destination_obj_set,
     bcmpkt_generic_loopback_t_destination_type_set,
     bcmpkt_generic_loopback_t_entropy_obj_set,
@@ -2029,13 +1931,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_generic_loopback_t_fset[BCM56
     bcmpkt_generic_loopback_t_start_byte_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_30_2_0_generic_loopback_t_field_data[] = {
-    BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_31_3_0_generic_loopback_t_field_data[] = {
+    BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_30_2_0_generic_loopback_t_field_info = {
-    .num_fields = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT,
-    .info = bcm56780_a0_cna_6_5_30_2_0_generic_loopback_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_31_3_0_generic_loopback_t_field_info = {
+    .num_fields = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT,
+    .info = bcm56780_a0_cna_6_5_31_3_0_generic_loopback_t_field_data,
 };
 
 
@@ -2084,25 +1986,25 @@ static int32_t bcmpkt_icmp_t_icmp_type_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_icmp_t_fget[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ICMP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_31_3_0_icmp_t_fget[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ICMP_T_FID_COUNT] = {
     bcmpkt_icmp_t_checksum_get,
     bcmpkt_icmp_t_code_get,
     bcmpkt_icmp_t_icmp_type_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_icmp_t_fset[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ICMP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_31_3_0_icmp_t_fset[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ICMP_T_FID_COUNT] = {
     bcmpkt_icmp_t_checksum_set,
     bcmpkt_icmp_t_code_set,
     bcmpkt_icmp_t_icmp_type_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_30_2_0_icmp_t_field_data[] = {
-    BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_31_3_0_icmp_t_field_data[] = {
+    BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_30_2_0_icmp_t_field_info = {
-    .num_fields = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_ICMP_T_FID_COUNT,
-    .info = bcm56780_a0_cna_6_5_30_2_0_icmp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_31_3_0_icmp_t_field_info = {
+    .num_fields = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_ICMP_T_FID_COUNT,
+    .info = bcm56780_a0_cna_6_5_31_3_0_icmp_t_field_data,
 };
 
 
@@ -2184,7 +2086,7 @@ static int32_t bcmpkt_ipfix_t_version_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_ipfix_t_fget[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPFIX_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_31_3_0_ipfix_t_fget[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPFIX_T_FID_COUNT] = {
     bcmpkt_ipfix_t_export_time_get,
     bcmpkt_ipfix_t_length_get,
     bcmpkt_ipfix_t_obs_domain_id_get,
@@ -2192,7 +2094,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_ipfix_t_fget[BCM56780_A0_CNA_
     bcmpkt_ipfix_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_ipfix_t_fset[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPFIX_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_31_3_0_ipfix_t_fset[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPFIX_T_FID_COUNT] = {
     bcmpkt_ipfix_t_export_time_set,
     bcmpkt_ipfix_t_length_set,
     bcmpkt_ipfix_t_obs_domain_id_set,
@@ -2200,13 +2102,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_ipfix_t_fset[BCM56780_A0_CNA_
     bcmpkt_ipfix_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_30_2_0_ipfix_t_field_data[] = {
-    BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_31_3_0_ipfix_t_field_data[] = {
+    BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_30_2_0_ipfix_t_field_info = {
-    .num_fields = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPFIX_T_FID_COUNT,
-    .info = bcm56780_a0_cna_6_5_30_2_0_ipfix_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_31_3_0_ipfix_t_field_info = {
+    .num_fields = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPFIX_T_FID_COUNT,
+    .info = bcm56780_a0_cna_6_5_31_3_0_ipfix_t_field_data,
 };
 
 
@@ -2378,7 +2280,7 @@ static int32_t bcmpkt_ipv4_t_version_hdr_len_set(uint32_t *data, int profile, ui
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_ipv4_t_fget[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_31_3_0_ipv4_t_fget[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_FID_COUNT] = {
     bcmpkt_ipv4_t_da_get,
     bcmpkt_ipv4_t_flags_frag_offset_get,
     bcmpkt_ipv4_t_hdr_checksum_get,
@@ -2392,7 +2294,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_ipv4_t_fget[BCM56780_A0_CNA_6
     bcmpkt_ipv4_t_version_hdr_len_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_ipv4_t_fset[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_31_3_0_ipv4_t_fset[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_FID_COUNT] = {
     bcmpkt_ipv4_t_da_set,
     bcmpkt_ipv4_t_flags_frag_offset_set,
     bcmpkt_ipv4_t_hdr_checksum_set,
@@ -2406,13 +2308,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_ipv4_t_fset[BCM56780_A0_CNA_6
     bcmpkt_ipv4_t_version_hdr_len_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_30_2_0_ipv4_t_field_data[] = {
-    BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_31_3_0_ipv4_t_field_data[] = {
+    BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_30_2_0_ipv4_t_field_info = {
-    .num_fields = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_FID_COUNT,
-    .info = bcm56780_a0_cna_6_5_30_2_0_ipv4_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_31_3_0_ipv4_t_field_info = {
+    .num_fields = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_FID_COUNT,
+    .info = bcm56780_a0_cna_6_5_31_3_0_ipv4_t_field_data,
 };
 
 
@@ -2538,7 +2440,7 @@ static int32_t bcmpkt_ipv6_t_version_set(uint32_t *data, int profile, uint32_t v
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_ipv6_t_fget[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_31_3_0_ipv6_t_fget[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_FID_COUNT] = {
     bcmpkt_ipv6_t_da_get,
     bcmpkt_ipv6_t_flow_label_get,
     bcmpkt_ipv6_t_hop_limit_get,
@@ -2549,7 +2451,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_ipv6_t_fget[BCM56780_A0_CNA_6
     bcmpkt_ipv6_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_ipv6_t_fset[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_31_3_0_ipv6_t_fset[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_FID_COUNT] = {
     bcmpkt_ipv6_t_da_set,
     bcmpkt_ipv6_t_flow_label_set,
     bcmpkt_ipv6_t_hop_limit_set,
@@ -2560,13 +2462,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_ipv6_t_fset[BCM56780_A0_CNA_6
     bcmpkt_ipv6_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_30_2_0_ipv6_t_field_data[] = {
-    BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_31_3_0_ipv6_t_field_data[] = {
+    BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_30_2_0_ipv6_t_field_info = {
-    .num_fields = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_FID_COUNT,
-    .info = bcm56780_a0_cna_6_5_30_2_0_ipv6_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_31_3_0_ipv6_t_field_info = {
+    .num_fields = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_FID_COUNT,
+    .info = bcm56780_a0_cna_6_5_31_3_0_ipv6_t_field_data,
 };
 
 
@@ -2602,23 +2504,23 @@ static int32_t bcmpkt_l2_t_macsa_set(uint32_t *data, int profile, uint32_t val)
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_l2_t_fget[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_L2_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_31_3_0_l2_t_fget[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_L2_T_FID_COUNT] = {
     bcmpkt_l2_t_macda_get,
     bcmpkt_l2_t_macsa_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_l2_t_fset[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_L2_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_31_3_0_l2_t_fset[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_L2_T_FID_COUNT] = {
     bcmpkt_l2_t_macda_set,
     bcmpkt_l2_t_macsa_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_30_2_0_l2_t_field_data[] = {
-    BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_L2_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_31_3_0_l2_t_field_data[] = {
+    BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_L2_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_30_2_0_l2_t_field_info = {
-    .num_fields = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_L2_T_FID_COUNT,
-    .info = bcm56780_a0_cna_6_5_30_2_0_l2_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_31_3_0_l2_t_field_info = {
+    .num_fields = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_L2_T_FID_COUNT,
+    .info = bcm56780_a0_cna_6_5_31_3_0_l2_t_field_data,
 };
 
 
@@ -2638,21 +2540,21 @@ static int32_t bcmpkt_mirror_erspan_sn_t_seq_num_set(uint32_t *data, int profile
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_mirror_erspan_sn_t_fget[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_31_3_0_mirror_erspan_sn_t_fget[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
     bcmpkt_mirror_erspan_sn_t_seq_num_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_mirror_erspan_sn_t_fset[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_31_3_0_mirror_erspan_sn_t_fset[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
     bcmpkt_mirror_erspan_sn_t_seq_num_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_30_2_0_mirror_erspan_sn_t_field_data[] = {
-    BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_31_3_0_mirror_erspan_sn_t_field_data[] = {
+    BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_30_2_0_mirror_erspan_sn_t_field_info = {
-    .num_fields = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT,
-    .info = bcm56780_a0_cna_6_5_30_2_0_mirror_erspan_sn_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_31_3_0_mirror_erspan_sn_t_field_info = {
+    .num_fields = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT,
+    .info = bcm56780_a0_cna_6_5_31_3_0_mirror_erspan_sn_t_field_data,
 };
 
 
@@ -2672,21 +2574,21 @@ static int32_t bcmpkt_mirror_transport_t_data_set(uint32_t *data, int profile, u
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_mirror_transport_t_fget[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_31_3_0_mirror_transport_t_fget[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
     bcmpkt_mirror_transport_t_data_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_mirror_transport_t_fset[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_31_3_0_mirror_transport_t_fset[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
     bcmpkt_mirror_transport_t_data_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_30_2_0_mirror_transport_t_field_data[] = {
-    BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_31_3_0_mirror_transport_t_field_data[] = {
+    BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_30_2_0_mirror_transport_t_field_info = {
-    .num_fields = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT,
-    .info = bcm56780_a0_cna_6_5_30_2_0_mirror_transport_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_31_3_0_mirror_transport_t_field_info = {
+    .num_fields = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT,
+    .info = bcm56780_a0_cna_6_5_31_3_0_mirror_transport_t_field_data,
 };
 
 
@@ -2798,7 +2700,7 @@ static int32_t bcmpkt_psamp_mirror_on_drop_0_t_template_id_set(uint32_t *data, i
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_0_t_fget[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_0_t_fget[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_0_t_egress_mod_port_get,
     bcmpkt_psamp_mirror_on_drop_0_t_ingress_port_get,
     bcmpkt_psamp_mirror_on_drop_0_t_length_get,
@@ -2808,7 +2710,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_0_t_fget
     bcmpkt_psamp_mirror_on_drop_0_t_template_id_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_0_t_fset[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_0_t_fset[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_0_t_egress_mod_port_set,
     bcmpkt_psamp_mirror_on_drop_0_t_ingress_port_set,
     bcmpkt_psamp_mirror_on_drop_0_t_length_set,
@@ -2818,13 +2720,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_0_t_fset
     bcmpkt_psamp_mirror_on_drop_0_t_template_id_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_0_t_field_data[] = {
-    BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_0_t_field_data[] = {
+    BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_0_t_field_info = {
-    .num_fields = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT,
-    .info = bcm56780_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_0_t_field_info = {
+    .num_fields = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT,
+    .info = bcm56780_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_0_t_field_data,
 };
 
 
@@ -2918,7 +2820,7 @@ static int32_t bcmpkt_psamp_mirror_on_drop_1_t_var_len_indicator_set(uint32_t *d
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_1_t_fget[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_1_t_fget[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_1_t_ing_drop_reason_get,
     bcmpkt_psamp_mirror_on_drop_1_t_mirror_on_drop_obj_get,
     bcmpkt_psamp_mirror_on_drop_1_t_mmu_drop_ctrl_get,
@@ -2927,7 +2829,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_1_t_fget
     bcmpkt_psamp_mirror_on_drop_1_t_var_len_indicator_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_1_t_fset[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_1_t_fset[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_1_t_ing_drop_reason_set,
     bcmpkt_psamp_mirror_on_drop_1_t_mirror_on_drop_obj_set,
     bcmpkt_psamp_mirror_on_drop_1_t_mmu_drop_ctrl_set,
@@ -2936,13 +2838,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_1_t_fset
     bcmpkt_psamp_mirror_on_drop_1_t_var_len_indicator_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_1_t_field_data[] = {
-    BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_1_t_field_data[] = {
+    BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_1_t_field_info = {
-    .num_fields = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FID_COUNT,
-    .info = bcm56780_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_1_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_1_t_field_info = {
+    .num_fields = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FID_COUNT,
+    .info = bcm56780_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_1_t_field_data,
 };
 
 
@@ -3036,7 +2938,7 @@ static int32_t bcmpkt_psamp_mirror_on_drop_2_t_var_len_indicator_set(uint32_t *d
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_2_t_fget[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_2_t_fget[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_2_t_egr_drop_reason_get,
     bcmpkt_psamp_mirror_on_drop_2_t_ep_copy_session_index_get,
     bcmpkt_psamp_mirror_on_drop_2_t_reserved_0_get,
@@ -3045,7 +2947,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_2_t_fget
     bcmpkt_psamp_mirror_on_drop_2_t_var_len_indicator_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_2_t_fset[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_2_t_fset[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_2_t_egr_drop_reason_set,
     bcmpkt_psamp_mirror_on_drop_2_t_ep_copy_session_index_set,
     bcmpkt_psamp_mirror_on_drop_2_t_reserved_0_set,
@@ -3054,13 +2956,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_2_t_fset
     bcmpkt_psamp_mirror_on_drop_2_t_var_len_indicator_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_2_t_field_data[] = {
-    BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_2_t_field_data[] = {
+    BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_2_t_field_info = {
-    .num_fields = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_FID_COUNT,
-    .info = bcm56780_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_2_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_2_t_field_info = {
+    .num_fields = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_FID_COUNT,
+    .info = bcm56780_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_2_t_field_data,
 };
 
 
@@ -3203,7 +3105,7 @@ static int32_t bcmpkt_rarp_t_target_ip_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_rarp_t_fget[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_31_3_0_rarp_t_fget[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_FID_COUNT] = {
     bcmpkt_rarp_t_hardware_len_get,
     bcmpkt_rarp_t_hardware_type_get,
     bcmpkt_rarp_t_operation_get,
@@ -3215,7 +3117,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_rarp_t_fget[BCM56780_A0_CNA_6
     bcmpkt_rarp_t_target_ip_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_rarp_t_fset[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_31_3_0_rarp_t_fset[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_FID_COUNT] = {
     bcmpkt_rarp_t_hardware_len_set,
     bcmpkt_rarp_t_hardware_type_set,
     bcmpkt_rarp_t_operation_set,
@@ -3227,13 +3129,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_rarp_t_fset[BCM56780_A0_CNA_6
     bcmpkt_rarp_t_target_ip_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_30_2_0_rarp_t_field_data[] = {
-    BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_31_3_0_rarp_t_field_data[] = {
+    BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_30_2_0_rarp_t_field_info = {
-    .num_fields = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_FID_COUNT,
-    .info = bcm56780_a0_cna_6_5_30_2_0_rarp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_31_3_0_rarp_t_field_info = {
+    .num_fields = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_FID_COUNT,
+    .info = bcm56780_a0_cna_6_5_31_3_0_rarp_t_field_data,
 };
 
 
@@ -3267,23 +3169,23 @@ static int32_t bcmpkt_tcp_first_4bytes_t_src_port_set(uint32_t *data, int profil
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_tcp_first_4bytes_t_fget[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_31_3_0_tcp_first_4bytes_t_fget[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_first_4bytes_t_dst_port_get,
     bcmpkt_tcp_first_4bytes_t_src_port_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_tcp_first_4bytes_t_fset[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_31_3_0_tcp_first_4bytes_t_fset[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_first_4bytes_t_dst_port_set,
     bcmpkt_tcp_first_4bytes_t_src_port_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_30_2_0_tcp_first_4bytes_t_field_data[] = {
-    BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_31_3_0_tcp_first_4bytes_t_field_data[] = {
+    BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_30_2_0_tcp_first_4bytes_t_field_info = {
-    .num_fields = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT,
-    .info = bcm56780_a0_cna_6_5_30_2_0_tcp_first_4bytes_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_31_3_0_tcp_first_4bytes_t_field_info = {
+    .num_fields = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT,
+    .info = bcm56780_a0_cna_6_5_31_3_0_tcp_first_4bytes_t_field_data,
 };
 
 
@@ -3379,7 +3281,7 @@ static int32_t bcmpkt_tcp_last_16bytes_t_win_size_set(uint32_t *data, int profil
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_tcp_last_16bytes_t_fget[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_31_3_0_tcp_last_16bytes_t_fget[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_last_16bytes_t_ack_num_get,
     bcmpkt_tcp_last_16bytes_t_checksum_get,
     bcmpkt_tcp_last_16bytes_t_hdr_len_and_flags_get,
@@ -3388,7 +3290,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_tcp_last_16bytes_t_fget[BCM56
     bcmpkt_tcp_last_16bytes_t_win_size_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_tcp_last_16bytes_t_fset[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_31_3_0_tcp_last_16bytes_t_fset[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_last_16bytes_t_ack_num_set,
     bcmpkt_tcp_last_16bytes_t_checksum_set,
     bcmpkt_tcp_last_16bytes_t_hdr_len_and_flags_set,
@@ -3397,13 +3299,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_tcp_last_16bytes_t_fset[BCM56
     bcmpkt_tcp_last_16bytes_t_win_size_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_30_2_0_tcp_last_16bytes_t_field_data[] = {
-    BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_31_3_0_tcp_last_16bytes_t_field_data[] = {
+    BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_30_2_0_tcp_last_16bytes_t_field_info = {
-    .num_fields = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT,
-    .info = bcm56780_a0_cna_6_5_30_2_0_tcp_last_16bytes_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_31_3_0_tcp_last_16bytes_t_field_info = {
+    .num_fields = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT,
+    .info = bcm56780_a0_cna_6_5_31_3_0_tcp_last_16bytes_t_field_data,
 };
 
 
@@ -3467,27 +3369,27 @@ static int32_t bcmpkt_udp_t_udp_length_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_udp_t_fget[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UDP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_31_3_0_udp_t_fget[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UDP_T_FID_COUNT] = {
     bcmpkt_udp_t_checksum_get,
     bcmpkt_udp_t_dst_port_get,
     bcmpkt_udp_t_src_port_get,
     bcmpkt_udp_t_udp_length_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_udp_t_fset[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UDP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_31_3_0_udp_t_fset[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UDP_T_FID_COUNT] = {
     bcmpkt_udp_t_checksum_set,
     bcmpkt_udp_t_dst_port_set,
     bcmpkt_udp_t_src_port_set,
     bcmpkt_udp_t_udp_length_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_30_2_0_udp_t_field_data[] = {
-    BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_31_3_0_udp_t_field_data[] = {
+    BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_30_2_0_udp_t_field_info = {
-    .num_fields = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UDP_T_FID_COUNT,
-    .info = bcm56780_a0_cna_6_5_30_2_0_udp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_31_3_0_udp_t_field_info = {
+    .num_fields = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UDP_T_FID_COUNT,
+    .info = bcm56780_a0_cna_6_5_31_3_0_udp_t_field_data,
 };
 
 
@@ -3523,23 +3425,23 @@ static int32_t bcmpkt_unknown_l3_t_next_16bytes_of_l3_payload_set(uint32_t *data
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_unknown_l3_t_fget[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_31_3_0_unknown_l3_t_fget[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
     bcmpkt_unknown_l3_t_first_16bytes_of_l3_payload_get,
     bcmpkt_unknown_l3_t_next_16bytes_of_l3_payload_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_unknown_l3_t_fset[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_31_3_0_unknown_l3_t_fset[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
     bcmpkt_unknown_l3_t_first_16bytes_of_l3_payload_set,
     bcmpkt_unknown_l3_t_next_16bytes_of_l3_payload_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_30_2_0_unknown_l3_t_field_data[] = {
-    BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_31_3_0_unknown_l3_t_field_data[] = {
+    BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_30_2_0_unknown_l3_t_field_info = {
-    .num_fields = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT,
-    .info = bcm56780_a0_cna_6_5_30_2_0_unknown_l3_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_31_3_0_unknown_l3_t_field_info = {
+    .num_fields = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT,
+    .info = bcm56780_a0_cna_6_5_31_3_0_unknown_l3_t_field_data,
 };
 
 
@@ -3559,21 +3461,21 @@ static int32_t bcmpkt_unknown_l4_t_first_4bytes_of_l4_payload_set(uint32_t *data
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_unknown_l4_t_fget[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_31_3_0_unknown_l4_t_fget[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
     bcmpkt_unknown_l4_t_first_4bytes_of_l4_payload_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_unknown_l4_t_fset[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_31_3_0_unknown_l4_t_fset[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
     bcmpkt_unknown_l4_t_first_4bytes_of_l4_payload_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_30_2_0_unknown_l4_t_field_data[] = {
-    BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_31_3_0_unknown_l4_t_field_data[] = {
+    BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_30_2_0_unknown_l4_t_field_info = {
-    .num_fields = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT,
-    .info = bcm56780_a0_cna_6_5_30_2_0_unknown_l4_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_31_3_0_unknown_l4_t_field_info = {
+    .num_fields = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT,
+    .info = bcm56780_a0_cna_6_5_31_3_0_unknown_l4_t_field_data,
 };
 
 
@@ -3623,25 +3525,25 @@ static int32_t bcmpkt_unknown_l5_t_l5_bytes_4_7_set(uint32_t *data, int profile,
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_unknown_l5_t_fget[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_31_3_0_unknown_l5_t_fget[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
     bcmpkt_unknown_l5_t_l5_bytes_0_1_get,
     bcmpkt_unknown_l5_t_l5_bytes_2_3_get,
     bcmpkt_unknown_l5_t_l5_bytes_4_7_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_unknown_l5_t_fset[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_31_3_0_unknown_l5_t_fset[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
     bcmpkt_unknown_l5_t_l5_bytes_0_1_set,
     bcmpkt_unknown_l5_t_l5_bytes_2_3_set,
     bcmpkt_unknown_l5_t_l5_bytes_4_7_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_30_2_0_unknown_l5_t_field_data[] = {
-    BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_31_3_0_unknown_l5_t_field_data[] = {
+    BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_30_2_0_unknown_l5_t_field_info = {
-    .num_fields = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT,
-    .info = bcm56780_a0_cna_6_5_30_2_0_unknown_l5_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_31_3_0_unknown_l5_t_field_info = {
+    .num_fields = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT,
+    .info = bcm56780_a0_cna_6_5_31_3_0_unknown_l5_t_field_data,
 };
 
 
@@ -3705,27 +3607,27 @@ static int32_t bcmpkt_vlan_t_vid_set(uint32_t *data, int profile, uint32_t val)
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_vlan_t_fget[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_VLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_31_3_0_vlan_t_fget[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_VLAN_T_FID_COUNT] = {
     bcmpkt_vlan_t_cfi_get,
     bcmpkt_vlan_t_pcp_get,
     bcmpkt_vlan_t_tpid_get,
     bcmpkt_vlan_t_vid_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_vlan_t_fset[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_VLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_31_3_0_vlan_t_fset[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_VLAN_T_FID_COUNT] = {
     bcmpkt_vlan_t_cfi_set,
     bcmpkt_vlan_t_pcp_set,
     bcmpkt_vlan_t_tpid_set,
     bcmpkt_vlan_t_vid_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_30_2_0_vlan_t_field_data[] = {
-    BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_31_3_0_vlan_t_field_data[] = {
+    BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_30_2_0_vlan_t_field_info = {
-    .num_fields = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_VLAN_T_FID_COUNT,
-    .info = bcm56780_a0_cna_6_5_30_2_0_vlan_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_31_3_0_vlan_t_field_info = {
+    .num_fields = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_VLAN_T_FID_COUNT,
+    .info = bcm56780_a0_cna_6_5_31_3_0_vlan_t_field_data,
 };
 
 
@@ -3775,245 +3677,245 @@ static int32_t bcmpkt_vxlan_t_vn_id_set(uint32_t *data, int profile, uint32_t va
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_30_2_0_vxlan_t_fget[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_VXLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_cna_6_5_31_3_0_vxlan_t_fget[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_VXLAN_T_FID_COUNT] = {
     bcmpkt_vxlan_t_flags_reserved_1_get,
     bcmpkt_vxlan_t_reserved2_get,
     bcmpkt_vxlan_t_vn_id_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_30_2_0_vxlan_t_fset[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_VXLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_cna_6_5_31_3_0_vxlan_t_fset[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_VXLAN_T_FID_COUNT] = {
     bcmpkt_vxlan_t_flags_reserved_1_set,
     bcmpkt_vxlan_t_reserved2_set,
     bcmpkt_vxlan_t_vn_id_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_30_2_0_vxlan_t_field_data[] = {
-    BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_cna_6_5_31_3_0_vxlan_t_field_data[] = {
+    BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_30_2_0_vxlan_t_field_info = {
-    .num_fields = BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_VXLAN_T_FID_COUNT,
-    .info = bcm56780_a0_cna_6_5_30_2_0_vxlan_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_cna_6_5_31_3_0_vxlan_t_field_info = {
+    .num_fields = BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_VXLAN_T_FID_COUNT,
+    .info = bcm56780_a0_cna_6_5_31_3_0_vxlan_t_field_data,
 };
 
-static bcmpkt_flex_pmd_info_t bcm56780_a0_cna_6_5_30_2_0_flexhdr_info_list[BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_FLEXHDR_COUNT] = {
+static bcmpkt_flex_pmd_info_t bcm56780_a0_cna_6_5_31_3_0_flexhdr_info_list[BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_FLEXHDR_COUNT] = {
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_cna_6_5_30_2_0_arp_t_field_info,
+        .field_info = &bcm56780_a0_cna_6_5_31_3_0_arp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_cna_6_5_30_2_0_arp_t_fget,
-        .flex_fset = bcm56780_a0_cna_6_5_30_2_0_arp_t_fset,
+        .flex_fget = bcm56780_a0_cna_6_5_31_3_0_arp_t_fget,
+        .flex_fset = bcm56780_a0_cna_6_5_31_3_0_arp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_cna_6_5_30_2_0_cpu_composites_0_t_field_info,
+        .field_info = &bcm56780_a0_cna_6_5_31_3_0_cpu_composites_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_cna_6_5_30_2_0_cpu_composites_0_t_fget,
-        .flex_fset = bcm56780_a0_cna_6_5_30_2_0_cpu_composites_0_t_fset,
+        .flex_fget = bcm56780_a0_cna_6_5_31_3_0_cpu_composites_0_t_fget,
+        .flex_fset = bcm56780_a0_cna_6_5_31_3_0_cpu_composites_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_cna_6_5_30_2_0_cpu_composites_1_t_field_info,
+        .field_info = &bcm56780_a0_cna_6_5_31_3_0_cpu_composites_1_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_cna_6_5_30_2_0_cpu_composites_1_t_fget,
-        .flex_fset = bcm56780_a0_cna_6_5_30_2_0_cpu_composites_1_t_fset,
+        .flex_fget = bcm56780_a0_cna_6_5_31_3_0_cpu_composites_1_t_fget,
+        .flex_fset = bcm56780_a0_cna_6_5_31_3_0_cpu_composites_1_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_cna_6_5_30_2_0_ep_nih_header_t_field_info,
+        .field_info = &bcm56780_a0_cna_6_5_31_3_0_ep_nih_header_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_cna_6_5_30_2_0_ep_nih_header_t_fget,
-        .flex_fset = bcm56780_a0_cna_6_5_30_2_0_ep_nih_header_t_fset,
+        .flex_fget = bcm56780_a0_cna_6_5_31_3_0_ep_nih_header_t_fget,
+        .flex_fset = bcm56780_a0_cna_6_5_31_3_0_ep_nih_header_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_cna_6_5_30_2_0_erspan3_fixed_hdr_t_field_info,
+        .field_info = &bcm56780_a0_cna_6_5_31_3_0_erspan3_fixed_hdr_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_cna_6_5_30_2_0_erspan3_fixed_hdr_t_fget,
-        .flex_fset = bcm56780_a0_cna_6_5_30_2_0_erspan3_fixed_hdr_t_fset,
+        .flex_fget = bcm56780_a0_cna_6_5_31_3_0_erspan3_fixed_hdr_t_fget,
+        .flex_fset = bcm56780_a0_cna_6_5_31_3_0_erspan3_fixed_hdr_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_cna_6_5_30_2_0_erspan3_subhdr_5_t_field_info,
+        .field_info = &bcm56780_a0_cna_6_5_31_3_0_erspan3_subhdr_5_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_cna_6_5_30_2_0_erspan3_subhdr_5_t_fget,
-        .flex_fset = bcm56780_a0_cna_6_5_30_2_0_erspan3_subhdr_5_t_fset,
+        .flex_fget = bcm56780_a0_cna_6_5_31_3_0_erspan3_subhdr_5_t_fget,
+        .flex_fset = bcm56780_a0_cna_6_5_31_3_0_erspan3_subhdr_5_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_cna_6_5_30_2_0_ethertype_t_field_info,
+        .field_info = &bcm56780_a0_cna_6_5_31_3_0_ethertype_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_cna_6_5_30_2_0_ethertype_t_fget,
-        .flex_fset = bcm56780_a0_cna_6_5_30_2_0_ethertype_t_fset,
+        .flex_fget = bcm56780_a0_cna_6_5_31_3_0_ethertype_t_fget,
+        .flex_fset = bcm56780_a0_cna_6_5_31_3_0_ethertype_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_cna_6_5_30_2_0_generic_loopback_t_field_info,
+        .field_info = &bcm56780_a0_cna_6_5_31_3_0_generic_loopback_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_cna_6_5_30_2_0_generic_loopback_t_fget,
-        .flex_fset = bcm56780_a0_cna_6_5_30_2_0_generic_loopback_t_fset,
+        .flex_fget = bcm56780_a0_cna_6_5_31_3_0_generic_loopback_t_fget,
+        .flex_fset = bcm56780_a0_cna_6_5_31_3_0_generic_loopback_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_cna_6_5_30_2_0_icmp_t_field_info,
+        .field_info = &bcm56780_a0_cna_6_5_31_3_0_icmp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_cna_6_5_30_2_0_icmp_t_fget,
-        .flex_fset = bcm56780_a0_cna_6_5_30_2_0_icmp_t_fset,
+        .flex_fget = bcm56780_a0_cna_6_5_31_3_0_icmp_t_fget,
+        .flex_fset = bcm56780_a0_cna_6_5_31_3_0_icmp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_cna_6_5_30_2_0_ipfix_t_field_info,
+        .field_info = &bcm56780_a0_cna_6_5_31_3_0_ipfix_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_cna_6_5_30_2_0_ipfix_t_fget,
-        .flex_fset = bcm56780_a0_cna_6_5_30_2_0_ipfix_t_fset,
+        .flex_fget = bcm56780_a0_cna_6_5_31_3_0_ipfix_t_fget,
+        .flex_fset = bcm56780_a0_cna_6_5_31_3_0_ipfix_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_cna_6_5_30_2_0_ipv4_t_field_info,
+        .field_info = &bcm56780_a0_cna_6_5_31_3_0_ipv4_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_cna_6_5_30_2_0_ipv4_t_fget,
-        .flex_fset = bcm56780_a0_cna_6_5_30_2_0_ipv4_t_fset,
+        .flex_fget = bcm56780_a0_cna_6_5_31_3_0_ipv4_t_fget,
+        .flex_fset = bcm56780_a0_cna_6_5_31_3_0_ipv4_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_cna_6_5_30_2_0_ipv6_t_field_info,
+        .field_info = &bcm56780_a0_cna_6_5_31_3_0_ipv6_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_cna_6_5_30_2_0_ipv6_t_fget,
-        .flex_fset = bcm56780_a0_cna_6_5_30_2_0_ipv6_t_fset,
+        .flex_fget = bcm56780_a0_cna_6_5_31_3_0_ipv6_t_fget,
+        .flex_fset = bcm56780_a0_cna_6_5_31_3_0_ipv6_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_cna_6_5_30_2_0_l2_t_field_info,
+        .field_info = &bcm56780_a0_cna_6_5_31_3_0_l2_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_cna_6_5_30_2_0_l2_t_fget,
-        .flex_fset = bcm56780_a0_cna_6_5_30_2_0_l2_t_fset,
+        .flex_fget = bcm56780_a0_cna_6_5_31_3_0_l2_t_fget,
+        .flex_fset = bcm56780_a0_cna_6_5_31_3_0_l2_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_cna_6_5_30_2_0_mirror_erspan_sn_t_field_info,
+        .field_info = &bcm56780_a0_cna_6_5_31_3_0_mirror_erspan_sn_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_cna_6_5_30_2_0_mirror_erspan_sn_t_fget,
-        .flex_fset = bcm56780_a0_cna_6_5_30_2_0_mirror_erspan_sn_t_fset,
+        .flex_fget = bcm56780_a0_cna_6_5_31_3_0_mirror_erspan_sn_t_fget,
+        .flex_fset = bcm56780_a0_cna_6_5_31_3_0_mirror_erspan_sn_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_cna_6_5_30_2_0_mirror_transport_t_field_info,
+        .field_info = &bcm56780_a0_cna_6_5_31_3_0_mirror_transport_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_cna_6_5_30_2_0_mirror_transport_t_fget,
-        .flex_fset = bcm56780_a0_cna_6_5_30_2_0_mirror_transport_t_fset,
+        .flex_fget = bcm56780_a0_cna_6_5_31_3_0_mirror_transport_t_fget,
+        .flex_fset = bcm56780_a0_cna_6_5_31_3_0_mirror_transport_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_0_t_field_info,
+        .field_info = &bcm56780_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_0_t_fget,
-        .flex_fset = bcm56780_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_0_t_fset,
+        .flex_fget = bcm56780_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_0_t_fget,
+        .flex_fset = bcm56780_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_1_t_field_info,
+        .field_info = &bcm56780_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_1_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_1_t_fget,
-        .flex_fset = bcm56780_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_1_t_fset,
+        .flex_fget = bcm56780_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_1_t_fget,
+        .flex_fset = bcm56780_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_1_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_2_t_field_info,
+        .field_info = &bcm56780_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_2_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_2_t_fget,
-        .flex_fset = bcm56780_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_2_t_fset,
+        .flex_fget = bcm56780_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_2_t_fget,
+        .flex_fset = bcm56780_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_2_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_cna_6_5_30_2_0_rarp_t_field_info,
+        .field_info = &bcm56780_a0_cna_6_5_31_3_0_rarp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_cna_6_5_30_2_0_rarp_t_fget,
-        .flex_fset = bcm56780_a0_cna_6_5_30_2_0_rarp_t_fset,
+        .flex_fget = bcm56780_a0_cna_6_5_31_3_0_rarp_t_fget,
+        .flex_fset = bcm56780_a0_cna_6_5_31_3_0_rarp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_cna_6_5_30_2_0_tcp_first_4bytes_t_field_info,
+        .field_info = &bcm56780_a0_cna_6_5_31_3_0_tcp_first_4bytes_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_cna_6_5_30_2_0_tcp_first_4bytes_t_fget,
-        .flex_fset = bcm56780_a0_cna_6_5_30_2_0_tcp_first_4bytes_t_fset,
+        .flex_fget = bcm56780_a0_cna_6_5_31_3_0_tcp_first_4bytes_t_fget,
+        .flex_fset = bcm56780_a0_cna_6_5_31_3_0_tcp_first_4bytes_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_cna_6_5_30_2_0_tcp_last_16bytes_t_field_info,
+        .field_info = &bcm56780_a0_cna_6_5_31_3_0_tcp_last_16bytes_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_cna_6_5_30_2_0_tcp_last_16bytes_t_fget,
-        .flex_fset = bcm56780_a0_cna_6_5_30_2_0_tcp_last_16bytes_t_fset,
+        .flex_fget = bcm56780_a0_cna_6_5_31_3_0_tcp_last_16bytes_t_fget,
+        .flex_fset = bcm56780_a0_cna_6_5_31_3_0_tcp_last_16bytes_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_cna_6_5_30_2_0_udp_t_field_info,
+        .field_info = &bcm56780_a0_cna_6_5_31_3_0_udp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_cna_6_5_30_2_0_udp_t_fget,
-        .flex_fset = bcm56780_a0_cna_6_5_30_2_0_udp_t_fset,
+        .flex_fget = bcm56780_a0_cna_6_5_31_3_0_udp_t_fget,
+        .flex_fset = bcm56780_a0_cna_6_5_31_3_0_udp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_cna_6_5_30_2_0_unknown_l3_t_field_info,
+        .field_info = &bcm56780_a0_cna_6_5_31_3_0_unknown_l3_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_cna_6_5_30_2_0_unknown_l3_t_fget,
-        .flex_fset = bcm56780_a0_cna_6_5_30_2_0_unknown_l3_t_fset,
+        .flex_fget = bcm56780_a0_cna_6_5_31_3_0_unknown_l3_t_fget,
+        .flex_fset = bcm56780_a0_cna_6_5_31_3_0_unknown_l3_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_cna_6_5_30_2_0_unknown_l4_t_field_info,
+        .field_info = &bcm56780_a0_cna_6_5_31_3_0_unknown_l4_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_cna_6_5_30_2_0_unknown_l4_t_fget,
-        .flex_fset = bcm56780_a0_cna_6_5_30_2_0_unknown_l4_t_fset,
+        .flex_fget = bcm56780_a0_cna_6_5_31_3_0_unknown_l4_t_fget,
+        .flex_fset = bcm56780_a0_cna_6_5_31_3_0_unknown_l4_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_cna_6_5_30_2_0_unknown_l5_t_field_info,
+        .field_info = &bcm56780_a0_cna_6_5_31_3_0_unknown_l5_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_cna_6_5_30_2_0_unknown_l5_t_fget,
-        .flex_fset = bcm56780_a0_cna_6_5_30_2_0_unknown_l5_t_fset,
+        .flex_fget = bcm56780_a0_cna_6_5_31_3_0_unknown_l5_t_fget,
+        .flex_fset = bcm56780_a0_cna_6_5_31_3_0_unknown_l5_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_cna_6_5_30_2_0_vlan_t_field_info,
+        .field_info = &bcm56780_a0_cna_6_5_31_3_0_vlan_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_cna_6_5_30_2_0_vlan_t_fget,
-        .flex_fset = bcm56780_a0_cna_6_5_30_2_0_vlan_t_fset,
+        .flex_fget = bcm56780_a0_cna_6_5_31_3_0_vlan_t_fget,
+        .flex_fset = bcm56780_a0_cna_6_5_31_3_0_vlan_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_cna_6_5_30_2_0_vxlan_t_field_info,
+        .field_info = &bcm56780_a0_cna_6_5_31_3_0_vxlan_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_cna_6_5_30_2_0_vxlan_t_fget,
-        .flex_fset = bcm56780_a0_cna_6_5_30_2_0_vxlan_t_fset,
+        .flex_fget = bcm56780_a0_cna_6_5_31_3_0_vxlan_t_fget,
+        .flex_fset = bcm56780_a0_cna_6_5_31_3_0_vxlan_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_cna_6_5_30_2_0_rxpmd_flex_field_info,
-        .reasons_info = &bcm56780_a0_cna_6_5_30_2_0_rxpmd_flex_reasons_info,
+        .field_info = &bcm56780_a0_cna_6_5_31_3_0_rxpmd_flex_field_info,
+        .reasons_info = &bcm56780_a0_cna_6_5_31_3_0_rxpmd_flex_reasons_info,
         .flex_common_fget = bcm56780_a0_rxpmd_flex_fget,
         .flex_common_fset = bcm56780_a0_rxpmd_flex_fset,
     },
 };
 
-static shr_enum_map_t bcm56780_a0_cna_6_5_30_2_0_flexhdr_id_map[] = {
-    BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_FLEXHDR_NAME_MAP_INIT
+static shr_enum_map_t bcm56780_a0_cna_6_5_31_3_0_flexhdr_id_map[] = {
+    BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_FLEXHDR_NAME_MAP_INIT
 };
 
-shr_enum_map_t * bcm56780_a0_cna_6_5_30_2_0_flexhdr_map_get(void)
+shr_enum_map_t * bcm56780_a0_cna_6_5_31_3_0_flexhdr_map_get(void)
 {
-    return bcm56780_a0_cna_6_5_30_2_0_flexhdr_id_map;
+    return bcm56780_a0_cna_6_5_31_3_0_flexhdr_id_map;
 }
 
-bcmpkt_flex_pmd_info_t * bcm56780_a0_cna_6_5_30_2_0_flex_pmd_info_get(uint32_t hid)
+bcmpkt_flex_pmd_info_t * bcm56780_a0_cna_6_5_31_3_0_flex_pmd_info_get(uint32_t hid)
 {
-    if (hid >= BCM56780_A0_CNA_6_5_30_2_0_BCMPKT_FLEXHDR_COUNT) {
+    if (hid >= BCM56780_A0_CNA_6_5_31_3_0_BCMPKT_FLEXHDR_COUNT) {
         return NULL;
     }
 
-    return &bcm56780_a0_cna_6_5_30_2_0_flexhdr_info_list[hid];
+    return &bcm56780_a0_cna_6_5_31_3_0_flexhdr_info_list[hid];
 }
 
-int bcm56780_a0_cna_6_5_30_2_0_flexhdr_variant_support_map[BCMPKT_PMD_COUNT] = {
+int bcm56780_a0_cna_6_5_31_3_0_flexhdr_variant_support_map[BCMPKT_PMD_COUNT] = {
     7,
     -1,
     -1,
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_bcmpkt_rxpmd_match_id.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_bcmpkt_rxpmd_match_id.c
similarity index 84%
rename from platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_bcmpkt_rxpmd_match_id.c
rename to platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_bcmpkt_rxpmd_match_id.c
index da2f4202ced8..3836608aac42 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_bcmpkt_rxpmd_match_id.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_bcmpkt_rxpmd_match_id.c
@@ -2,8 +2,8 @@
  *
  * DO NOT EDIT THIS FILE!
  * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) bcm56780_a0_dna_6_5_30_2_0_sf_match_id_info.yml
- * for device bcm56780_a0 and variant dna_6_5_30_2_0.
+ * from the NPL output file(s) bcm56780_a0_dna_6_5_31_7_0_sf_match_id_info.yml
+ * for device bcm56780_a0 and variant dna_6_5_31_7_0.
  * Edits to this file will be lost when it is regenerated.
  *
  * $Id: $
@@ -29,13 +29,13 @@
 
 
 #include <bcmpkt/bcmpkt_rxpmd_match_id.h>
-#include <bcmpkt/xfcr/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_bcmpkt_rxpmd_match_id_defs.h>
+#include <bcmpkt/xfcr/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_bcmpkt_rxpmd_match_id_defs.h>
 
 
 static bcmpkt_rxpmd_match_id_db_t
-bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_COUNT] = {
+bcm56780_a0_dna_6_5_31_7_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_COUNT] = {
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ETAG */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ETAG */
         .name         = "EGRESS_PKT_FWD_L2_HDR_ETAG",
         .match        = 0x80,
         .match_mask   = 0xc0,
@@ -49,7 +49,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_BASE */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_BASE */
         .name         = "EGRESS_PKT_FWD_L2_HDR_HG3_BASE",
         .match        = 0x2,
         .match_mask   = 0x2,
@@ -63,7 +63,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0 */
         .name         = "EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0",
         .match        = 0x22,
         .match_mask   = 0x22,
@@ -77,7 +77,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG */
         .name         = "EGRESS_PKT_FWD_L2_HDR_ITAG",
         .match        = 0x10,
         .match_mask   = 0x10,
@@ -91,7 +91,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2 */
         .name         = "EGRESS_PKT_FWD_L2_HDR_L2",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -105,7 +105,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE */
         .name         = "EGRESS_PKT_FWD_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0xff,
@@ -119,7 +119,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG */
         .name         = "EGRESS_PKT_FWD_L2_HDR_OTAG",
         .match        = 0x8,
         .match_mask   = 0x8,
@@ -133,7 +133,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC */
         .name         = "EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC",
         .match        = 0x4,
         .match_mask   = 0x4,
@@ -147,7 +147,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SVTAG */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SVTAG */
         .name         = "EGRESS_PKT_FWD_L2_HDR_SVTAG",
         .match        = 0x20,
         .match_mask   = 0x22,
@@ -161,7 +161,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_VNTAG */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_VNTAG */
         .name         = "EGRESS_PKT_FWD_L2_HDR_VNTAG",
         .match        = 0x40,
         .match_mask   = 0xc0,
@@ -175,7 +175,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ARP",
         .match        = 0x1800,
         .match_mask   = 0x3830,
@@ -189,7 +189,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1",
         .match        = 0x80,
         .match_mask   = 0x1c2,
@@ -203,7 +203,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2",
         .match        = 0x408,
         .match_mask   = 0x64c,
@@ -217,7 +217,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_BFD",
         .match        = 0x3800,
         .match_mask   = 0x3800,
@@ -231,7 +231,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT",
         .match        = 0x200,
         .match_mask   = 0x642,
@@ -245,7 +245,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -259,7 +259,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1",
         .match        = 0x100,
         .match_mask   = 0x1c0,
@@ -273,7 +273,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2",
         .match        = 0x600,
         .match_mask   = 0x640,
@@ -287,7 +287,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GPE",
         .match        = 0x1830,
         .match_mask   = 0x3870,
@@ -301,7 +301,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE",
         .match        = 0x2,
         .match_mask   = 0x42,
@@ -315,7 +315,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM",
         .match        = 0x202,
         .match_mask   = 0x642,
@@ -329,7 +329,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY",
         .match        = 0x1000,
         .match_mask   = 0x3800,
@@ -343,7 +343,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT",
         .match        = 0x82,
         .match_mask   = 0x1c2,
@@ -357,7 +357,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ",
         .match        = 0x12,
         .match_mask   = 0x72,
@@ -371,7 +371,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ICMP",
         .match        = 0x2000,
         .match_mask   = 0x3830,
@@ -385,7 +385,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA",
         .match        = 0x180,
         .match_mask   = 0x1c0,
@@ -399,7 +399,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IGMP",
         .match        = 0x404,
         .match_mask   = 0x64c,
@@ -413,7 +413,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IPV4",
         .match        = 0x4,
         .match_mask   = 0x4c,
@@ -427,7 +427,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IPV6",
         .match        = 0x8,
         .match_mask   = 0x4c,
@@ -441,7 +441,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS0",
         .match        = 0x40,
         .match_mask   = 0x40,
@@ -455,7 +455,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS1",
         .match        = 0x42,
         .match_mask   = 0x42,
@@ -469,7 +469,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS2",
         .match        = 0x44,
         .match_mask   = 0x44,
@@ -483,7 +483,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS3",
         .match        = 0x48,
         .match_mask   = 0x48,
@@ -497,7 +497,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS4",
         .match        = 0x50,
         .match_mask   = 0x50,
@@ -511,7 +511,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS5",
         .match        = 0x60,
         .match_mask   = 0x60,
@@ -525,7 +525,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS6",
         .match        = 0xc0,
         .match_mask   = 0xc0,
@@ -539,7 +539,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH",
         .match        = 0x140,
         .match_mask   = 0x140,
@@ -553,7 +553,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW",
         .match        = 0x240,
         .match_mask   = 0x240,
@@ -567,7 +567,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3fff,
@@ -581,7 +581,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_P_1588",
         .match        = 0x3000,
         .match_mask   = 0x3800,
@@ -595,7 +595,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_RARP",
         .match        = 0x800,
         .match_mask   = 0x3830,
@@ -609,7 +609,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x20,
         .match_mask   = 0x70,
@@ -623,7 +623,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x820,
         .match_mask   = 0x3870,
@@ -637,7 +637,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UDP",
         .match        = 0x30,
         .match_mask   = 0x70,
@@ -651,7 +651,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3",
         .match        = 0x10,
         .match_mask   = 0x72,
@@ -665,7 +665,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x2800,
         .match_mask   = 0x3800,
@@ -679,7 +679,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x2030,
         .match_mask   = 0x3870,
@@ -693,7 +693,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_VXLAN",
         .match        = 0x830,
         .match_mask   = 0x3870,
@@ -707,7 +707,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH */
         .name         = "EGRESS_PKT_SYS_HDR_EP_NIH",
         .match        = 0x2,
         .match_mask   = 0x3,
@@ -721,7 +721,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK */
         .name         = "EGRESS_PKT_SYS_HDR_LOOPBACK",
         .match        = 0x1,
         .match_mask   = 0x3,
@@ -735,7 +735,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE */
         .name         = "EGRESS_PKT_SYS_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3,
@@ -749,7 +749,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ETAG */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ETAG */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_ETAG",
         .match        = 0x80,
         .match_mask   = 0xc0,
@@ -763,7 +763,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE",
         .match        = 0x2,
         .match_mask   = 0x2,
@@ -777,7 +777,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0 */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0",
         .match        = 0x22,
         .match_mask   = 0x22,
@@ -791,7 +791,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_ITAG",
         .match        = 0x10,
         .match_mask   = 0x10,
@@ -805,7 +805,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2 */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_L2",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -819,7 +819,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0xff,
@@ -833,7 +833,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_OTAG",
         .match        = 0x8,
         .match_mask   = 0x8,
@@ -847,7 +847,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC",
         .match        = 0x4,
         .match_mask   = 0x4,
@@ -861,7 +861,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SVTAG */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SVTAG */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_SVTAG",
         .match        = 0x20,
         .match_mask   = 0x22,
@@ -875,7 +875,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_VNTAG */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_VNTAG */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_VNTAG",
         .match        = 0x40,
         .match_mask   = 0xc0,
@@ -889,7 +889,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP",
         .match        = 0x1800,
         .match_mask   = 0x3830,
@@ -903,7 +903,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1",
         .match        = 0x80,
         .match_mask   = 0x1c2,
@@ -917,7 +917,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2",
         .match        = 0x408,
         .match_mask   = 0x64c,
@@ -931,7 +931,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD",
         .match        = 0x3800,
         .match_mask   = 0x3800,
@@ -945,7 +945,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT",
         .match        = 0x200,
         .match_mask   = 0x642,
@@ -959,7 +959,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -973,7 +973,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1",
         .match        = 0x100,
         .match_mask   = 0x1c0,
@@ -987,7 +987,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2",
         .match        = 0x600,
         .match_mask   = 0x640,
@@ -1001,7 +1001,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE",
         .match        = 0x1830,
         .match_mask   = 0x3870,
@@ -1015,7 +1015,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE",
         .match        = 0x2,
         .match_mask   = 0x42,
@@ -1029,7 +1029,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM",
         .match        = 0x202,
         .match_mask   = 0x642,
@@ -1043,7 +1043,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY",
         .match        = 0x1000,
         .match_mask   = 0x3800,
@@ -1057,7 +1057,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT",
         .match        = 0x82,
         .match_mask   = 0x1c2,
@@ -1071,7 +1071,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ",
         .match        = 0x12,
         .match_mask   = 0x72,
@@ -1085,7 +1085,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP",
         .match        = 0x2000,
         .match_mask   = 0x3830,
@@ -1099,7 +1099,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA",
         .match        = 0x180,
         .match_mask   = 0x1c0,
@@ -1113,7 +1113,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP",
         .match        = 0x404,
         .match_mask   = 0x64c,
@@ -1127,7 +1127,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4",
         .match        = 0x4,
         .match_mask   = 0x4c,
@@ -1141,7 +1141,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6",
         .match        = 0x8,
         .match_mask   = 0x4c,
@@ -1155,7 +1155,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0",
         .match        = 0x40,
         .match_mask   = 0x40,
@@ -1169,7 +1169,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1",
         .match        = 0x42,
         .match_mask   = 0x42,
@@ -1183,7 +1183,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2",
         .match        = 0x44,
         .match_mask   = 0x44,
@@ -1197,7 +1197,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3",
         .match        = 0x48,
         .match_mask   = 0x48,
@@ -1211,7 +1211,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4",
         .match        = 0x50,
         .match_mask   = 0x50,
@@ -1225,7 +1225,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5",
         .match        = 0x60,
         .match_mask   = 0x60,
@@ -1239,7 +1239,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6",
         .match        = 0xc0,
         .match_mask   = 0xc0,
@@ -1253,7 +1253,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH",
         .match        = 0x140,
         .match_mask   = 0x140,
@@ -1267,7 +1267,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW",
         .match        = 0x240,
         .match_mask   = 0x240,
@@ -1281,7 +1281,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3fff,
@@ -1295,7 +1295,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588",
         .match        = 0x3000,
         .match_mask   = 0x3800,
@@ -1309,7 +1309,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP",
         .match        = 0x800,
         .match_mask   = 0x3830,
@@ -1323,7 +1323,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x20,
         .match_mask   = 0x70,
@@ -1337,7 +1337,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x820,
         .match_mask   = 0x3870,
@@ -1351,7 +1351,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP",
         .match        = 0x30,
         .match_mask   = 0x70,
@@ -1365,7 +1365,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3",
         .match        = 0x10,
         .match_mask   = 0x72,
@@ -1379,7 +1379,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x2800,
         .match_mask   = 0x3800,
@@ -1393,7 +1393,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x2030,
         .match_mask   = 0x3870,
@@ -1407,7 +1407,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN",
         .match        = 0x830,
         .match_mask   = 0x3870,
@@ -1421,7 +1421,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ETAG */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ETAG */
         .name         = "INGRESS_PKT_INNER_L2_HDR_ETAG",
         .match        = 0x80,
         .match_mask   = 0xc0,
@@ -1435,7 +1435,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG */
         .name         = "INGRESS_PKT_INNER_L2_HDR_ITAG",
         .match        = 0x10,
         .match_mask   = 0x10,
@@ -1449,7 +1449,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2 */
         .name         = "INGRESS_PKT_INNER_L2_HDR_L2",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -1463,7 +1463,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE */
         .name         = "INGRESS_PKT_INNER_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0xff,
@@ -1477,7 +1477,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG */
         .name         = "INGRESS_PKT_INNER_L2_HDR_OTAG",
         .match        = 0x8,
         .match_mask   = 0x8,
@@ -1491,7 +1491,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC */
         .name         = "INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC",
         .match        = 0x4,
         .match_mask   = 0x4,
@@ -1505,7 +1505,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_VNTAG */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_VNTAG */
         .name         = "INGRESS_PKT_INNER_L2_HDR_VNTAG",
         .match        = 0x40,
         .match_mask   = 0xc0,
@@ -1519,7 +1519,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ARP",
         .match        = 0x1800,
         .match_mask   = 0x3830,
@@ -1533,7 +1533,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1",
         .match        = 0x80,
         .match_mask   = 0x1c2,
@@ -1547,7 +1547,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2",
         .match        = 0x408,
         .match_mask   = 0x64c,
@@ -1561,7 +1561,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_BFD",
         .match        = 0x3800,
         .match_mask   = 0x3800,
@@ -1575,7 +1575,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT",
         .match        = 0x200,
         .match_mask   = 0x642,
@@ -1589,7 +1589,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -1603,7 +1603,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1",
         .match        = 0x100,
         .match_mask   = 0x1c0,
@@ -1617,7 +1617,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2",
         .match        = 0x600,
         .match_mask   = 0x640,
@@ -1631,7 +1631,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ICMP",
         .match        = 0x2000,
         .match_mask   = 0x3830,
@@ -1645,7 +1645,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA",
         .match        = 0x180,
         .match_mask   = 0x1c0,
@@ -1659,7 +1659,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_IGMP",
         .match        = 0x404,
         .match_mask   = 0x64c,
@@ -1673,7 +1673,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_IPV4",
         .match        = 0x4,
         .match_mask   = 0x4c,
@@ -1687,7 +1687,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_IPV6",
         .match        = 0x8,
         .match_mask   = 0x4c,
@@ -1701,7 +1701,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3fff,
@@ -1715,7 +1715,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_P_1588",
         .match        = 0x3000,
         .match_mask   = 0x3800,
@@ -1729,7 +1729,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_RARP",
         .match        = 0x800,
         .match_mask   = 0x3830,
@@ -1743,7 +1743,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x20,
         .match_mask   = 0x70,
@@ -1757,7 +1757,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x820,
         .match_mask   = 0x3870,
@@ -1771,7 +1771,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UDP",
         .match        = 0x30,
         .match_mask   = 0x70,
@@ -1785,7 +1785,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3",
         .match        = 0x10,
         .match_mask   = 0x72,
@@ -1799,7 +1799,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x2800,
         .match_mask   = 0x3800,
@@ -1813,7 +1813,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x2030,
         .match_mask   = 0x3870,
@@ -1827,7 +1827,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ETAG */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ETAG */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_ETAG",
         .match        = 0x80,
         .match_mask   = 0xc0,
@@ -1841,7 +1841,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_BASE */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_BASE */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_HG3_BASE",
         .match        = 0x2,
         .match_mask   = 0x2,
@@ -1855,7 +1855,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0 */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0",
         .match        = 0x22,
         .match_mask   = 0x22,
@@ -1869,7 +1869,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_ITAG",
         .match        = 0x10,
         .match_mask   = 0x10,
@@ -1883,7 +1883,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2 */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_L2",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -1897,7 +1897,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0xff,
@@ -1911,7 +1911,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_OTAG",
         .match        = 0x8,
         .match_mask   = 0x8,
@@ -1925,7 +1925,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC",
         .match        = 0x4,
         .match_mask   = 0x4,
@@ -1939,7 +1939,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SVTAG */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SVTAG */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_SVTAG",
         .match        = 0x20,
         .match_mask   = 0x22,
@@ -1953,7 +1953,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_VNTAG */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_VNTAG */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_VNTAG",
         .match        = 0x40,
         .match_mask   = 0xc0,
@@ -1967,7 +1967,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ARP",
         .match        = 0x1800,
         .match_mask   = 0x3830,
@@ -1981,7 +1981,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1",
         .match        = 0x80,
         .match_mask   = 0x1c2,
@@ -1995,7 +1995,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2",
         .match        = 0x408,
         .match_mask   = 0x64c,
@@ -2009,7 +2009,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_BFD",
         .match        = 0x3800,
         .match_mask   = 0x3800,
@@ -2023,7 +2023,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT",
         .match        = 0x200,
         .match_mask   = 0x642,
@@ -2037,7 +2037,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -2051,7 +2051,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1",
         .match        = 0x100,
         .match_mask   = 0x1c0,
@@ -2065,7 +2065,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2",
         .match        = 0x600,
         .match_mask   = 0x640,
@@ -2079,7 +2079,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GPE",
         .match        = 0x1830,
         .match_mask   = 0x3870,
@@ -2093,7 +2093,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE",
         .match        = 0x2,
         .match_mask   = 0x42,
@@ -2107,7 +2107,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM",
         .match        = 0x202,
         .match_mask   = 0x642,
@@ -2121,7 +2121,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY",
         .match        = 0x1000,
         .match_mask   = 0x3800,
@@ -2135,7 +2135,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT",
         .match        = 0x82,
         .match_mask   = 0x1c2,
@@ -2149,7 +2149,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ",
         .match        = 0x12,
         .match_mask   = 0x72,
@@ -2163,7 +2163,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ICMP",
         .match        = 0x2000,
         .match_mask   = 0x3830,
@@ -2177,7 +2177,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA",
         .match        = 0x180,
         .match_mask   = 0x1c0,
@@ -2191,7 +2191,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IGMP",
         .match        = 0x404,
         .match_mask   = 0x64c,
@@ -2205,7 +2205,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IPV4",
         .match        = 0x4,
         .match_mask   = 0x4c,
@@ -2219,7 +2219,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IPV6",
         .match        = 0x8,
         .match_mask   = 0x4c,
@@ -2233,7 +2233,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0",
         .match        = 0x40,
         .match_mask   = 0x40,
@@ -2247,7 +2247,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1",
         .match        = 0x42,
         .match_mask   = 0x42,
@@ -2261,7 +2261,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2",
         .match        = 0x44,
         .match_mask   = 0x44,
@@ -2275,7 +2275,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3",
         .match        = 0x48,
         .match_mask   = 0x48,
@@ -2289,7 +2289,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4",
         .match        = 0x50,
         .match_mask   = 0x50,
@@ -2303,7 +2303,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5",
         .match        = 0x60,
         .match_mask   = 0x60,
@@ -2317,7 +2317,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6",
         .match        = 0xc0,
         .match_mask   = 0xc0,
@@ -2331,7 +2331,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH",
         .match        = 0x140,
         .match_mask   = 0x140,
@@ -2345,7 +2345,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW",
         .match        = 0x240,
         .match_mask   = 0x240,
@@ -2359,7 +2359,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3fff,
@@ -2373,7 +2373,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_P_1588",
         .match        = 0x3000,
         .match_mask   = 0x3800,
@@ -2387,7 +2387,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_RARP",
         .match        = 0x800,
         .match_mask   = 0x3830,
@@ -2401,7 +2401,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x20,
         .match_mask   = 0x70,
@@ -2415,7 +2415,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x820,
         .match_mask   = 0x3870,
@@ -2429,7 +2429,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UDP",
         .match        = 0x30,
         .match_mask   = 0x70,
@@ -2443,7 +2443,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3",
         .match        = 0x10,
         .match_mask   = 0x72,
@@ -2457,7 +2457,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x2800,
         .match_mask   = 0x3800,
@@ -2471,7 +2471,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x2030,
         .match_mask   = 0x3870,
@@ -2485,7 +2485,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN",
         .match        = 0x830,
         .match_mask   = 0x3870,
@@ -2499,7 +2499,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH */
         .name         = "INGRESS_PKT_SYS_HDR_EP_NIH",
         .match        = 0x2,
         .match_mask   = 0x3,
@@ -2513,7 +2513,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK */
         .name         = "INGRESS_PKT_SYS_HDR_LOOPBACK",
         .match        = 0x1,
         .match_mask   = 0x3,
@@ -2527,7 +2527,7 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE */
+        /* BCM56780_A0_DNA_6_5_31_7_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE */
         .name         = "INGRESS_PKT_SYS_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3,
@@ -2542,23 +2542,23 @@ bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db[BCM56780_A0_DNA_6_5_30_2_0_RXPMD_MA
     },
 };
 
-static bcmpkt_rxpmd_match_id_db_info_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db_info = {
+static bcmpkt_rxpmd_match_id_db_info_t bcm56780_a0_dna_6_5_31_7_0_rxpmd_match_id_db_info = {
     .num_entries = 179,
-    .db = bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db
+    .db = bcm56780_a0_dna_6_5_31_7_0_rxpmd_match_id_db
 };
-bcmpkt_rxpmd_match_id_db_info_t * bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db_info_get(void) {
-    return &bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_db_info;
+bcmpkt_rxpmd_match_id_db_info_t * bcm56780_a0_dna_6_5_31_7_0_rxpmd_match_id_db_info_get(void) {
+    return &bcm56780_a0_dna_6_5_31_7_0_rxpmd_match_id_db_info;
 }
 
-static shr_enum_map_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_map[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT
+static shr_enum_map_t bcm56780_a0_dna_6_5_31_7_0_rxpmd_match_id_map[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_rxpmd_match_id_map_info_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_map_info = {
+static bcmpkt_rxpmd_match_id_map_info_t bcm56780_a0_dna_6_5_31_7_0_rxpmd_match_id_map_info = {
     .num_entries = 179,
-    .map = bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_map
+    .map = bcm56780_a0_dna_6_5_31_7_0_rxpmd_match_id_map
 };
 
-bcmpkt_rxpmd_match_id_map_info_t * bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_map_info_get(void) {
-    return &bcm56780_a0_dna_6_5_30_2_0_rxpmd_match_id_map_info;
+bcmpkt_rxpmd_match_id_map_info_t * bcm56780_a0_dna_6_5_31_7_0_rxpmd_match_id_map_info_get(void) {
+    return &bcm56780_a0_dna_6_5_31_7_0_rxpmd_match_id_map_info;
 }
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_pkt_flexhdr.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_pkt_flexhdr.c
similarity index 70%
rename from platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_pkt_flexhdr.c
rename to platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_pkt_flexhdr.c
index a66a52e569c3..d3da80cbbc35 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_pkt_flexhdr.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_pkt_flexhdr.c
@@ -3,7 +3,7 @@
  * DO NOT EDIT THIS FILE!
  * This file is auto-generated by xfc_map_parser
  * from the NPL output file(s) map.yml
- * for device bcm56780_a0 and variant dna_6_5_30_2_0.
+ * for device bcm56780_a0 and variant dna_6_5_31_7_0.
  * Edits to this file will be lost when it is regenerated.
  *
  * $Id: $
@@ -31,309 +31,309 @@
 #include <shr/shr_error.h>
 #include <bcmpkt/bcmpkt_flexhdr.h>
 #include <bcmpkt/chip/bcm56780_a0/bcmpkt_bcm56780_a0_rxpmd.h>
-#include <bcmpkt/xfcr/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_bcmpkt_flexhdr.h>
-#include <bcmpkt/xfcr/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_bcmpkt_flexhdr_data.h>
-#include <bcmpkt/xfcr/bcm56780_a0/dna_6_5_30_2_0/bcm56780_a0_dna_6_5_30_2_0_bcmpkt_rxpmd_flex_data.h>
+#include <bcmpkt/xfcr/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_bcmpkt_flexhdr.h>
+#include <bcmpkt/xfcr/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_bcmpkt_flexhdr_data.h>
+#include <bcmpkt/xfcr/bcm56780_a0/dna_6_5_31_7_0/bcm56780_a0_dna_6_5_31_7_0_bcmpkt_rxpmd_flex_data.h>
 
 #define MASK(_bn) (((uint32_t)0x1<<(_bn))-1)
 #define WORD_FIELD_GET(_d,_s,_l) (((_d) >> (_s)) & MASK(_l))
 #define WORD_FIELD_SET(_d,_s,_l,_v) (_d)=(((_d) & ~(MASK(_l) << (_s))) | (((_v) & MASK(_l)) << (_s)))
 #define WORD_FIELD_MASK(_d,_s,_l) (_d)=((_d) | (MASK(_l) << (_s)))
 
-static void bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_reason_decode(uint32_t *data, bcmpkt_bitmap_t *reasons)
+static void bcm56780_a0_dna_6_5_31_7_0_rxpmd_flex_reason_decode(uint32_t *data, bcmpkt_bitmap_t *reasons)
 {
     uint32_t *reason = data + 0;
 
     if (reason[13] & (0x1 << 0)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU);
     }
     if (reason[13] & (0x1 << 1)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS);
     }
     if (reason[13] & (0x1 << 2)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE);
     }
     if (reason[13] & (0x1 << 3)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_RESERVED_TRACE_BIT);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_RESERVED_TRACE_BIT);
     }
     if (reason[13] & (0x1 << 4)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD);
     }
     if (reason[13] & (0x1 << 5)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED);
     }
     if (reason[13] & (0x1 << 6)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT);
     }
     if (reason[13] & (0x1 << 7)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD);
     }
     if (reason[13] & (0x1 << 8)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD);
     }
     if (reason[13] & (0x1 << 9)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS);
     }
     if (reason[13] & (0x1 << 10)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP);
     }
     if (reason[13] & (0x1 << 11)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS);
     }
     if (reason[13] & (0x1 << 12)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP);
     }
     if (reason[13] & (0x1 << 13)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR);
     }
     if (reason[13] & (0x1 << 14)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR);
     }
     if (reason[13] & (0x1 << 15)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED);
     }
     if (reason[13] & (0x1 << 16)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL);
     }
     if (reason[13] & (0x1 << 17)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_VFP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_VFP);
     }
     if (reason[13] & (0x1 << 18)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IFP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_IFP);
     }
     if (reason[13] & (0x1 << 19)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER);
     }
     if (reason[13] & (0x1 << 20)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP);
     }
     if (reason[13] & (0x1 << 21)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_SVP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_SVP);
     }
     if (reason[13] & (0x1 << 22)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT);
     }
     if (reason[13] & (0x1 << 23)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT);
     }
     if (reason[13] & (0x1 << 24)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED);
     }
     if (reason[13] & (0x1 << 25)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED);
     }
     if (reason[13] & (0x1 << 26)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP);
     }
     if (reason[13] & (0x1 << 27)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED);
     }
     if (reason[13] & (0x1 << 28)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF);
     }
     if (reason[13] & (0x1 << 29)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED);
     }
     if (reason[13] & (0x1 << 30)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED);
     }
     if (reason[13] & (0x1 << 31)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU);
     }
     if (reason[12] & (0x1 << 0)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0);
     }
     if (reason[12] & (0x1 << 1)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1);
     }
     if (reason[12] & (0x1 << 2)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2);
     }
     if (reason[12] & (0x1 << 3)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3);
     }
     if (reason[12] & (0x1 << 4)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4);
     }
     if (reason[12] & (0x1 << 5)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5);
     }
     if (reason[12] & (0x1 << 6)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6);
     }
     if (reason[12] & (0x1 << 7)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7);
     }
     if (reason[12] & (0x1 << 8)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MTOP_IPV4_GATEWAY);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MTOP_IPV4_GATEWAY);
     }
     if (reason[12] & (0x1 << 9)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED);
     }
     if (reason[12] & (0x1 << 10)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED);
     }
     if (reason[12] & (0x1 << 12)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR);
     }
     if (reason[12] & (0x1 << 13)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU);
     }
     if (reason[12] & (0x1 << 15)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP);
     }
 }
 
-static void bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_reason_encode(bcmpkt_bitmap_t *reasons, uint32_t *data)
+static void bcm56780_a0_dna_6_5_31_7_0_rxpmd_flex_reason_encode(bcmpkt_bitmap_t *reasons, uint32_t *data)
 {
     uint32_t *reason = data + 0;
 
     reason[13] = 0;
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU)) {
         reason[13] |= (0x1 << 0);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS)) {
         reason[13] |= (0x1 << 1);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE)) {
         reason[13] |= (0x1 << 2);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_RESERVED_TRACE_BIT)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_RESERVED_TRACE_BIT)) {
         reason[13] |= (0x1 << 3);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD)) {
         reason[13] |= (0x1 << 4);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED)) {
         reason[13] |= (0x1 << 5);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT)) {
         reason[13] |= (0x1 << 6);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD)) {
         reason[13] |= (0x1 << 7);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD)) {
         reason[13] |= (0x1 << 8);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS)) {
         reason[13] |= (0x1 << 9);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP)) {
         reason[13] |= (0x1 << 10);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS)) {
         reason[13] |= (0x1 << 11);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP)) {
         reason[13] |= (0x1 << 12);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR)) {
         reason[13] |= (0x1 << 13);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR)) {
         reason[13] |= (0x1 << 14);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED)) {
         reason[13] |= (0x1 << 15);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL)) {
         reason[13] |= (0x1 << 16);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_VFP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_VFP)) {
         reason[13] |= (0x1 << 17);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IFP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_IFP)) {
         reason[13] |= (0x1 << 18);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER)) {
         reason[13] |= (0x1 << 19);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP)) {
         reason[13] |= (0x1 << 20);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_SVP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_SVP)) {
         reason[13] |= (0x1 << 21);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT)) {
         reason[13] |= (0x1 << 22);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT)) {
         reason[13] |= (0x1 << 23);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED)) {
         reason[13] |= (0x1 << 24);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED)) {
         reason[13] |= (0x1 << 25);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP)) {
         reason[13] |= (0x1 << 26);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED)) {
         reason[13] |= (0x1 << 27);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF)) {
         reason[13] |= (0x1 << 28);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED)) {
         reason[13] |= (0x1 << 29);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED)) {
         reason[13] |= (0x1 << 30);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU)) {
         reason[13] |= (0x1 << 31);
     }
     reason[12] = 0;
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0)) {
         reason[12] |= (0x1 << 0);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1)) {
         reason[12] |= (0x1 << 1);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2)) {
         reason[12] |= (0x1 << 2);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3)) {
         reason[12] |= (0x1 << 3);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4)) {
         reason[12] |= (0x1 << 4);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5)) {
         reason[12] |= (0x1 << 5);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6)) {
         reason[12] |= (0x1 << 6);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7)) {
         reason[12] |= (0x1 << 7);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MTOP_IPV4_GATEWAY)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_MTOP_IPV4_GATEWAY)) {
         reason[12] |= (0x1 << 8);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED)) {
         reason[12] |= (0x1 << 9);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED)) {
         reason[12] |= (0x1 << 10);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR)) {
         reason[12] |= (0x1 << 12);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU)) {
         reason[12] |= (0x1 << 13);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP)) {
         reason[12] |= (0x1 << 15);
     }
 }
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_data[] = {
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_rxpmd_flex_field_data[] = {
     {
         .name = "DLB_ECMP_DESTINATION_15_0",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_DLB_ECMP_DESTINATION_15_0,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_DLB_ECMP_DESTINATION_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -349,12 +349,24 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { 224, 239 }, /* Profile 11. */
             { 240, 255 }, /* Profile 12. */
             { 224, 239 }, /* Profile 13. */
+            { -1, -1 }, /* Profile 14. */
+            { -1, -1 }, /* Profile 15. */
+            { -1, -1 }, /* Profile 16. */
+            { -1, -1 }, /* Profile 17. */
+            { -1, -1 }, /* Profile 18. */
+            { -1, -1 }, /* Profile 19. */
+            { 240, 255 }, /* Profile 20. */
+            { 224, 239 }, /* Profile 21. */
+            { 240, 255 }, /* Profile 22. */
+            { 224, 239 }, /* Profile 23. */
+            { 240, 255 }, /* Profile 24. */
+            { 224, 239 }, /* Profile 25. */
         },
-        .profile_cnt = 14,
+        .profile_cnt = 26,
     },
     {
         .name = "DROP_CODE_15_0",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -370,12 +382,24 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { -1, -1 }, /* Profile 11. */
             { 48, 63 }, /* Profile 12. */
             { 48, 63 }, /* Profile 13. */
+            { 48, 63 }, /* Profile 14. */
+            { 48, 63 }, /* Profile 15. */
+            { -1, -1 }, /* Profile 16. */
+            { -1, -1 }, /* Profile 17. */
+            { 48, 63 }, /* Profile 18. */
+            { 48, 63 }, /* Profile 19. */
+            { 48, 63 }, /* Profile 20. */
+            { 48, 63 }, /* Profile 21. */
+            { -1, -1 }, /* Profile 22. */
+            { -1, -1 }, /* Profile 23. */
+            { 48, 63 }, /* Profile 24. */
+            { 48, 63 }, /* Profile 25. */
         },
-        .profile_cnt = 14,
+        .profile_cnt = 26,
     },
     {
         .name = "DVP_15_0",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_DVP_15_0,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_DVP_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -391,12 +415,24 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { 368, 383 }, /* Profile 11. */
             { 368, 383 }, /* Profile 12. */
             { 368, 383 }, /* Profile 13. */
+            { 368, 383 }, /* Profile 14. */
+            { 368, 383 }, /* Profile 15. */
+            { 368, 383 }, /* Profile 16. */
+            { 368, 383 }, /* Profile 17. */
+            { 368, 383 }, /* Profile 18. */
+            { 368, 383 }, /* Profile 19. */
+            { 368, 383 }, /* Profile 20. */
+            { 368, 383 }, /* Profile 21. */
+            { 368, 383 }, /* Profile 22. */
+            { 368, 383 }, /* Profile 23. */
+            { 368, 383 }, /* Profile 24. */
+            { 368, 383 }, /* Profile 25. */
         },
-        .profile_cnt = 14,
+        .profile_cnt = 26,
     },
     {
         .name = "EFFECTIVE_TTL_7_0",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_7_0,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_7_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -412,12 +448,24 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { 240, 247 }, /* Profile 11. */
             { 256, 263 }, /* Profile 12. */
             { 240, 247 }, /* Profile 13. */
+            { 256, 263 }, /* Profile 14. */
+            { 240, 247 }, /* Profile 15. */
+            { 256, 263 }, /* Profile 16. */
+            { 240, 247 }, /* Profile 17. */
+            { 256, 263 }, /* Profile 18. */
+            { 240, 247 }, /* Profile 19. */
+            { 256, 263 }, /* Profile 20. */
+            { 240, 247 }, /* Profile 21. */
+            { 256, 263 }, /* Profile 22. */
+            { 240, 247 }, /* Profile 23. */
+            { 256, 263 }, /* Profile 24. */
+            { 240, 247 }, /* Profile 25. */
         },
-        .profile_cnt = 14,
+        .profile_cnt = 26,
     },
     {
         .name = "EGR_MTOP_INDEX_HI_3_0",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EGR_MTOP_INDEX_HI_3_0,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_EGR_MTOP_INDEX_HI_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -433,12 +481,24 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { 384, 387 }, /* Profile 11. */
             { 384, 387 }, /* Profile 12. */
             { 384, 387 }, /* Profile 13. */
+            { 384, 387 }, /* Profile 14. */
+            { 384, 387 }, /* Profile 15. */
+            { 384, 387 }, /* Profile 16. */
+            { 384, 387 }, /* Profile 17. */
+            { 384, 387 }, /* Profile 18. */
+            { 384, 387 }, /* Profile 19. */
+            { 384, 387 }, /* Profile 20. */
+            { 384, 387 }, /* Profile 21. */
+            { 384, 387 }, /* Profile 22. */
+            { 384, 387 }, /* Profile 23. */
+            { 384, 387 }, /* Profile 24. */
+            { 384, 387 }, /* Profile 25. */
         },
-        .profile_cnt = 14,
+        .profile_cnt = 26,
     },
     {
         .name = "EGR_MTOP_INDEX_LO_EP_NIH_DROP_CODE_OR_IFP_OPAQUE_OBJ_15_0",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EGR_MTOP_INDEX_LO_EP_NIH_DROP_CODE_OR_IFP_OPAQUE_OBJ_15_0,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_EGR_MTOP_INDEX_LO_EP_NIH_DROP_CODE_OR_IFP_OPAQUE_OBJ_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -452,12 +512,24 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { -1, -1 }, /* Profile 9. */
             { 48, 63 }, /* Profile 10. */
             { 48, 63 }, /* Profile 11. */
+            { -1, -1 }, /* Profile 12. */
+            { -1, -1 }, /* Profile 13. */
+            { -1, -1 }, /* Profile 14. */
+            { -1, -1 }, /* Profile 15. */
+            { 48, 63 }, /* Profile 16. */
+            { 48, 63 }, /* Profile 17. */
+            { -1, -1 }, /* Profile 18. */
+            { -1, -1 }, /* Profile 19. */
+            { -1, -1 }, /* Profile 20. */
+            { -1, -1 }, /* Profile 21. */
+            { 48, 63 }, /* Profile 22. */
+            { 48, 63 }, /* Profile 23. */
         },
-        .profile_cnt = 12,
+        .profile_cnt = 24,
     },
     {
         .name = "EM_FT_OPAQUE_OBJ_OR_IFP_OPAQUE_OBJ_15_0",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EM_FT_OPAQUE_OBJ_OR_IFP_OPAQUE_OBJ_15_0,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_EM_FT_OPAQUE_OBJ_OR_IFP_OPAQUE_OBJ_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -467,12 +539,24 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { 224, 239 }, /* Profile 5. */
             { 240, 255 }, /* Profile 6. */
             { 224, 239 }, /* Profile 7. */
+            { -1, -1 }, /* Profile 8. */
+            { -1, -1 }, /* Profile 9. */
+            { -1, -1 }, /* Profile 10. */
+            { -1, -1 }, /* Profile 11. */
+            { -1, -1 }, /* Profile 12. */
+            { -1, -1 }, /* Profile 13. */
+            { 240, 255 }, /* Profile 14. */
+            { 224, 239 }, /* Profile 15. */
+            { 240, 255 }, /* Profile 16. */
+            { 224, 239 }, /* Profile 17. */
+            { 240, 255 }, /* Profile 18. */
+            { 224, 239 }, /* Profile 19. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 20,
     },
     {
         .name = "ENTROPY_LABEL_HIGH_3_0",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_HIGH_3_0,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_HIGH_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -488,12 +572,24 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { 404, 407 }, /* Profile 11. */
             { 404, 407 }, /* Profile 12. */
             { 404, 407 }, /* Profile 13. */
+            { 404, 407 }, /* Profile 14. */
+            { 404, 407 }, /* Profile 15. */
+            { 404, 407 }, /* Profile 16. */
+            { 404, 407 }, /* Profile 17. */
+            { 404, 407 }, /* Profile 18. */
+            { 404, 407 }, /* Profile 19. */
+            { 404, 407 }, /* Profile 20. */
+            { 404, 407 }, /* Profile 21. */
+            { 404, 407 }, /* Profile 22. */
+            { 404, 407 }, /* Profile 23. */
+            { 404, 407 }, /* Profile 24. */
+            { 404, 407 }, /* Profile 25. */
         },
-        .profile_cnt = 14,
+        .profile_cnt = 26,
     },
     {
         .name = "ENTROPY_LABEL_LOW_15_0",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -509,12 +605,24 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { 112, 127 }, /* Profile 11. */
             { 112, 127 }, /* Profile 12. */
             { 112, 127 }, /* Profile 13. */
+            { 112, 127 }, /* Profile 14. */
+            { 112, 127 }, /* Profile 15. */
+            { 112, 127 }, /* Profile 16. */
+            { 112, 127 }, /* Profile 17. */
+            { 112, 127 }, /* Profile 18. */
+            { 112, 127 }, /* Profile 19. */
+            { 112, 127 }, /* Profile 20. */
+            { 112, 127 }, /* Profile 21. */
+            { 112, 127 }, /* Profile 22. */
+            { 112, 127 }, /* Profile 23. */
+            { 112, 127 }, /* Profile 24. */
+            { 112, 127 }, /* Profile 25. */
         },
-        .profile_cnt = 14,
+        .profile_cnt = 26,
     },
     {
         .name = "EP_NIH_HDR_TIMESTAMP_15_0",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_15_0,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -528,12 +636,24 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { 272, 287 }, /* Profile 9. */
             { 288, 303 }, /* Profile 10. */
             { 272, 287 }, /* Profile 11. */
+            { -1, -1 }, /* Profile 12. */
+            { -1, -1 }, /* Profile 13. */
+            { 288, 303 }, /* Profile 14. */
+            { 272, 287 }, /* Profile 15. */
+            { 288, 303 }, /* Profile 16. */
+            { 272, 287 }, /* Profile 17. */
+            { -1, -1 }, /* Profile 18. */
+            { -1, -1 }, /* Profile 19. */
+            { 288, 303 }, /* Profile 20. */
+            { 272, 287 }, /* Profile 21. */
+            { 288, 303 }, /* Profile 22. */
+            { 272, 287 }, /* Profile 23. */
         },
-        .profile_cnt = 12,
+        .profile_cnt = 24,
     },
     {
         .name = "EP_NIH_HDR_TIMESTAMP_31_16",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_31_16,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_31_16,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -547,12 +667,24 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { 288, 303 }, /* Profile 9. */
             { 304, 319 }, /* Profile 10. */
             { 288, 303 }, /* Profile 11. */
+            { -1, -1 }, /* Profile 12. */
+            { -1, -1 }, /* Profile 13. */
+            { 304, 319 }, /* Profile 14. */
+            { 288, 303 }, /* Profile 15. */
+            { 304, 319 }, /* Profile 16. */
+            { 288, 303 }, /* Profile 17. */
+            { -1, -1 }, /* Profile 18. */
+            { -1, -1 }, /* Profile 19. */
+            { 304, 319 }, /* Profile 20. */
+            { 288, 303 }, /* Profile 21. */
+            { 304, 319 }, /* Profile 22. */
+            { 288, 303 }, /* Profile 23. */
         },
-        .profile_cnt = 12,
+        .profile_cnt = 24,
     },
     {
         .name = "EVENT_TRACE_VECTOR_15_0",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_15_0,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -568,12 +700,24 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { 0, 15 }, /* Profile 11. */
             { 0, 15 }, /* Profile 12. */
             { 0, 15 }, /* Profile 13. */
+            { 0, 15 }, /* Profile 14. */
+            { 0, 15 }, /* Profile 15. */
+            { 0, 15 }, /* Profile 16. */
+            { 0, 15 }, /* Profile 17. */
+            { 0, 15 }, /* Profile 18. */
+            { 0, 15 }, /* Profile 19. */
+            { 0, 15 }, /* Profile 20. */
+            { 0, 15 }, /* Profile 21. */
+            { 0, 15 }, /* Profile 22. */
+            { 0, 15 }, /* Profile 23. */
+            { 0, 15 }, /* Profile 24. */
+            { 0, 15 }, /* Profile 25. */
         },
-        .profile_cnt = 14,
+        .profile_cnt = 26,
     },
     {
         .name = "EVENT_TRACE_VECTOR_31_16",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_16,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_16,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -589,12 +733,24 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { 16, 31 }, /* Profile 11. */
             { 16, 31 }, /* Profile 12. */
             { 16, 31 }, /* Profile 13. */
+            { 16, 31 }, /* Profile 14. */
+            { 16, 31 }, /* Profile 15. */
+            { 16, 31 }, /* Profile 16. */
+            { 16, 31 }, /* Profile 17. */
+            { 16, 31 }, /* Profile 18. */
+            { 16, 31 }, /* Profile 19. */
+            { 16, 31 }, /* Profile 20. */
+            { 16, 31 }, /* Profile 21. */
+            { 16, 31 }, /* Profile 22. */
+            { 16, 31 }, /* Profile 23. */
+            { 16, 31 }, /* Profile 24. */
+            { 16, 31 }, /* Profile 25. */
         },
-        .profile_cnt = 14,
+        .profile_cnt = 26,
     },
     {
         .name = "EVENT_TRACE_VECTOR_47_32",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -610,12 +766,24 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { 32, 47 }, /* Profile 11. */
             { 32, 47 }, /* Profile 12. */
             { 32, 47 }, /* Profile 13. */
+            { 32, 47 }, /* Profile 14. */
+            { 32, 47 }, /* Profile 15. */
+            { 32, 47 }, /* Profile 16. */
+            { 32, 47 }, /* Profile 17. */
+            { 32, 47 }, /* Profile 18. */
+            { 32, 47 }, /* Profile 19. */
+            { 32, 47 }, /* Profile 20. */
+            { 32, 47 }, /* Profile 21. */
+            { 32, 47 }, /* Profile 22. */
+            { 32, 47 }, /* Profile 23. */
+            { 32, 47 }, /* Profile 24. */
+            { 32, 47 }, /* Profile 25. */
         },
-        .profile_cnt = 14,
+        .profile_cnt = 26,
     },
     {
         .name = "I2E_CLASS_ID_15_0",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -631,12 +799,24 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { 192, 207 }, /* Profile 11. */
             { 208, 223 }, /* Profile 12. */
             { 192, 207 }, /* Profile 13. */
+            { 208, 223 }, /* Profile 14. */
+            { 192, 207 }, /* Profile 15. */
+            { 208, 223 }, /* Profile 16. */
+            { 192, 207 }, /* Profile 17. */
+            { 208, 223 }, /* Profile 18. */
+            { 192, 207 }, /* Profile 19. */
+            { 208, 223 }, /* Profile 20. */
+            { 192, 207 }, /* Profile 21. */
+            { 208, 223 }, /* Profile 22. */
+            { 192, 207 }, /* Profile 23. */
+            { 208, 223 }, /* Profile 24. */
+            { 192, 207 }, /* Profile 25. */
         },
-        .profile_cnt = 14,
+        .profile_cnt = 26,
     },
     {
         .name = "IFP_IOAM_GBP_ACTION_3_0",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_IFP_IOAM_GBP_ACTION_3_0,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_IFP_IOAM_GBP_ACTION_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -652,12 +832,24 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { 392, 395 }, /* Profile 11. */
             { 392, 395 }, /* Profile 12. */
             { 392, 395 }, /* Profile 13. */
+            { 392, 395 }, /* Profile 14. */
+            { 392, 395 }, /* Profile 15. */
+            { 392, 395 }, /* Profile 16. */
+            { 392, 395 }, /* Profile 17. */
+            { 392, 395 }, /* Profile 18. */
+            { 392, 395 }, /* Profile 19. */
+            { 392, 395 }, /* Profile 20. */
+            { 392, 395 }, /* Profile 21. */
+            { 392, 395 }, /* Profile 22. */
+            { 392, 395 }, /* Profile 23. */
+            { 392, 395 }, /* Profile 24. */
+            { 392, 395 }, /* Profile 25. */
         },
-        .profile_cnt = 14,
+        .profile_cnt = 26,
     },
     {
         .name = "IFP_TO_EP_MACSEC_INFO_OR_IFP_OPAQUE_OBJ_15_0",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_IFP_TO_EP_MACSEC_INFO_OR_IFP_OPAQUE_OBJ_15_0,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_IFP_TO_EP_MACSEC_INFO_OR_IFP_OPAQUE_OBJ_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -673,12 +865,24 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { 80, 95 }, /* Profile 11. */
             { 80, 95 }, /* Profile 12. */
             { 80, 95 }, /* Profile 13. */
+            { 80, 95 }, /* Profile 14. */
+            { 80, 95 }, /* Profile 15. */
+            { 80, 95 }, /* Profile 16. */
+            { 80, 95 }, /* Profile 17. */
+            { 80, 95 }, /* Profile 18. */
+            { 80, 95 }, /* Profile 19. */
+            { 80, 95 }, /* Profile 20. */
+            { 80, 95 }, /* Profile 21. */
+            { 80, 95 }, /* Profile 22. */
+            { 80, 95 }, /* Profile 23. */
+            { 80, 95 }, /* Profile 24. */
+            { 80, 95 }, /* Profile 25. */
         },
-        .profile_cnt = 14,
+        .profile_cnt = 26,
     },
     {
         .name = "IFP_TS_CONTROL_ACTION_3_0",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_IFP_TS_CONTROL_ACTION_3_0,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_IFP_TS_CONTROL_ACTION_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -694,12 +898,24 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { 400, 403 }, /* Profile 11. */
             { 400, 403 }, /* Profile 12. */
             { 400, 403 }, /* Profile 13. */
+            { 400, 403 }, /* Profile 14. */
+            { 400, 403 }, /* Profile 15. */
+            { 400, 403 }, /* Profile 16. */
+            { 400, 403 }, /* Profile 17. */
+            { 400, 403 }, /* Profile 18. */
+            { 400, 403 }, /* Profile 19. */
+            { 400, 403 }, /* Profile 20. */
+            { 400, 403 }, /* Profile 21. */
+            { 400, 403 }, /* Profile 22. */
+            { 400, 403 }, /* Profile 23. */
+            { 400, 403 }, /* Profile 24. */
+            { 400, 403 }, /* Profile 25. */
         },
-        .profile_cnt = 14,
+        .profile_cnt = 26,
     },
     {
         .name = "ING_TIMESTAMP_15_0",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_15_0,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -715,12 +931,24 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { -1, -1 }, /* Profile 11. */
             { 288, 303 }, /* Profile 12. */
             { 272, 287 }, /* Profile 13. */
+            { -1, -1 }, /* Profile 14. */
+            { -1, -1 }, /* Profile 15. */
+            { -1, -1 }, /* Profile 16. */
+            { -1, -1 }, /* Profile 17. */
+            { 288, 303 }, /* Profile 18. */
+            { 272, 287 }, /* Profile 19. */
+            { -1, -1 }, /* Profile 20. */
+            { -1, -1 }, /* Profile 21. */
+            { -1, -1 }, /* Profile 22. */
+            { -1, -1 }, /* Profile 23. */
+            { 288, 303 }, /* Profile 24. */
+            { 272, 287 }, /* Profile 25. */
         },
-        .profile_cnt = 14,
+        .profile_cnt = 26,
     },
     {
         .name = "ING_TIMESTAMP_31_16",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_16,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_16,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -736,12 +964,24 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { -1, -1 }, /* Profile 11. */
             { 304, 319 }, /* Profile 12. */
             { 288, 303 }, /* Profile 13. */
+            { -1, -1 }, /* Profile 14. */
+            { -1, -1 }, /* Profile 15. */
+            { -1, -1 }, /* Profile 16. */
+            { -1, -1 }, /* Profile 17. */
+            { 304, 319 }, /* Profile 18. */
+            { 288, 303 }, /* Profile 19. */
+            { -1, -1 }, /* Profile 20. */
+            { -1, -1 }, /* Profile 21. */
+            { -1, -1 }, /* Profile 22. */
+            { -1, -1 }, /* Profile 23. */
+            { 304, 319 }, /* Profile 24. */
+            { 288, 303 }, /* Profile 25. */
         },
-        .profile_cnt = 14,
+        .profile_cnt = 26,
     },
     {
         .name = "INGRESS_PP_PORT_7_0",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_INGRESS_PP_PORT_7_0,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_INGRESS_PP_PORT_7_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -757,12 +997,24 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { 208, 215 }, /* Profile 11. */
             { 224, 231 }, /* Profile 12. */
             { 208, 215 }, /* Profile 13. */
+            { 224, 231 }, /* Profile 14. */
+            { 208, 215 }, /* Profile 15. */
+            { 224, 231 }, /* Profile 16. */
+            { 208, 215 }, /* Profile 17. */
+            { 224, 231 }, /* Profile 18. */
+            { 208, 215 }, /* Profile 19. */
+            { 224, 231 }, /* Profile 20. */
+            { 208, 215 }, /* Profile 21. */
+            { 224, 231 }, /* Profile 22. */
+            { 208, 215 }, /* Profile 23. */
+            { 224, 231 }, /* Profile 24. */
+            { 208, 215 }, /* Profile 25. */
         },
-        .profile_cnt = 14,
+        .profile_cnt = 26,
     },
     {
         .name = "INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -778,12 +1030,24 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { 304, 319 }, /* Profile 11. */
             { 320, 335 }, /* Profile 12. */
             { 304, 319 }, /* Profile 13. */
+            { 320, 335 }, /* Profile 14. */
+            { 304, 319 }, /* Profile 15. */
+            { 320, 335 }, /* Profile 16. */
+            { 304, 319 }, /* Profile 17. */
+            { 320, 335 }, /* Profile 18. */
+            { 304, 319 }, /* Profile 19. */
+            { 320, 335 }, /* Profile 20. */
+            { 304, 319 }, /* Profile 21. */
+            { 320, 335 }, /* Profile 22. */
+            { 304, 319 }, /* Profile 23. */
+            { 320, 335 }, /* Profile 24. */
+            { 304, 319 }, /* Profile 25. */
         },
-        .profile_cnt = 14,
+        .profile_cnt = 26,
     },
     {
         .name = "INGRESS_QOS_REMARK_CTRL_3_0",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -799,12 +1063,24 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { 424, 427 }, /* Profile 11. */
             { 424, 427 }, /* Profile 12. */
             { 424, 427 }, /* Profile 13. */
+            { 424, 427 }, /* Profile 14. */
+            { 424, 427 }, /* Profile 15. */
+            { 424, 427 }, /* Profile 16. */
+            { 424, 427 }, /* Profile 17. */
+            { 424, 427 }, /* Profile 18. */
+            { 424, 427 }, /* Profile 19. */
+            { 424, 427 }, /* Profile 20. */
+            { 424, 427 }, /* Profile 21. */
+            { 424, 427 }, /* Profile 22. */
+            { 424, 427 }, /* Profile 23. */
+            { 424, 427 }, /* Profile 24. */
+            { 424, 427 }, /* Profile 25. */
         },
-        .profile_cnt = 14,
+        .profile_cnt = 26,
     },
     {
         .name = "INT_PRI_3_0",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_INT_PRI_3_0,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_INT_PRI_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -820,12 +1096,24 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { 388, 391 }, /* Profile 11. */
             { 388, 391 }, /* Profile 12. */
             { 388, 391 }, /* Profile 13. */
+            { 388, 391 }, /* Profile 14. */
+            { 388, 391 }, /* Profile 15. */
+            { 388, 391 }, /* Profile 16. */
+            { 388, 391 }, /* Profile 17. */
+            { 388, 391 }, /* Profile 18. */
+            { 388, 391 }, /* Profile 19. */
+            { 388, 391 }, /* Profile 20. */
+            { 388, 391 }, /* Profile 21. */
+            { 388, 391 }, /* Profile 22. */
+            { 388, 391 }, /* Profile 23. */
+            { 388, 391 }, /* Profile 24. */
+            { 388, 391 }, /* Profile 25. */
         },
-        .profile_cnt = 14,
+        .profile_cnt = 26,
     },
     {
         .name = "L2_IIF_10_0",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_L2_IIF_10_0,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_L2_IIF_10_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -840,12 +1128,24 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { 192, 202 }, /* Profile 10. */
             { -1, -1 }, /* Profile 11. */
             { 192, 202 }, /* Profile 12. */
+            { -1, -1 }, /* Profile 13. */
+            { 192, 202 }, /* Profile 14. */
+            { -1, -1 }, /* Profile 15. */
+            { 192, 202 }, /* Profile 16. */
+            { -1, -1 }, /* Profile 17. */
+            { 192, 202 }, /* Profile 18. */
+            { -1, -1 }, /* Profile 19. */
+            { 192, 202 }, /* Profile 20. */
+            { -1, -1 }, /* Profile 21. */
+            { 192, 202 }, /* Profile 22. */
+            { -1, -1 }, /* Profile 23. */
+            { 192, 202 }, /* Profile 24. */
         },
-        .profile_cnt = 13,
+        .profile_cnt = 25,
     },
     {
         .name = "L2_OIF_10_0",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_L2_OIF_10_0,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_L2_OIF_10_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -861,12 +1161,24 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { 336, 346 }, /* Profile 11. */
             { -1, -1 }, /* Profile 12. */
             { 336, 346 }, /* Profile 13. */
+            { -1, -1 }, /* Profile 14. */
+            { 336, 346 }, /* Profile 15. */
+            { -1, -1 }, /* Profile 16. */
+            { 336, 346 }, /* Profile 17. */
+            { -1, -1 }, /* Profile 18. */
+            { 336, 346 }, /* Profile 19. */
+            { -1, -1 }, /* Profile 20. */
+            { 336, 346 }, /* Profile 21. */
+            { -1, -1 }, /* Profile 22. */
+            { 336, 346 }, /* Profile 23. */
+            { -1, -1 }, /* Profile 24. */
+            { 336, 346 }, /* Profile 25. */
         },
-        .profile_cnt = 14,
+        .profile_cnt = 26,
     },
     {
         .name = "L3_IIF_13_0",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_L3_IIF_13_0,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_L3_IIF_13_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -882,12 +1194,24 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { 256, 269 }, /* Profile 11. */
             { 272, 285 }, /* Profile 12. */
             { 256, 269 }, /* Profile 13. */
+            { 272, 285 }, /* Profile 14. */
+            { 256, 269 }, /* Profile 15. */
+            { 272, 285 }, /* Profile 16. */
+            { 256, 269 }, /* Profile 17. */
+            { 272, 285 }, /* Profile 18. */
+            { 256, 269 }, /* Profile 19. */
+            { 272, 285 }, /* Profile 20. */
+            { 256, 269 }, /* Profile 21. */
+            { 272, 285 }, /* Profile 22. */
+            { 256, 269 }, /* Profile 23. */
+            { 272, 285 }, /* Profile 24. */
+            { 256, 269 }, /* Profile 25. */
         },
-        .profile_cnt = 14,
+        .profile_cnt = 26,
     },
     {
         .name = "L3_OIF_1_13_0",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -903,12 +1227,24 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { 352, 365 }, /* Profile 11. */
             { 352, 365 }, /* Profile 12. */
             { 352, 365 }, /* Profile 13. */
+            { 352, 365 }, /* Profile 14. */
+            { 352, 365 }, /* Profile 15. */
+            { 352, 365 }, /* Profile 16. */
+            { 352, 365 }, /* Profile 17. */
+            { 352, 365 }, /* Profile 18. */
+            { 352, 365 }, /* Profile 19. */
+            { 352, 365 }, /* Profile 20. */
+            { 352, 365 }, /* Profile 21. */
+            { 352, 365 }, /* Profile 22. */
+            { 352, 365 }, /* Profile 23. */
+            { 352, 365 }, /* Profile 24. */
+            { 352, 365 }, /* Profile 25. */
         },
-        .profile_cnt = 14,
+        .profile_cnt = 26,
     },
     {
         .name = "MPLS_LABEL_DECAP_COUNT_3_0",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_MPLS_LABEL_DECAP_COUNT_3_0,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_MPLS_LABEL_DECAP_COUNT_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -924,12 +1260,24 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { 432, 435 }, /* Profile 11. */
             { 432, 435 }, /* Profile 12. */
             { 432, 435 }, /* Profile 13. */
+            { 432, 435 }, /* Profile 14. */
+            { 432, 435 }, /* Profile 15. */
+            { 432, 435 }, /* Profile 16. */
+            { 432, 435 }, /* Profile 17. */
+            { 432, 435 }, /* Profile 18. */
+            { 432, 435 }, /* Profile 19. */
+            { 432, 435 }, /* Profile 20. */
+            { 432, 435 }, /* Profile 21. */
+            { 432, 435 }, /* Profile 22. */
+            { 432, 435 }, /* Profile 23. */
+            { 432, 435 }, /* Profile 24. */
+            { 432, 435 }, /* Profile 25. */
         },
-        .profile_cnt = 14,
+        .profile_cnt = 26,
     },
     {
         .name = "NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -945,12 +1293,24 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { 176, 191 }, /* Profile 11. */
             { 176, 191 }, /* Profile 12. */
             { 176, 191 }, /* Profile 13. */
+            { 176, 191 }, /* Profile 14. */
+            { 176, 191 }, /* Profile 15. */
+            { 176, 191 }, /* Profile 16. */
+            { 176, 191 }, /* Profile 17. */
+            { 176, 191 }, /* Profile 18. */
+            { 176, 191 }, /* Profile 19. */
+            { 176, 191 }, /* Profile 20. */
+            { 176, 191 }, /* Profile 21. */
+            { 176, 191 }, /* Profile 22. */
+            { 176, 191 }, /* Profile 23. */
+            { 176, 191 }, /* Profile 24. */
+            { 176, 191 }, /* Profile 25. */
         },
-        .profile_cnt = 14,
+        .profile_cnt = 26,
     },
     {
         .name = "NHOP_INDEX_1_15_0",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_15_0,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -966,12 +1326,24 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { 128, 143 }, /* Profile 11. */
             { 128, 143 }, /* Profile 12. */
             { 128, 143 }, /* Profile 13. */
+            { 128, 143 }, /* Profile 14. */
+            { 128, 143 }, /* Profile 15. */
+            { 128, 143 }, /* Profile 16. */
+            { 128, 143 }, /* Profile 17. */
+            { 128, 143 }, /* Profile 18. */
+            { 128, 143 }, /* Profile 19. */
+            { 128, 143 }, /* Profile 20. */
+            { 128, 143 }, /* Profile 21. */
+            { 128, 143 }, /* Profile 22. */
+            { 128, 143 }, /* Profile 23. */
+            { 128, 143 }, /* Profile 24. */
+            { 128, 143 }, /* Profile 25. */
         },
-        .profile_cnt = 14,
+        .profile_cnt = 26,
     },
     {
         .name = "PARSER_VHLEN_0_15_0",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -987,12 +1359,24 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { 64, 79 }, /* Profile 11. */
             { 64, 79 }, /* Profile 12. */
             { 64, 79 }, /* Profile 13. */
+            { 64, 79 }, /* Profile 14. */
+            { 64, 79 }, /* Profile 15. */
+            { 64, 79 }, /* Profile 16. */
+            { 64, 79 }, /* Profile 17. */
+            { 64, 79 }, /* Profile 18. */
+            { 64, 79 }, /* Profile 19. */
+            { 64, 79 }, /* Profile 20. */
+            { 64, 79 }, /* Profile 21. */
+            { 64, 79 }, /* Profile 22. */
+            { 64, 79 }, /* Profile 23. */
+            { 64, 79 }, /* Profile 24. */
+            { 64, 79 }, /* Profile 25. */
         },
-        .profile_cnt = 14,
+        .profile_cnt = 26,
     },
     {
         .name = "PKT_MISC_CTRL_0_3_0",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1008,33 +1392,57 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { 428, 431 }, /* Profile 11. */
             { 428, 431 }, /* Profile 12. */
             { 428, 431 }, /* Profile 13. */
+            { 428, 431 }, /* Profile 14. */
+            { 428, 431 }, /* Profile 15. */
+            { 428, 431 }, /* Profile 16. */
+            { 428, 431 }, /* Profile 17. */
+            { 428, 431 }, /* Profile 18. */
+            { 428, 431 }, /* Profile 19. */
+            { 428, 431 }, /* Profile 20. */
+            { 428, 431 }, /* Profile 21. */
+            { 428, 431 }, /* Profile 22. */
+            { 428, 431 }, /* Profile 23. */
+            { 428, 431 }, /* Profile 24. */
+            { 428, 431 }, /* Profile 25. */
         },
-        .profile_cnt = 14,
+        .profile_cnt = 26,
     },
     {
         .name = "SVP_15_0",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_SVP_15_0,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_SVP_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 96, 111 }, /* Profile 2. */
-            { 96, 111 }, /* Profile 3. */
-            { 96, 111 }, /* Profile 4. */
-            { 96, 111 }, /* Profile 5. */
-            { 96, 111 }, /* Profile 6. */
-            { 96, 111 }, /* Profile 7. */
-            { 96, 111 }, /* Profile 8. */
-            { 96, 111 }, /* Profile 9. */
-            { 96, 111 }, /* Profile 10. */
-            { 96, 111 }, /* Profile 11. */
-            { 96, 111 }, /* Profile 12. */
-            { 96, 111 }, /* Profile 13. */
+            { 144, 159 }, /* Profile 2. */
+            { 144, 159 }, /* Profile 3. */
+            { 144, 159 }, /* Profile 4. */
+            { 144, 159 }, /* Profile 5. */
+            { 144, 159 }, /* Profile 6. */
+            { 144, 159 }, /* Profile 7. */
+            { 144, 159 }, /* Profile 8. */
+            { 144, 159 }, /* Profile 9. */
+            { 144, 159 }, /* Profile 10. */
+            { 144, 159 }, /* Profile 11. */
+            { 144, 159 }, /* Profile 12. */
+            { 144, 159 }, /* Profile 13. */
+            { 96, 111 }, /* Profile 14. */
+            { 96, 111 }, /* Profile 15. */
+            { 96, 111 }, /* Profile 16. */
+            { 96, 111 }, /* Profile 17. */
+            { 96, 111 }, /* Profile 18. */
+            { 96, 111 }, /* Profile 19. */
+            { 96, 111 }, /* Profile 20. */
+            { 96, 111 }, /* Profile 21. */
+            { 96, 111 }, /* Profile 22. */
+            { 96, 111 }, /* Profile 23. */
+            { 96, 111 }, /* Profile 24. */
+            { 96, 111 }, /* Profile 25. */
         },
-        .profile_cnt = 14,
+        .profile_cnt = 26,
     },
     {
         .name = "SVP_NETWORK_GROUP_BITMAP_3_0",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1050,12 +1458,24 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { 416, 419 }, /* Profile 11. */
             { 416, 419 }, /* Profile 12. */
             { 416, 419 }, /* Profile 13. */
+            { 416, 419 }, /* Profile 14. */
+            { 416, 419 }, /* Profile 15. */
+            { 416, 419 }, /* Profile 16. */
+            { 416, 419 }, /* Profile 17. */
+            { 416, 419 }, /* Profile 18. */
+            { 416, 419 }, /* Profile 19. */
+            { 416, 419 }, /* Profile 20. */
+            { 416, 419 }, /* Profile 21. */
+            { 416, 419 }, /* Profile 22. */
+            { 416, 419 }, /* Profile 23. */
+            { 416, 419 }, /* Profile 24. */
+            { 416, 419 }, /* Profile 25. */
         },
-        .profile_cnt = 14,
+        .profile_cnt = 26,
     },
     {
         .name = "SYSTEM_DESTINATION_15_0",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1071,12 +1491,45 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { 160, 175 }, /* Profile 11. */
             { 160, 175 }, /* Profile 12. */
             { 160, 175 }, /* Profile 13. */
+            { 160, 175 }, /* Profile 14. */
+            { 160, 175 }, /* Profile 15. */
+            { 160, 175 }, /* Profile 16. */
+            { 160, 175 }, /* Profile 17. */
+            { 160, 175 }, /* Profile 18. */
+            { 160, 175 }, /* Profile 19. */
+            { 160, 175 }, /* Profile 20. */
+            { 160, 175 }, /* Profile 21. */
+            { 160, 175 }, /* Profile 22. */
+            { 160, 175 }, /* Profile 23. */
+            { 160, 175 }, /* Profile 24. */
+            { 160, 175 }, /* Profile 25. */
+        },
+        .profile_cnt = 26,
+    },
+    {
+        .name = "SYSTEM_ENTROPY_15_0",
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_SYSTEM_ENTROPY_15_0,
+        .profile = {
+            { -1, -1 }, /* Profile 0. */
+            { -1, -1 }, /* Profile 1. */
+            { 96, 111 }, /* Profile 2. */
+            { 96, 111 }, /* Profile 3. */
+            { 96, 111 }, /* Profile 4. */
+            { 96, 111 }, /* Profile 5. */
+            { 96, 111 }, /* Profile 6. */
+            { 96, 111 }, /* Profile 7. */
+            { 96, 111 }, /* Profile 8. */
+            { 96, 111 }, /* Profile 9. */
+            { 96, 111 }, /* Profile 10. */
+            { 96, 111 }, /* Profile 11. */
+            { 96, 111 }, /* Profile 12. */
+            { 96, 111 }, /* Profile 13. */
         },
         .profile_cnt = 14,
     },
     {
         .name = "SYSTEM_OPCODE_3_0",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1092,33 +1545,57 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { 420, 423 }, /* Profile 11. */
             { 420, 423 }, /* Profile 12. */
             { 420, 423 }, /* Profile 13. */
+            { 420, 423 }, /* Profile 14. */
+            { 420, 423 }, /* Profile 15. */
+            { 420, 423 }, /* Profile 16. */
+            { 420, 423 }, /* Profile 17. */
+            { 420, 423 }, /* Profile 18. */
+            { 420, 423 }, /* Profile 19. */
+            { 420, 423 }, /* Profile 20. */
+            { 420, 423 }, /* Profile 21. */
+            { 420, 423 }, /* Profile 22. */
+            { 420, 423 }, /* Profile 23. */
+            { 420, 423 }, /* Profile 24. */
+            { 420, 423 }, /* Profile 25. */
         },
-        .profile_cnt = 14,
+        .profile_cnt = 26,
     },
     {
         .name = "SYSTEM_SOURCE_15_0",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_SYSTEM_SOURCE_15_0,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_SYSTEM_SOURCE_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 144, 159 }, /* Profile 2. */
-            { 144, 159 }, /* Profile 3. */
-            { 144, 159 }, /* Profile 4. */
-            { 144, 159 }, /* Profile 5. */
-            { 144, 159 }, /* Profile 6. */
-            { 144, 159 }, /* Profile 7. */
-            { 144, 159 }, /* Profile 8. */
-            { 144, 159 }, /* Profile 9. */
-            { 144, 159 }, /* Profile 10. */
-            { 144, 159 }, /* Profile 11. */
-            { 144, 159 }, /* Profile 12. */
-            { 144, 159 }, /* Profile 13. */
+            { -1, -1 }, /* Profile 2. */
+            { -1, -1 }, /* Profile 3. */
+            { -1, -1 }, /* Profile 4. */
+            { -1, -1 }, /* Profile 5. */
+            { -1, -1 }, /* Profile 6. */
+            { -1, -1 }, /* Profile 7. */
+            { -1, -1 }, /* Profile 8. */
+            { -1, -1 }, /* Profile 9. */
+            { -1, -1 }, /* Profile 10. */
+            { -1, -1 }, /* Profile 11. */
+            { -1, -1 }, /* Profile 12. */
+            { -1, -1 }, /* Profile 13. */
+            { 144, 159 }, /* Profile 14. */
+            { 144, 159 }, /* Profile 15. */
+            { 144, 159 }, /* Profile 16. */
+            { 144, 159 }, /* Profile 17. */
+            { 144, 159 }, /* Profile 18. */
+            { 144, 159 }, /* Profile 19. */
+            { 144, 159 }, /* Profile 20. */
+            { 144, 159 }, /* Profile 21. */
+            { 144, 159 }, /* Profile 22. */
+            { 144, 159 }, /* Profile 23. */
+            { 144, 159 }, /* Profile 24. */
+            { 144, 159 }, /* Profile 25. */
         },
-        .profile_cnt = 14,
+        .profile_cnt = 26,
     },
     {
         .name = "TIMESTAMP_CTRL_3_0",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_TIMESTAMP_CTRL_3_0,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_TIMESTAMP_CTRL_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1134,12 +1611,24 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { 408, 411 }, /* Profile 11. */
             { 408, 411 }, /* Profile 12. */
             { 408, 411 }, /* Profile 13. */
+            { 408, 411 }, /* Profile 14. */
+            { 408, 411 }, /* Profile 15. */
+            { 408, 411 }, /* Profile 16. */
+            { 408, 411 }, /* Profile 17. */
+            { 408, 411 }, /* Profile 18. */
+            { 408, 411 }, /* Profile 19. */
+            { 408, 411 }, /* Profile 20. */
+            { 408, 411 }, /* Profile 21. */
+            { 408, 411 }, /* Profile 22. */
+            { 408, 411 }, /* Profile 23. */
+            { 408, 411 }, /* Profile 24. */
+            { 408, 411 }, /* Profile 25. */
         },
-        .profile_cnt = 14,
+        .profile_cnt = 26,
     },
     {
         .name = "TUNNEL_PROCESSING_RESULTS_1_3_0",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1155,12 +1644,24 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { 412, 415 }, /* Profile 11. */
             { 412, 415 }, /* Profile 12. */
             { 412, 415 }, /* Profile 13. */
+            { 412, 415 }, /* Profile 14. */
+            { 412, 415 }, /* Profile 15. */
+            { 412, 415 }, /* Profile 16. */
+            { 412, 415 }, /* Profile 17. */
+            { 412, 415 }, /* Profile 18. */
+            { 412, 415 }, /* Profile 19. */
+            { 412, 415 }, /* Profile 20. */
+            { 412, 415 }, /* Profile 21. */
+            { 412, 415 }, /* Profile 22. */
+            { 412, 415 }, /* Profile 23. */
+            { 412, 415 }, /* Profile 24. */
+            { 412, 415 }, /* Profile 25. */
         },
-        .profile_cnt = 14,
+        .profile_cnt = 26,
     },
     {
         .name = "VFI_15_0",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_VFI_15_0,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_VFI_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1176,12 +1677,24 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { 320, 335 }, /* Profile 11. */
             { 336, 351 }, /* Profile 12. */
             { 320, 335 }, /* Profile 13. */
+            { 336, 351 }, /* Profile 14. */
+            { 320, 335 }, /* Profile 15. */
+            { 336, 351 }, /* Profile 16. */
+            { 320, 335 }, /* Profile 17. */
+            { 336, 351 }, /* Profile 18. */
+            { 320, 335 }, /* Profile 19. */
+            { 336, 351 }, /* Profile 20. */
+            { 320, 335 }, /* Profile 21. */
+            { 336, 351 }, /* Profile 22. */
+            { 320, 335 }, /* Profile 23. */
+            { 336, 351 }, /* Profile 24. */
+            { 320, 335 }, /* Profile 25. */
         },
-        .profile_cnt = 14,
+        .profile_cnt = 26,
     },
     {
         .name = "VLAN_TAG_PRESERVE_CTRL_SVP_MIRROR_ENABLE_1_0",
-        .fid = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_VLAN_TAG_PRESERVE_CTRL_SVP_MIRROR_ENABLE_1_0,
+        .fid = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_VLAN_TAG_PRESERVE_CTRL_SVP_MIRROR_ENABLE_1_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1197,23 +1710,39 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_
             { 396, 397 }, /* Profile 11. */
             { 396, 397 }, /* Profile 12. */
             { 396, 397 }, /* Profile 13. */
+            { 396, 397 }, /* Profile 14. */
+            { 396, 397 }, /* Profile 15. */
+            { 396, 397 }, /* Profile 16. */
+            { 396, 397 }, /* Profile 17. */
+            { 396, 397 }, /* Profile 18. */
+            { 396, 397 }, /* Profile 19. */
+            { 396, 397 }, /* Profile 20. */
+            { 396, 397 }, /* Profile 21. */
+            { 396, 397 }, /* Profile 22. */
+            { 396, 397 }, /* Profile 23. */
+            { 396, 397 }, /* Profile 24. */
+            { 396, 397 }, /* Profile 25. */
         },
-        .profile_cnt = 14,
+        .profile_cnt = 26,
     },
-};static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_data,
+};
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_rxpmd_flex_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_rxpmd_flex_field_data,
+    .profile_bmp_cnt = 1,
+    .profile_bmp[0] = 0x3fffffc,
+
 };
 
-static shr_enum_map_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_reason_names[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT
+static shr_enum_map_t bcm56780_a0_dna_6_5_31_7_0_rxpmd_flex_reason_names[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_reasons_info_t bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_reasons_info = {
-    .num_reasons = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_COUNT,
-    .reason_names = bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_reason_names,
-    .reason_encode = bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_reason_encode,
-    .reason_decode = bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_reason_decode,
+static bcmpkt_flex_reasons_info_t bcm56780_a0_dna_6_5_31_7_0_rxpmd_flex_reasons_info = {
+    .num_reasons = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RXPMD_FLEX_REASON_COUNT,
+    .reason_names = bcm56780_a0_dna_6_5_31_7_0_rxpmd_flex_reason_names,
+    .reason_encode = bcm56780_a0_dna_6_5_31_7_0_rxpmd_flex_reason_encode,
+    .reason_decode = bcm56780_a0_dna_6_5_31_7_0_rxpmd_flex_reason_decode,
 };
 
 
@@ -1356,7 +1885,7 @@ static int32_t bcmpkt_arp_t_target_ip_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_arp_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ARP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_arp_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_FID_COUNT] = {
     bcmpkt_arp_t_hardware_len_get,
     bcmpkt_arp_t_hardware_type_get,
     bcmpkt_arp_t_operation_get,
@@ -1368,7 +1897,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_arp_t_fget[BCM56780_A0_DNA_6_
     bcmpkt_arp_t_target_ip_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_arp_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ARP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_arp_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_FID_COUNT] = {
     bcmpkt_arp_t_hardware_len_set,
     bcmpkt_arp_t_hardware_type_set,
     bcmpkt_arp_t_operation_set,
@@ -1380,13 +1909,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_arp_t_fset[BCM56780_A0_DNA_6_
     bcmpkt_arp_t_target_ip_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_arp_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_arp_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_arp_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ARP_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_arp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_arp_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ARP_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_arp_t_field_data,
 };
 
 
@@ -1483,7 +2012,7 @@ static int32_t bcmpkt_authen_t_spi_set(uint32_t *data, int profile, uint32_t val
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_authen_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_AUTHEN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_authen_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T_FID_COUNT] = {
     bcmpkt_authen_t_data_get,
     bcmpkt_authen_t_next_header_get,
     bcmpkt_authen_t_payload_len_get,
@@ -1492,7 +2021,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_authen_t_fget[BCM56780_A0_DNA
     bcmpkt_authen_t_spi_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_authen_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_AUTHEN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_authen_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T_FID_COUNT] = {
     bcmpkt_authen_t_data_set,
     bcmpkt_authen_t_next_header_set,
     bcmpkt_authen_t_payload_len_set,
@@ -1501,13 +2030,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_authen_t_fset[BCM56780_A0_DNA
     bcmpkt_authen_t_spi_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_authen_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_AUTHEN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_authen_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_authen_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_AUTHEN_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_authen_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_authen_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_AUTHEN_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_authen_t_field_data,
 };
 
 
@@ -1756,7 +2285,7 @@ static int32_t bcmpkt_bfd_t_version_set(uint32_t *data, int profile, uint32_t va
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_bfd_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_bfd_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_FID_COUNT] = {
     bcmpkt_bfd_t_ap_get,
     bcmpkt_bfd_t_bfd_length_get,
     bcmpkt_bfd_t_cpi_get,
@@ -1775,7 +2304,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_bfd_t_fget[BCM56780_A0_DNA_6_
     bcmpkt_bfd_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_bfd_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_bfd_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_FID_COUNT] = {
     bcmpkt_bfd_t_ap_set,
     bcmpkt_bfd_t_bfd_length_set,
     bcmpkt_bfd_t_cpi_set,
@@ -1794,13 +2323,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_bfd_t_fset[BCM56780_A0_DNA_6_
     bcmpkt_bfd_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_bfd_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_bfd_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_bfd_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_BFD_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_bfd_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_bfd_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_BFD_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_bfd_t_field_data,
 };
 
 
@@ -1834,23 +2363,23 @@ static int32_t bcmpkt_cntag_t_tpid_set(uint32_t *data, int profile, uint32_t val
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_cntag_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CNTAG_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_cntag_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CNTAG_T_FID_COUNT] = {
     bcmpkt_cntag_t_rpid_get,
     bcmpkt_cntag_t_tpid_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_cntag_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CNTAG_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_cntag_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CNTAG_T_FID_COUNT] = {
     bcmpkt_cntag_t_rpid_set,
     bcmpkt_cntag_t_tpid_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_cntag_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CNTAG_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_cntag_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CNTAG_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_cntag_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CNTAG_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_cntag_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_cntag_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CNTAG_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_cntag_t_field_data,
 };
 
 
@@ -1966,7 +2495,7 @@ static int32_t bcmpkt_cpu_composites_0_t_dma_cont6_set(uint32_t *data, int profi
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_cpu_composites_0_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_cpu_composites_0_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
     bcmpkt_cpu_composites_0_t_dma_cont0_get,
     bcmpkt_cpu_composites_0_t_dma_cont1_get,
     bcmpkt_cpu_composites_0_t_dma_cont2_get,
@@ -1976,7 +2505,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_cpu_composites_0_t_fget[BCM56
     bcmpkt_cpu_composites_0_t_dma_cont6_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_cpu_composites_0_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_cpu_composites_0_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
     bcmpkt_cpu_composites_0_t_dma_cont0_set,
     bcmpkt_cpu_composites_0_t_dma_cont1_set,
     bcmpkt_cpu_composites_0_t_dma_cont2_set,
@@ -1986,13 +2515,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_cpu_composites_0_t_fset[BCM56
     bcmpkt_cpu_composites_0_t_dma_cont6_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_cpu_composites_0_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_cpu_composites_0_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_cpu_composites_0_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_cpu_composites_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_cpu_composites_0_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_cpu_composites_0_t_field_data,
 };
 
 
@@ -2172,7 +2701,7 @@ static int32_t bcmpkt_cpu_composites_1_t_dma_cont9_set(uint32_t *data, int profi
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_cpu_composites_1_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_cpu_composites_1_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
     bcmpkt_cpu_composites_1_t_dma_cont10_get,
     bcmpkt_cpu_composites_1_t_dma_cont11_get,
     bcmpkt_cpu_composites_1_t_dma_cont12_get,
@@ -2186,7 +2715,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_cpu_composites_1_t_fget[BCM56
     bcmpkt_cpu_composites_1_t_dma_cont9_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_cpu_composites_1_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_cpu_composites_1_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
     bcmpkt_cpu_composites_1_t_dma_cont10_set,
     bcmpkt_cpu_composites_1_t_dma_cont11_set,
     bcmpkt_cpu_composites_1_t_dma_cont12_set,
@@ -2200,13 +2729,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_cpu_composites_1_t_fset[BCM56
     bcmpkt_cpu_composites_1_t_dma_cont9_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_cpu_composites_1_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_cpu_composites_1_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_cpu_composites_1_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_cpu_composites_1_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_cpu_composites_1_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_cpu_composites_1_t_field_data,
 };
 
 
@@ -2256,25 +2785,25 @@ static int32_t bcmpkt_dest_option_t_option_set(uint32_t *data, int profile, uint
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_dest_option_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_DEST_OPTION_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_dest_option_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_DEST_OPTION_T_FID_COUNT] = {
     bcmpkt_dest_option_t_hdr_ext_len_get,
     bcmpkt_dest_option_t_next_header_get,
     bcmpkt_dest_option_t_option_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_dest_option_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_DEST_OPTION_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_dest_option_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_DEST_OPTION_T_FID_COUNT] = {
     bcmpkt_dest_option_t_hdr_ext_len_set,
     bcmpkt_dest_option_t_next_header_set,
     bcmpkt_dest_option_t_option_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_dest_option_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_DEST_OPTION_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_dest_option_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_DEST_OPTION_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_dest_option_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_DEST_OPTION_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_dest_option_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_dest_option_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_DEST_OPTION_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_dest_option_t_field_data,
 };
 
 
@@ -2460,7 +2989,7 @@ static int32_t bcmpkt_ep_nih_header_t_timestamp_set(uint32_t *data, int profile,
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_ep_nih_header_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_ep_nih_header_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT] = {
     bcmpkt_ep_nih_header_t_header_subtype_get,
     bcmpkt_ep_nih_header_t_header_type_get,
     bcmpkt_ep_nih_header_t_opaque_ctrl_a_get,
@@ -2475,7 +3004,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_ep_nih_header_t_fget[BCM56780
     bcmpkt_ep_nih_header_t_timestamp_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_ep_nih_header_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_ep_nih_header_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT] = {
     bcmpkt_ep_nih_header_t_header_subtype_set,
     bcmpkt_ep_nih_header_t_header_type_set,
     bcmpkt_ep_nih_header_t_opaque_ctrl_a_set,
@@ -2490,13 +3019,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_ep_nih_header_t_fset[BCM56780
     bcmpkt_ep_nih_header_t_timestamp_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_ep_nih_header_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_ep_nih_header_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_ep_nih_header_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_ep_nih_header_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_ep_nih_header_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_ep_nih_header_t_field_data,
 };
 
 
@@ -2636,7 +3165,7 @@ static int32_t bcmpkt_erspan3_fixed_hdr_t_vlan_set(uint32_t *data, int profile,
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_erspan3_fixed_hdr_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_erspan3_fixed_hdr_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
     bcmpkt_erspan3_fixed_hdr_t_bso_get,
     bcmpkt_erspan3_fixed_hdr_t_cos_get,
     bcmpkt_erspan3_fixed_hdr_t_gbp_sid_get,
@@ -2648,7 +3177,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_erspan3_fixed_hdr_t_fget[BCM5
     bcmpkt_erspan3_fixed_hdr_t_vlan_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_erspan3_fixed_hdr_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_erspan3_fixed_hdr_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
     bcmpkt_erspan3_fixed_hdr_t_bso_set,
     bcmpkt_erspan3_fixed_hdr_t_cos_set,
     bcmpkt_erspan3_fixed_hdr_t_gbp_sid_set,
@@ -2660,13 +3189,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_erspan3_fixed_hdr_t_fset[BCM5
     bcmpkt_erspan3_fixed_hdr_t_vlan_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_erspan3_fixed_hdr_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_erspan3_fixed_hdr_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_erspan3_fixed_hdr_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_erspan3_fixed_hdr_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_erspan3_fixed_hdr_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_erspan3_fixed_hdr_t_field_data,
 };
 
 
@@ -2731,27 +3260,27 @@ static int32_t bcmpkt_erspan3_subhdr_5_t_timestamp_set(uint32_t *data, int profi
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_erspan3_subhdr_5_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_erspan3_subhdr_5_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
     bcmpkt_erspan3_subhdr_5_t_platform_id_get,
     bcmpkt_erspan3_subhdr_5_t_port_id_get,
     bcmpkt_erspan3_subhdr_5_t_switch_id_get,
     bcmpkt_erspan3_subhdr_5_t_timestamp_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_erspan3_subhdr_5_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_erspan3_subhdr_5_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
     bcmpkt_erspan3_subhdr_5_t_platform_id_set,
     bcmpkt_erspan3_subhdr_5_t_port_id_set,
     bcmpkt_erspan3_subhdr_5_t_switch_id_set,
     bcmpkt_erspan3_subhdr_5_t_timestamp_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_erspan3_subhdr_5_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_erspan3_subhdr_5_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_erspan3_subhdr_5_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_erspan3_subhdr_5_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_erspan3_subhdr_5_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_erspan3_subhdr_5_t_field_data,
 };
 
 
@@ -2832,7 +3361,7 @@ static int32_t bcmpkt_esp_t_spi_set(uint32_t *data, int profile, uint32_t val) {
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_esp_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ESP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_esp_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ESP_T_FID_COUNT] = {
     bcmpkt_esp_t_next_header_get,
     bcmpkt_esp_t_pad_get,
     bcmpkt_esp_t_pad_len_get,
@@ -2840,7 +3369,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_esp_t_fget[BCM56780_A0_DNA_6_
     bcmpkt_esp_t_spi_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_esp_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ESP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_esp_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ESP_T_FID_COUNT] = {
     bcmpkt_esp_t_next_header_set,
     bcmpkt_esp_t_pad_set,
     bcmpkt_esp_t_pad_len_set,
@@ -2848,13 +3377,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_esp_t_fset[BCM56780_A0_DNA_6_
     bcmpkt_esp_t_spi_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_esp_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ESP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_esp_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ESP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_esp_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ESP_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_esp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_esp_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ESP_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_esp_t_field_data,
 };
 
 
@@ -2889,23 +3418,23 @@ static int32_t bcmpkt_etag_t_tpid_set(uint32_t *data, int profile, uint32_t val)
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_etag_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ETAG_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_etag_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ETAG_T_FID_COUNT] = {
     bcmpkt_etag_t_tag_get,
     bcmpkt_etag_t_tpid_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_etag_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ETAG_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_etag_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ETAG_T_FID_COUNT] = {
     bcmpkt_etag_t_tag_set,
     bcmpkt_etag_t_tpid_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_etag_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ETAG_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_etag_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ETAG_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_etag_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ETAG_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_etag_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_etag_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ETAG_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_etag_t_field_data,
 };
 
 
@@ -2924,21 +3453,21 @@ static int32_t bcmpkt_ethertype_t_type_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_ethertype_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_ethertype_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
     bcmpkt_ethertype_t_type_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_ethertype_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_ethertype_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
     bcmpkt_ethertype_t_type_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_ethertype_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_ethertype_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_ethertype_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ETHERTYPE_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_ethertype_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_ethertype_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ETHERTYPE_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_ethertype_t_field_data,
 };
 
 
@@ -3003,27 +3532,27 @@ static int32_t bcmpkt_frag_t_reserved_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_frag_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_FRAG_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_frag_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_FRAG_T_FID_COUNT] = {
     bcmpkt_frag_t_frag_info_get,
     bcmpkt_frag_t_id_get,
     bcmpkt_frag_t_next_header_get,
     bcmpkt_frag_t_reserved_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_frag_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_FRAG_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_frag_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_FRAG_T_FID_COUNT] = {
     bcmpkt_frag_t_frag_info_set,
     bcmpkt_frag_t_id_set,
     bcmpkt_frag_t_next_header_set,
     bcmpkt_frag_t_reserved_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_frag_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_FRAG_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_frag_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_FRAG_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_frag_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_FRAG_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_frag_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_frag_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_FRAG_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_frag_t_field_data,
 };
 
 
@@ -3207,52 +3736,52 @@ static int32_t bcmpkt_generic_loopback_t_reserved_1_set(uint32_t *data, int prof
     return ret;
 }
 
-static int32_t bcmpkt_generic_loopback_t_reserved_2_get(uint32_t *data, int profile, uint32_t *val) {
+static int32_t bcmpkt_generic_loopback_t_source_system_port_get(uint32_t *data, int profile, uint32_t *val) {
     int32_t ret = SHR_E_NONE;
 
-    *val = WORD_FIELD_GET(data[3], 0, 16);
+    *val = WORD_FIELD_GET(data[2], 16, 16);
 
     return ret;
 }
 
-static int32_t bcmpkt_generic_loopback_t_reserved_2_set(uint32_t *data, int profile, uint32_t val) {
+static int32_t bcmpkt_generic_loopback_t_source_system_port_set(uint32_t *data, int profile, uint32_t val) {
     int32_t ret = SHR_E_NONE;
 
-    WORD_FIELD_SET(data[3], 0, 16, val);
+    WORD_FIELD_SET(data[2], 16, 16, val);
     return ret;
 }
 
-static int32_t bcmpkt_generic_loopback_t_source_system_port_get(uint32_t *data, int profile, uint32_t *val) {
+static int32_t bcmpkt_generic_loopback_t_start_byte_get(uint32_t *data, int profile, uint32_t *val) {
     int32_t ret = SHR_E_NONE;
 
-    *val = WORD_FIELD_GET(data[2], 16, 16);
+    *val = WORD_FIELD_GET(data[0], 24, 8);
 
     return ret;
 }
 
-static int32_t bcmpkt_generic_loopback_t_source_system_port_set(uint32_t *data, int profile, uint32_t val) {
+static int32_t bcmpkt_generic_loopback_t_start_byte_set(uint32_t *data, int profile, uint32_t val) {
     int32_t ret = SHR_E_NONE;
 
-    WORD_FIELD_SET(data[2], 16, 16, val);
+    WORD_FIELD_SET(data[0], 24, 8, val);
     return ret;
 }
 
-static int32_t bcmpkt_generic_loopback_t_start_byte_get(uint32_t *data, int profile, uint32_t *val) {
+static int32_t bcmpkt_generic_loopback_t_svp_get(uint32_t *data, int profile, uint32_t *val) {
     int32_t ret = SHR_E_NONE;
 
-    *val = WORD_FIELD_GET(data[0], 24, 8);
+    *val = WORD_FIELD_GET(data[3], 0, 16);
 
     return ret;
 }
 
-static int32_t bcmpkt_generic_loopback_t_start_byte_set(uint32_t *data, int profile, uint32_t val) {
+static int32_t bcmpkt_generic_loopback_t_svp_set(uint32_t *data, int profile, uint32_t val) {
     int32_t ret = SHR_E_NONE;
 
-    WORD_FIELD_SET(data[0], 24, 8, val);
+    WORD_FIELD_SET(data[3], 0, 16, val);
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_generic_loopback_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_generic_loopback_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
     bcmpkt_generic_loopback_t_destination_obj_get,
     bcmpkt_generic_loopback_t_destination_type_get,
     bcmpkt_generic_loopback_t_entropy_obj_get,
@@ -3265,12 +3794,12 @@ bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_generic_loopback_t_fget[BCM56
     bcmpkt_generic_loopback_t_processing_ctrl_1_get,
     bcmpkt_generic_loopback_t_qos_obj_get,
     bcmpkt_generic_loopback_t_reserved_1_get,
-    bcmpkt_generic_loopback_t_reserved_2_get,
     bcmpkt_generic_loopback_t_source_system_port_get,
     bcmpkt_generic_loopback_t_start_byte_get,
+    bcmpkt_generic_loopback_t_svp_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_generic_loopback_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_generic_loopback_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
     bcmpkt_generic_loopback_t_destination_obj_set,
     bcmpkt_generic_loopback_t_destination_type_set,
     bcmpkt_generic_loopback_t_entropy_obj_set,
@@ -3283,18 +3812,18 @@ bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_generic_loopback_t_fset[BCM56
     bcmpkt_generic_loopback_t_processing_ctrl_1_set,
     bcmpkt_generic_loopback_t_qos_obj_set,
     bcmpkt_generic_loopback_t_reserved_1_set,
-    bcmpkt_generic_loopback_t_reserved_2_set,
     bcmpkt_generic_loopback_t_source_system_port_set,
     bcmpkt_generic_loopback_t_start_byte_set,
+    bcmpkt_generic_loopback_t_svp_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_generic_loopback_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_generic_loopback_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_generic_loopback_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_generic_loopback_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_generic_loopback_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_generic_loopback_t_field_data,
 };
 
 
@@ -3373,7 +3902,7 @@ static int32_t bcmpkt_gpe_t_vni_set(uint32_t *data, int profile, uint32_t val) {
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_gpe_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GPE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_gpe_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GPE_T_FID_COUNT] = {
     bcmpkt_gpe_t_flags_get,
     bcmpkt_gpe_t_next_protocol_get,
     bcmpkt_gpe_t_reserved0_get,
@@ -3381,7 +3910,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_gpe_t_fget[BCM56780_A0_DNA_6_
     bcmpkt_gpe_t_vni_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_gpe_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GPE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_gpe_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GPE_T_FID_COUNT] = {
     bcmpkt_gpe_t_flags_set,
     bcmpkt_gpe_t_next_protocol_set,
     bcmpkt_gpe_t_reserved0_set,
@@ -3389,13 +3918,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_gpe_t_fset[BCM56780_A0_DNA_6_
     bcmpkt_gpe_t_vni_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_gpe_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GPE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_gpe_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GPE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_gpe_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GPE_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_gpe_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_gpe_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GPE_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_gpe_t_field_data,
 };
 
 
@@ -3429,23 +3958,23 @@ static int32_t bcmpkt_gre_chksum_t_offset_set(uint32_t *data, int profile, uint3
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_gre_chksum_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_gre_chksum_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT] = {
     bcmpkt_gre_chksum_t_checksum_get,
     bcmpkt_gre_chksum_t_offset_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_gre_chksum_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_gre_chksum_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT] = {
     bcmpkt_gre_chksum_t_checksum_set,
     bcmpkt_gre_chksum_t_offset_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_gre_chksum_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_CHKSUM_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_gre_chksum_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_CHKSUM_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_gre_chksum_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_gre_chksum_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_gre_chksum_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_gre_chksum_t_field_data,
 };
 
 
@@ -3465,21 +3994,21 @@ static int32_t bcmpkt_gre_key_t_key_set(uint32_t *data, int profile, uint32_t va
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_gre_key_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_KEY_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_gre_key_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_KEY_T_FID_COUNT] = {
     bcmpkt_gre_key_t_key_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_gre_key_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_KEY_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_gre_key_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_KEY_T_FID_COUNT] = {
     bcmpkt_gre_key_t_key_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_gre_key_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_KEY_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_gre_key_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_KEY_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_gre_key_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_KEY_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_gre_key_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_gre_key_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_KEY_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_gre_key_t_field_data,
 };
 
 
@@ -3499,21 +4028,21 @@ static int32_t bcmpkt_gre_rout_t_routing_set(uint32_t *data, int profile, uint32
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_gre_rout_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_ROUT_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_gre_rout_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_ROUT_T_FID_COUNT] = {
     bcmpkt_gre_rout_t_routing_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_gre_rout_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_ROUT_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_gre_rout_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_ROUT_T_FID_COUNT] = {
     bcmpkt_gre_rout_t_routing_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_gre_rout_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_ROUT_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_gre_rout_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_ROUT_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_gre_rout_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_ROUT_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_gre_rout_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_gre_rout_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_ROUT_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_gre_rout_t_field_data,
 };
 
 
@@ -3533,21 +4062,21 @@ static int32_t bcmpkt_gre_seq_t_sequence_set(uint32_t *data, int profile, uint32
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_gre_seq_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_SEQ_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_gre_seq_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_SEQ_T_FID_COUNT] = {
     bcmpkt_gre_seq_t_sequence_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_gre_seq_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_SEQ_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_gre_seq_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_SEQ_T_FID_COUNT] = {
     bcmpkt_gre_seq_t_sequence_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_gre_seq_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_SEQ_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_gre_seq_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_SEQ_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_gre_seq_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_SEQ_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_gre_seq_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_gre_seq_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_SEQ_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_gre_seq_t_field_data,
 };
 
 
@@ -3611,27 +4140,27 @@ static int32_t bcmpkt_gre_t_version_set(uint32_t *data, int profile, uint32_t va
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_gre_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_gre_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_T_FID_COUNT] = {
     bcmpkt_gre_t_c_r_k_s_get,
     bcmpkt_gre_t_protocol_get,
     bcmpkt_gre_t_reserved_get,
     bcmpkt_gre_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_gre_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_gre_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_T_FID_COUNT] = {
     bcmpkt_gre_t_c_r_k_s_set,
     bcmpkt_gre_t_protocol_set,
     bcmpkt_gre_t_reserved_set,
     bcmpkt_gre_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_gre_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_gre_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_gre_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_GRE_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_gre_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_gre_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_GRE_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_gre_t_field_data,
 };
 
 
@@ -3830,7 +4359,7 @@ static int32_t bcmpkt_hg3_base_t_version_set(uint32_t *data, int profile, uint32
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_hg3_base_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_hg3_base_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_FID_COUNT] = {
     bcmpkt_hg3_base_t_cn_get,
     bcmpkt_hg3_base_t_cng_get,
     bcmpkt_hg3_base_t_entropy_get,
@@ -3846,7 +4375,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_hg3_base_t_fget[BCM56780_A0_D
     bcmpkt_hg3_base_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_hg3_base_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_hg3_base_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_FID_COUNT] = {
     bcmpkt_hg3_base_t_cn_set,
     bcmpkt_hg3_base_t_cng_set,
     bcmpkt_hg3_base_t_entropy_set,
@@ -3862,13 +4391,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_hg3_base_t_fset[BCM56780_A0_D
     bcmpkt_hg3_base_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_hg3_base_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_hg3_base_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_hg3_base_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_BASE_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_hg3_base_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_hg3_base_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_BASE_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_hg3_base_t_field_data,
 };
 
 
@@ -3962,7 +4491,7 @@ static int32_t bcmpkt_hg3_extension_0_t_svp_set(uint32_t *data, int profile, uin
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_hg3_extension_0_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_hg3_extension_0_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT] = {
     bcmpkt_hg3_extension_0_t_class_id_lsb_get,
     bcmpkt_hg3_extension_0_t_class_id_msb_get,
     bcmpkt_hg3_extension_0_t_dvp_or_l3_iif_get,
@@ -3971,7 +4500,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_hg3_extension_0_t_fget[BCM567
     bcmpkt_hg3_extension_0_t_svp_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_hg3_extension_0_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_hg3_extension_0_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT] = {
     bcmpkt_hg3_extension_0_t_class_id_lsb_set,
     bcmpkt_hg3_extension_0_t_class_id_msb_set,
     bcmpkt_hg3_extension_0_t_dvp_or_l3_iif_set,
@@ -3980,13 +4509,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_hg3_extension_0_t_fset[BCM567
     bcmpkt_hg3_extension_0_t_svp_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_hg3_extension_0_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_EXTENSION_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_hg3_extension_0_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_hg3_extension_0_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_hg3_extension_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_hg3_extension_0_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_hg3_extension_0_t_field_data,
 };
 
 
@@ -4036,25 +4565,25 @@ static int32_t bcmpkt_hop_by_hop_t_option_set(uint32_t *data, int profile, uint3
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_hop_by_hop_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_hop_by_hop_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT] = {
     bcmpkt_hop_by_hop_t_hdr_ext_len_get,
     bcmpkt_hop_by_hop_t_next_header_get,
     bcmpkt_hop_by_hop_t_option_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_hop_by_hop_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_hop_by_hop_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT] = {
     bcmpkt_hop_by_hop_t_hdr_ext_len_set,
     bcmpkt_hop_by_hop_t_next_header_set,
     bcmpkt_hop_by_hop_t_option_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_hop_by_hop_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HOP_BY_HOP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_hop_by_hop_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HOP_BY_HOP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_hop_by_hop_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_hop_by_hop_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_hop_by_hop_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_hop_by_hop_t_field_data,
 };
 
 
@@ -4103,25 +4632,25 @@ static int32_t bcmpkt_icmp_t_icmp_type_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_icmp_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ICMP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_icmp_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ICMP_T_FID_COUNT] = {
     bcmpkt_icmp_t_checksum_get,
     bcmpkt_icmp_t_code_get,
     bcmpkt_icmp_t_icmp_type_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_icmp_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ICMP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_icmp_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ICMP_T_FID_COUNT] = {
     bcmpkt_icmp_t_checksum_set,
     bcmpkt_icmp_t_code_set,
     bcmpkt_icmp_t_icmp_type_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_icmp_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_icmp_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_icmp_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ICMP_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_icmp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_icmp_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ICMP_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_icmp_t_field_data,
 };
 
 
@@ -4155,23 +4684,23 @@ static int32_t bcmpkt_ifa_flex_md_0_a_t_lns_device_id_set(uint32_t *data, int pr
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_0_a_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_0_a_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_0_a_t_fwd_hdr_ttl_get,
     bcmpkt_ifa_flex_md_0_a_t_lns_device_id_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_0_a_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_0_a_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_0_a_t_fwd_hdr_ttl_set,
     bcmpkt_ifa_flex_md_0_a_t_lns_device_id_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_0_a_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_0_A_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_0_a_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_0_A_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_0_a_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_0_a_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_0_a_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_0_a_t_field_data,
 };
 
 
@@ -4235,27 +4764,27 @@ static int32_t bcmpkt_ifa_flex_md_0_b_t_rx_timestamp_sec_set(uint32_t *data, int
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_0_b_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_0_b_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_0_b_t_cn_get,
     bcmpkt_ifa_flex_md_0_b_t_port_speed_get,
     bcmpkt_ifa_flex_md_0_b_t_queue_id_get,
     bcmpkt_ifa_flex_md_0_b_t_rx_timestamp_sec_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_0_b_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_0_b_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_0_b_t_cn_set,
     bcmpkt_ifa_flex_md_0_b_t_port_speed_set,
     bcmpkt_ifa_flex_md_0_b_t_queue_id_set,
     bcmpkt_ifa_flex_md_0_b_t_rx_timestamp_sec_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_0_b_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_0_B_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_0_b_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_0_B_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_0_b_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_0_b_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_0_b_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_0_b_t_field_data,
 };
 
 
@@ -4305,25 +4834,25 @@ static int32_t bcmpkt_ifa_flex_md_1_t_rx_timestamp_nanosec_set(uint32_t *data, i
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_1_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_1_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_1_t_egress_port_id_get,
     bcmpkt_ifa_flex_md_1_t_ingress_port_id_get,
     bcmpkt_ifa_flex_md_1_t_rx_timestamp_nanosec_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_1_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_1_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_1_t_egress_port_id_set,
     bcmpkt_ifa_flex_md_1_t_ingress_port_id_set,
     bcmpkt_ifa_flex_md_1_t_rx_timestamp_nanosec_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_1_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_1_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_1_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_1_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_1_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_1_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_1_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_1_t_field_data,
 };
 
 
@@ -4359,23 +4888,23 @@ static int32_t bcmpkt_ifa_flex_md_2_t_tx_queue_byte_count_set(uint32_t *data, in
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_2_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_2_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_2_t_residence_time_nanosec_get,
     bcmpkt_ifa_flex_md_2_t_tx_queue_byte_count_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_2_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_2_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_2_t_residence_time_nanosec_set,
     bcmpkt_ifa_flex_md_2_t_tx_queue_byte_count_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_2_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_2_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_2_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_2_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_2_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_2_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_2_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_2_t_field_data,
 };
 
 
@@ -4411,23 +4940,23 @@ static int32_t bcmpkt_ifa_flex_md_3_t_mmu_stat_1_set(uint32_t *data, int profile
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_3_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_3_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_3_t_mmu_stat_0_get,
     bcmpkt_ifa_flex_md_3_t_mmu_stat_1_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_3_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_3_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_3_t_mmu_stat_0_set,
     bcmpkt_ifa_flex_md_3_t_mmu_stat_1_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_3_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_3_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_3_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_3_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_3_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_3_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_3_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_3_t_field_data,
 };
 
 
@@ -4506,7 +5035,7 @@ static int32_t bcmpkt_ifa_header_t_ver_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_ifa_header_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_HEADER_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_ifa_header_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_HEADER_T_FID_COUNT] = {
     bcmpkt_ifa_header_t_flags_get,
     bcmpkt_ifa_header_t_gns_get,
     bcmpkt_ifa_header_t_max_length_get,
@@ -4514,7 +5043,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_ifa_header_t_fget[BCM56780_A0
     bcmpkt_ifa_header_t_ver_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_ifa_header_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_HEADER_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_ifa_header_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_HEADER_T_FID_COUNT] = {
     bcmpkt_ifa_header_t_flags_set,
     bcmpkt_ifa_header_t_gns_set,
     bcmpkt_ifa_header_t_max_length_set,
@@ -4522,13 +5051,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_ifa_header_t_fset[BCM56780_A0
     bcmpkt_ifa_header_t_ver_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_ifa_header_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_HEADER_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_ifa_header_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_HEADER_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_ifa_header_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_HEADER_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_ifa_header_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_ifa_header_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_HEADER_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_ifa_header_t_field_data,
 };
 
 
@@ -4577,25 +5106,25 @@ static int32_t bcmpkt_ifa_md_base_t_request_vector_set(uint32_t *data, int profi
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_ifa_md_base_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_MD_BASE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_ifa_md_base_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_MD_BASE_T_FID_COUNT] = {
     bcmpkt_ifa_md_base_t_action_vector_get,
     bcmpkt_ifa_md_base_t_hop_limit_current_length_get,
     bcmpkt_ifa_md_base_t_request_vector_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_ifa_md_base_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_MD_BASE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_ifa_md_base_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_MD_BASE_T_FID_COUNT] = {
     bcmpkt_ifa_md_base_t_action_vector_set,
     bcmpkt_ifa_md_base_t_hop_limit_current_length_set,
     bcmpkt_ifa_md_base_t_request_vector_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_ifa_md_base_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_MD_BASE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_ifa_md_base_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_MD_BASE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_ifa_md_base_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_MD_BASE_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_ifa_md_base_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_ifa_md_base_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_MD_BASE_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_ifa_md_base_t_field_data,
 };
 
 
@@ -4660,27 +5189,27 @@ static int32_t bcmpkt_ifa_metadata_t_request_vector_set(uint32_t *data, int prof
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_ifa_metadata_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_METADATA_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_ifa_metadata_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_T_FID_COUNT] = {
     bcmpkt_ifa_metadata_t_action_vector_get,
     bcmpkt_ifa_metadata_t_hop_limit_current_length_get,
     bcmpkt_ifa_metadata_t_metadata_get,
     bcmpkt_ifa_metadata_t_request_vector_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_ifa_metadata_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_METADATA_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_ifa_metadata_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_T_FID_COUNT] = {
     bcmpkt_ifa_metadata_t_action_vector_set,
     bcmpkt_ifa_metadata_t_hop_limit_current_length_set,
     bcmpkt_ifa_metadata_t_metadata_set,
     bcmpkt_ifa_metadata_t_request_vector_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_ifa_metadata_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_METADATA_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_ifa_metadata_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_ifa_metadata_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IFA_METADATA_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_ifa_metadata_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_ifa_metadata_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IFA_METADATA_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_ifa_metadata_t_field_data,
 };
 
 
@@ -4745,27 +5274,27 @@ static int32_t bcmpkt_igmp_t_max_resp_time_set(uint32_t *data, int profile, uint
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_igmp_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IGMP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_igmp_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IGMP_T_FID_COUNT] = {
     bcmpkt_igmp_t_checksum_get,
     bcmpkt_igmp_t_group_address_get,
     bcmpkt_igmp_t_igmp_type_get,
     bcmpkt_igmp_t_max_resp_time_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_igmp_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IGMP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_igmp_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IGMP_T_FID_COUNT] = {
     bcmpkt_igmp_t_checksum_set,
     bcmpkt_igmp_t_group_address_set,
     bcmpkt_igmp_t_igmp_type_set,
     bcmpkt_igmp_t_max_resp_time_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_igmp_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IGMP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_igmp_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IGMP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_igmp_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IGMP_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_igmp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_igmp_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IGMP_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_igmp_t_field_data,
 };
 
 
@@ -4847,7 +5376,7 @@ static int32_t bcmpkt_ipfix_t_version_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_ipfix_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPFIX_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_ipfix_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPFIX_T_FID_COUNT] = {
     bcmpkt_ipfix_t_export_time_get,
     bcmpkt_ipfix_t_length_get,
     bcmpkt_ipfix_t_obs_domain_id_get,
@@ -4855,7 +5384,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_ipfix_t_fget[BCM56780_A0_DNA_
     bcmpkt_ipfix_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_ipfix_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPFIX_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_ipfix_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPFIX_T_FID_COUNT] = {
     bcmpkt_ipfix_t_export_time_set,
     bcmpkt_ipfix_t_length_set,
     bcmpkt_ipfix_t_obs_domain_id_set,
@@ -4863,13 +5392,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_ipfix_t_fset[BCM56780_A0_DNA_
     bcmpkt_ipfix_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_ipfix_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_ipfix_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_ipfix_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPFIX_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_ipfix_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_ipfix_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPFIX_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_ipfix_t_field_data,
 };
 
 
@@ -5041,7 +5570,7 @@ static int32_t bcmpkt_ipv4_t_version_hdr_len_set(uint32_t *data, int profile, ui
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_ipv4_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV4_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_ipv4_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_FID_COUNT] = {
     bcmpkt_ipv4_t_da_get,
     bcmpkt_ipv4_t_flags_frag_offset_get,
     bcmpkt_ipv4_t_hdr_checksum_get,
@@ -5055,7 +5584,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_ipv4_t_fget[BCM56780_A0_DNA_6
     bcmpkt_ipv4_t_version_hdr_len_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_ipv4_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV4_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_ipv4_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_FID_COUNT] = {
     bcmpkt_ipv4_t_da_set,
     bcmpkt_ipv4_t_flags_frag_offset_set,
     bcmpkt_ipv4_t_hdr_checksum_set,
@@ -5069,13 +5598,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_ipv4_t_fset[BCM56780_A0_DNA_6
     bcmpkt_ipv4_t_version_hdr_len_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_ipv4_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_ipv4_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_ipv4_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV4_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_ipv4_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_ipv4_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV4_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_ipv4_t_field_data,
 };
 
 
@@ -5201,7 +5730,7 @@ static int32_t bcmpkt_ipv6_t_version_set(uint32_t *data, int profile, uint32_t v
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_ipv6_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV6_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_ipv6_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_FID_COUNT] = {
     bcmpkt_ipv6_t_da_get,
     bcmpkt_ipv6_t_flow_label_get,
     bcmpkt_ipv6_t_hop_limit_get,
@@ -5212,7 +5741,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_ipv6_t_fget[BCM56780_A0_DNA_6
     bcmpkt_ipv6_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_ipv6_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV6_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_ipv6_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_FID_COUNT] = {
     bcmpkt_ipv6_t_da_set,
     bcmpkt_ipv6_t_flow_label_set,
     bcmpkt_ipv6_t_hop_limit_set,
@@ -5223,13 +5752,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_ipv6_t_fset[BCM56780_A0_DNA_6
     bcmpkt_ipv6_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_ipv6_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_ipv6_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_ipv6_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_IPV6_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_ipv6_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_ipv6_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_IPV6_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_ipv6_t_field_data,
 };
 
 
@@ -5265,23 +5794,23 @@ static int32_t bcmpkt_l2_t_macsa_set(uint32_t *data, int profile, uint32_t val)
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_l2_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_L2_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_l2_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_L2_T_FID_COUNT] = {
     bcmpkt_l2_t_macda_get,
     bcmpkt_l2_t_macsa_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_l2_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_L2_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_l2_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_L2_T_FID_COUNT] = {
     bcmpkt_l2_t_macda_set,
     bcmpkt_l2_t_macsa_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_l2_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_L2_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_l2_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_L2_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_l2_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_L2_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_l2_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_l2_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_L2_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_l2_t_field_data,
 };
 
 
@@ -5301,21 +5830,21 @@ static int32_t bcmpkt_mirror_erspan_sn_t_seq_num_set(uint32_t *data, int profile
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_mirror_erspan_sn_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_mirror_erspan_sn_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
     bcmpkt_mirror_erspan_sn_t_seq_num_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_mirror_erspan_sn_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_mirror_erspan_sn_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
     bcmpkt_mirror_erspan_sn_t_seq_num_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_mirror_erspan_sn_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_mirror_erspan_sn_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_mirror_erspan_sn_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_mirror_erspan_sn_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_mirror_erspan_sn_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_mirror_erspan_sn_t_field_data,
 };
 
 
@@ -5335,21 +5864,21 @@ static int32_t bcmpkt_mirror_transport_t_data_set(uint32_t *data, int profile, u
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_mirror_transport_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_mirror_transport_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
     bcmpkt_mirror_transport_t_data_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_mirror_transport_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_mirror_transport_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
     bcmpkt_mirror_transport_t_data_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_mirror_transport_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_mirror_transport_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_mirror_transport_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_mirror_transport_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_mirror_transport_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_mirror_transport_t_field_data,
 };
 
 
@@ -5413,27 +5942,27 @@ static int32_t bcmpkt_mpls_ach_t_version_set(uint32_t *data, int profile, uint32
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_mpls_ach_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_ACH_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_mpls_ach_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_ACH_T_FID_COUNT] = {
     bcmpkt_mpls_ach_t_channel_type_get,
     bcmpkt_mpls_ach_t_cw_type_get,
     bcmpkt_mpls_ach_t_reserved_get,
     bcmpkt_mpls_ach_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_mpls_ach_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_ACH_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_mpls_ach_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_ACH_T_FID_COUNT] = {
     bcmpkt_mpls_ach_t_channel_type_set,
     bcmpkt_mpls_ach_t_cw_type_set,
     bcmpkt_mpls_ach_t_reserved_set,
     bcmpkt_mpls_ach_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_mpls_ach_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_ACH_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_mpls_ach_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_ACH_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_mpls_ach_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_ACH_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_mpls_ach_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_mpls_ach_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_ACH_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_mpls_ach_t_field_data,
 };
 
 
@@ -5453,21 +5982,21 @@ static int32_t bcmpkt_mpls_bv_t_value_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_mpls_bv_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_BV_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_mpls_bv_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_BV_T_FID_COUNT] = {
     bcmpkt_mpls_bv_t_value_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_mpls_bv_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_BV_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_mpls_bv_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_BV_T_FID_COUNT] = {
     bcmpkt_mpls_bv_t_value_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_mpls_bv_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_BV_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_mpls_bv_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_BV_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_mpls_bv_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_BV_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_mpls_bv_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_mpls_bv_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_BV_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_mpls_bv_t_field_data,
 };
 
 
@@ -5516,25 +6045,25 @@ static int32_t bcmpkt_mpls_cw_t_seq_number_set(uint32_t *data, int profile, uint
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_mpls_cw_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_CW_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_mpls_cw_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_CW_T_FID_COUNT] = {
     bcmpkt_mpls_cw_t_cw_type_get,
     bcmpkt_mpls_cw_t_reserved_get,
     bcmpkt_mpls_cw_t_seq_number_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_mpls_cw_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_CW_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_mpls_cw_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_CW_T_FID_COUNT] = {
     bcmpkt_mpls_cw_t_cw_type_set,
     bcmpkt_mpls_cw_t_reserved_set,
     bcmpkt_mpls_cw_t_seq_number_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_mpls_cw_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_CW_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_mpls_cw_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_CW_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_mpls_cw_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_CW_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_mpls_cw_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_mpls_cw_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_CW_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_mpls_cw_t_field_data,
 };
 
 
@@ -5598,27 +6127,27 @@ static int32_t bcmpkt_mpls_t_ttl_set(uint32_t *data, int profile, uint32_t val)
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_mpls_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_mpls_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_T_FID_COUNT] = {
     bcmpkt_mpls_t_bos_get,
     bcmpkt_mpls_t_exp_get,
     bcmpkt_mpls_t_label_get,
     bcmpkt_mpls_t_ttl_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_mpls_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_mpls_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_T_FID_COUNT] = {
     bcmpkt_mpls_t_bos_set,
     bcmpkt_mpls_t_exp_set,
     bcmpkt_mpls_t_label_set,
     bcmpkt_mpls_t_ttl_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_mpls_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_mpls_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_mpls_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_MPLS_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_mpls_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_mpls_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_MPLS_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_mpls_t_field_data,
 };
 
 
@@ -5835,7 +6364,7 @@ static int32_t bcmpkt_p_1588_t_version_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_p_1588_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_P_1588_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_p_1588_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_FID_COUNT] = {
     bcmpkt_p_1588_t_cntrl_get,
     bcmpkt_p_1588_t_correction_get,
     bcmpkt_p_1588_t_domain_nb_get,
@@ -5852,7 +6381,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_p_1588_t_fget[BCM56780_A0_DNA
     bcmpkt_p_1588_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_p_1588_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_P_1588_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_p_1588_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_FID_COUNT] = {
     bcmpkt_p_1588_t_cntrl_set,
     bcmpkt_p_1588_t_correction_set,
     bcmpkt_p_1588_t_domain_nb_set,
@@ -5869,13 +6398,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_p_1588_t_fset[BCM56780_A0_DNA
     bcmpkt_p_1588_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_p_1588_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_P_1588_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_p_1588_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_p_1588_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_P_1588_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_p_1588_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_p_1588_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_P_1588_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_p_1588_t_field_data,
 };
 
 
@@ -5939,27 +6468,27 @@ static int32_t bcmpkt_pim_t_hdr_bytes_6_7_set(uint32_t *data, int profile, uint3
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_pim_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PIM_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_pim_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PIM_T_FID_COUNT] = {
     bcmpkt_pim_t_hdr_bytes_0_1_get,
     bcmpkt_pim_t_hdr_bytes_2_3_get,
     bcmpkt_pim_t_hdr_bytes_4_5_get,
     bcmpkt_pim_t_hdr_bytes_6_7_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_pim_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PIM_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_pim_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PIM_T_FID_COUNT] = {
     bcmpkt_pim_t_hdr_bytes_0_1_set,
     bcmpkt_pim_t_hdr_bytes_2_3_set,
     bcmpkt_pim_t_hdr_bytes_4_5_set,
     bcmpkt_pim_t_hdr_bytes_6_7_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_pim_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PIM_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_pim_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PIM_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_pim_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PIM_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_pim_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_pim_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PIM_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_pim_t_field_data,
 };
 
 
@@ -6009,25 +6538,25 @@ static int32_t bcmpkt_prog_ext_hdr_t_option_set(uint32_t *data, int profile, uin
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_prog_ext_hdr_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_prog_ext_hdr_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT] = {
     bcmpkt_prog_ext_hdr_t_hdr_ext_len_get,
     bcmpkt_prog_ext_hdr_t_next_header_get,
     bcmpkt_prog_ext_hdr_t_option_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_prog_ext_hdr_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_prog_ext_hdr_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT] = {
     bcmpkt_prog_ext_hdr_t_hdr_ext_len_set,
     bcmpkt_prog_ext_hdr_t_next_header_set,
     bcmpkt_prog_ext_hdr_t_option_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_prog_ext_hdr_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PROG_EXT_HDR_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_prog_ext_hdr_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PROG_EXT_HDR_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_prog_ext_hdr_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_prog_ext_hdr_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_prog_ext_hdr_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_prog_ext_hdr_t_field_data,
 };
 
 
@@ -6123,7 +6652,7 @@ static int32_t bcmpkt_psamp_0_t_template_id_set(uint32_t *data, int profile, uin
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_psamp_0_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_psamp_0_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T_FID_COUNT] = {
     bcmpkt_psamp_0_t_flowset_get,
     bcmpkt_psamp_0_t_length_get,
     bcmpkt_psamp_0_t_next_hop_index_get,
@@ -6132,7 +6661,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_psamp_0_t_fget[BCM56780_A0_DN
     bcmpkt_psamp_0_t_template_id_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_psamp_0_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_psamp_0_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T_FID_COUNT] = {
     bcmpkt_psamp_0_t_flowset_set,
     bcmpkt_psamp_0_t_length_set,
     bcmpkt_psamp_0_t_next_hop_index_set,
@@ -6141,13 +6670,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_psamp_0_t_fset[BCM56780_A0_DN
     bcmpkt_psamp_0_t_template_id_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_psamp_0_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_psamp_0_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_psamp_0_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_0_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_psamp_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_psamp_0_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_0_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_psamp_0_t_field_data,
 };
 
 
@@ -6256,7 +6785,7 @@ static int32_t bcmpkt_psamp_1_t_variable_flag_set(uint32_t *data, int profile, u
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_psamp_1_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_1_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_psamp_1_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_FID_COUNT] = {
     bcmpkt_psamp_1_t_dlb_id_get,
     bcmpkt_psamp_1_t_egress_port_get,
     bcmpkt_psamp_1_t_epoch_get,
@@ -6266,7 +6795,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_psamp_1_t_fget[BCM56780_A0_DN
     bcmpkt_psamp_1_t_variable_flag_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_psamp_1_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_1_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_psamp_1_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_FID_COUNT] = {
     bcmpkt_psamp_1_t_dlb_id_set,
     bcmpkt_psamp_1_t_egress_port_set,
     bcmpkt_psamp_1_t_epoch_set,
@@ -6276,13 +6805,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_psamp_1_t_fset[BCM56780_A0_DN
     bcmpkt_psamp_1_t_variable_flag_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_psamp_1_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_1_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_psamp_1_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_psamp_1_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_1_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_psamp_1_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_psamp_1_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_1_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_psamp_1_t_field_data,
 };
 
 
@@ -6394,7 +6923,7 @@ static int32_t bcmpkt_psamp_mirror_on_drop_0_t_template_id_set(uint32_t *data, i
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_psamp_mirror_on_drop_0_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_psamp_mirror_on_drop_0_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_0_t_egress_mod_port_get,
     bcmpkt_psamp_mirror_on_drop_0_t_ingress_port_get,
     bcmpkt_psamp_mirror_on_drop_0_t_length_get,
@@ -6404,7 +6933,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_psamp_mirror_on_drop_0_t_fget
     bcmpkt_psamp_mirror_on_drop_0_t_template_id_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_psamp_mirror_on_drop_0_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_psamp_mirror_on_drop_0_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_0_t_egress_mod_port_set,
     bcmpkt_psamp_mirror_on_drop_0_t_ingress_port_set,
     bcmpkt_psamp_mirror_on_drop_0_t_length_set,
@@ -6414,13 +6943,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_psamp_mirror_on_drop_0_t_fset
     bcmpkt_psamp_mirror_on_drop_0_t_template_id_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_psamp_mirror_on_drop_0_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_psamp_mirror_on_drop_0_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_psamp_mirror_on_drop_0_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_psamp_mirror_on_drop_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_psamp_mirror_on_drop_0_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_psamp_mirror_on_drop_0_t_field_data,
 };
 
 
@@ -6529,7 +7058,7 @@ static int32_t bcmpkt_psamp_mirror_on_drop_3_t_var_len_indicator_set(uint32_t *d
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_psamp_mirror_on_drop_3_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_psamp_mirror_on_drop_3_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_3_t_drop_reason_get,
     bcmpkt_psamp_mirror_on_drop_3_t_reserved_0_get,
     bcmpkt_psamp_mirror_on_drop_3_t_sampled_length_get,
@@ -6539,7 +7068,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_psamp_mirror_on_drop_3_t_fget
     bcmpkt_psamp_mirror_on_drop_3_t_var_len_indicator_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_psamp_mirror_on_drop_3_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_psamp_mirror_on_drop_3_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_3_t_drop_reason_set,
     bcmpkt_psamp_mirror_on_drop_3_t_reserved_0_set,
     bcmpkt_psamp_mirror_on_drop_3_t_sampled_length_set,
@@ -6549,13 +7078,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_psamp_mirror_on_drop_3_t_fset
     bcmpkt_psamp_mirror_on_drop_3_t_var_len_indicator_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_psamp_mirror_on_drop_3_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_psamp_mirror_on_drop_3_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_psamp_mirror_on_drop_3_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_psamp_mirror_on_drop_3_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_psamp_mirror_on_drop_3_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_psamp_mirror_on_drop_3_t_field_data,
 };
 
 
@@ -6698,7 +7227,7 @@ static int32_t bcmpkt_rarp_t_target_ip_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_rarp_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RARP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_rarp_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_FID_COUNT] = {
     bcmpkt_rarp_t_hardware_len_get,
     bcmpkt_rarp_t_hardware_type_get,
     bcmpkt_rarp_t_operation_get,
@@ -6710,7 +7239,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_rarp_t_fget[BCM56780_A0_DNA_6
     bcmpkt_rarp_t_target_ip_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_rarp_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RARP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_rarp_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_FID_COUNT] = {
     bcmpkt_rarp_t_hardware_len_set,
     bcmpkt_rarp_t_hardware_type_set,
     bcmpkt_rarp_t_operation_set,
@@ -6722,13 +7251,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_rarp_t_fset[BCM56780_A0_DNA_6
     bcmpkt_rarp_t_target_ip_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rarp_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_rarp_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_rarp_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RARP_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_rarp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_rarp_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RARP_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_rarp_t_field_data,
 };
 
 
@@ -6808,7 +7337,7 @@ static int32_t bcmpkt_routing_t_segments_left_set(uint32_t *data, int profile, u
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_routing_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ROUTING_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_routing_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ROUTING_T_FID_COUNT] = {
     bcmpkt_routing_t_data_get,
     bcmpkt_routing_t_hdr_ext_len_get,
     bcmpkt_routing_t_next_header_get,
@@ -6816,7 +7345,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_routing_t_fget[BCM56780_A0_DN
     bcmpkt_routing_t_segments_left_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_routing_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ROUTING_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_routing_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ROUTING_T_FID_COUNT] = {
     bcmpkt_routing_t_data_set,
     bcmpkt_routing_t_hdr_ext_len_set,
     bcmpkt_routing_t_next_header_set,
@@ -6824,13 +7353,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_routing_t_fset[BCM56780_A0_DN
     bcmpkt_routing_t_segments_left_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_routing_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ROUTING_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_routing_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ROUTING_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_routing_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_ROUTING_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_routing_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_routing_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_ROUTING_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_routing_t_field_data,
 };
 
 
@@ -6864,23 +7393,23 @@ static int32_t bcmpkt_rspan_t_tpid_set(uint32_t *data, int profile, uint32_t val
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_rspan_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RSPAN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_rspan_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RSPAN_T_FID_COUNT] = {
     bcmpkt_rspan_t_tag_get,
     bcmpkt_rspan_t_tpid_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_rspan_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RSPAN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_rspan_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RSPAN_T_FID_COUNT] = {
     bcmpkt_rspan_t_tag_set,
     bcmpkt_rspan_t_tpid_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_rspan_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RSPAN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_rspan_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RSPAN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_rspan_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_RSPAN_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_rspan_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_rspan_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_RSPAN_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_rspan_t_field_data,
 };
 
 
@@ -6930,25 +7459,25 @@ static int32_t bcmpkt_sflow_shim_0_t_version_set(uint32_t *data, int profile, ui
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_sflow_shim_0_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_sflow_shim_0_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT] = {
     bcmpkt_sflow_shim_0_t_sys_destination_get,
     bcmpkt_sflow_shim_0_t_sys_source_get,
     bcmpkt_sflow_shim_0_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_sflow_shim_0_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_sflow_shim_0_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT] = {
     bcmpkt_sflow_shim_0_t_sys_destination_set,
     bcmpkt_sflow_shim_0_t_sys_source_set,
     bcmpkt_sflow_shim_0_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_sflow_shim_0_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_sflow_shim_0_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_sflow_shim_0_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_sflow_shim_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_sflow_shim_0_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_sflow_shim_0_t_field_data,
 };
 
 
@@ -7072,7 +7601,7 @@ static int32_t bcmpkt_sflow_shim_1_t_sys_opcode_set(uint32_t *data, int profile,
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_sflow_shim_1_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_sflow_shim_1_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT] = {
     bcmpkt_sflow_shim_1_t_flag_dest_sample_get,
     bcmpkt_sflow_shim_1_t_flag_discarded_get,
     bcmpkt_sflow_shim_1_t_flag_flex_sample_get,
@@ -7083,7 +7612,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_sflow_shim_1_t_fget[BCM56780_
     bcmpkt_sflow_shim_1_t_sys_opcode_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_sflow_shim_1_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_sflow_shim_1_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT] = {
     bcmpkt_sflow_shim_1_t_flag_dest_sample_set,
     bcmpkt_sflow_shim_1_t_flag_discarded_set,
     bcmpkt_sflow_shim_1_t_flag_flex_sample_set,
@@ -7094,13 +7623,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_sflow_shim_1_t_fset[BCM56780_
     bcmpkt_sflow_shim_1_t_sys_opcode_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_sflow_shim_1_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_1_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_sflow_shim_1_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_sflow_shim_1_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_sflow_shim_1_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_sflow_shim_1_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_sflow_shim_1_t_field_data,
 };
 
 
@@ -7135,23 +7664,23 @@ static int32_t bcmpkt_sflow_shim_2_t_user_meta_data_set(uint32_t *data, int prof
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_sflow_shim_2_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_sflow_shim_2_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT] = {
     bcmpkt_sflow_shim_2_t_sequence_num_get,
     bcmpkt_sflow_shim_2_t_user_meta_data_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_sflow_shim_2_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_sflow_shim_2_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT] = {
     bcmpkt_sflow_shim_2_t_sequence_num_set,
     bcmpkt_sflow_shim_2_t_user_meta_data_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_sflow_shim_2_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_2_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_sflow_shim_2_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_2_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_sflow_shim_2_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_sflow_shim_2_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_sflow_shim_2_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_sflow_shim_2_t_field_data,
 };
 
 
@@ -7186,23 +7715,23 @@ static int32_t bcmpkt_snap_llc_t_snap_llc_set(uint32_t *data, int profile, uint3
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_snap_llc_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SNAP_LLC_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_snap_llc_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SNAP_LLC_T_FID_COUNT] = {
     bcmpkt_snap_llc_t_length_get,
     bcmpkt_snap_llc_t_snap_llc_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_snap_llc_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SNAP_LLC_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_snap_llc_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SNAP_LLC_T_FID_COUNT] = {
     bcmpkt_snap_llc_t_length_set,
     bcmpkt_snap_llc_t_snap_llc_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_snap_llc_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SNAP_LLC_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_snap_llc_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SNAP_LLC_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_snap_llc_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SNAP_LLC_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_snap_llc_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_snap_llc_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SNAP_LLC_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_snap_llc_t_field_data,
 };
 
 
@@ -7236,23 +7765,23 @@ static int32_t bcmpkt_svtag_t_data_upr_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_svtag_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SVTAG_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_svtag_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SVTAG_T_FID_COUNT] = {
     bcmpkt_svtag_t_data_lwr_get,
     bcmpkt_svtag_t_data_upr_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_svtag_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SVTAG_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_svtag_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SVTAG_T_FID_COUNT] = {
     bcmpkt_svtag_t_data_lwr_set,
     bcmpkt_svtag_t_data_upr_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_svtag_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SVTAG_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_svtag_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SVTAG_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_svtag_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_SVTAG_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_svtag_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_svtag_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_SVTAG_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_svtag_t_field_data,
 };
 
 
@@ -7286,23 +7815,23 @@ static int32_t bcmpkt_tcp_first_4bytes_t_src_port_set(uint32_t *data, int profil
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_tcp_first_4bytes_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_tcp_first_4bytes_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_first_4bytes_t_dst_port_get,
     bcmpkt_tcp_first_4bytes_t_src_port_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_tcp_first_4bytes_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_tcp_first_4bytes_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_first_4bytes_t_dst_port_set,
     bcmpkt_tcp_first_4bytes_t_src_port_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_tcp_first_4bytes_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_tcp_first_4bytes_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_tcp_first_4bytes_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_tcp_first_4bytes_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_tcp_first_4bytes_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_tcp_first_4bytes_t_field_data,
 };
 
 
@@ -7398,7 +7927,7 @@ static int32_t bcmpkt_tcp_last_16bytes_t_win_size_set(uint32_t *data, int profil
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_tcp_last_16bytes_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_tcp_last_16bytes_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_last_16bytes_t_ack_num_get,
     bcmpkt_tcp_last_16bytes_t_checksum_get,
     bcmpkt_tcp_last_16bytes_t_hdr_len_and_flags_get,
@@ -7407,7 +7936,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_tcp_last_16bytes_t_fget[BCM56
     bcmpkt_tcp_last_16bytes_t_win_size_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_tcp_last_16bytes_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_tcp_last_16bytes_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_last_16bytes_t_ack_num_set,
     bcmpkt_tcp_last_16bytes_t_checksum_set,
     bcmpkt_tcp_last_16bytes_t_hdr_len_and_flags_set,
@@ -7416,13 +7945,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_tcp_last_16bytes_t_fset[BCM56
     bcmpkt_tcp_last_16bytes_t_win_size_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_tcp_last_16bytes_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_tcp_last_16bytes_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_tcp_last_16bytes_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_tcp_last_16bytes_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_tcp_last_16bytes_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_tcp_last_16bytes_t_field_data,
 };
 
 
@@ -7486,27 +8015,27 @@ static int32_t bcmpkt_udp_t_udp_length_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_udp_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UDP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_udp_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UDP_T_FID_COUNT] = {
     bcmpkt_udp_t_checksum_get,
     bcmpkt_udp_t_dst_port_get,
     bcmpkt_udp_t_src_port_get,
     bcmpkt_udp_t_udp_length_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_udp_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UDP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_udp_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UDP_T_FID_COUNT] = {
     bcmpkt_udp_t_checksum_set,
     bcmpkt_udp_t_dst_port_set,
     bcmpkt_udp_t_src_port_set,
     bcmpkt_udp_t_udp_length_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_udp_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_udp_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_udp_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UDP_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_udp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_udp_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UDP_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_udp_t_field_data,
 };
 
 
@@ -7542,23 +8071,23 @@ static int32_t bcmpkt_unknown_l3_t_next_16bytes_of_l3_payload_set(uint32_t *data
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_unknown_l3_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_unknown_l3_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
     bcmpkt_unknown_l3_t_first_16bytes_of_l3_payload_get,
     bcmpkt_unknown_l3_t_next_16bytes_of_l3_payload_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_unknown_l3_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_unknown_l3_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
     bcmpkt_unknown_l3_t_first_16bytes_of_l3_payload_set,
     bcmpkt_unknown_l3_t_next_16bytes_of_l3_payload_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_unknown_l3_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_unknown_l3_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_unknown_l3_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_unknown_l3_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_unknown_l3_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_unknown_l3_t_field_data,
 };
 
 
@@ -7578,21 +8107,21 @@ static int32_t bcmpkt_unknown_l4_t_first_4bytes_of_l4_payload_set(uint32_t *data
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_unknown_l4_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_unknown_l4_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
     bcmpkt_unknown_l4_t_first_4bytes_of_l4_payload_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_unknown_l4_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_unknown_l4_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
     bcmpkt_unknown_l4_t_first_4bytes_of_l4_payload_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_unknown_l4_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_unknown_l4_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_unknown_l4_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_unknown_l4_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_unknown_l4_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_unknown_l4_t_field_data,
 };
 
 
@@ -7642,25 +8171,25 @@ static int32_t bcmpkt_unknown_l5_t_l5_bytes_4_7_set(uint32_t *data, int profile,
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_unknown_l5_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_unknown_l5_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
     bcmpkt_unknown_l5_t_l5_bytes_0_1_get,
     bcmpkt_unknown_l5_t_l5_bytes_2_3_get,
     bcmpkt_unknown_l5_t_l5_bytes_4_7_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_unknown_l5_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_unknown_l5_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
     bcmpkt_unknown_l5_t_l5_bytes_0_1_set,
     bcmpkt_unknown_l5_t_l5_bytes_2_3_set,
     bcmpkt_unknown_l5_t_l5_bytes_4_7_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_unknown_l5_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_unknown_l5_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_unknown_l5_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_unknown_l5_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_unknown_l5_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_unknown_l5_t_field_data,
 };
 
 
@@ -7724,27 +8253,27 @@ static int32_t bcmpkt_vlan_t_vid_set(uint32_t *data, int profile, uint32_t val)
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_vlan_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_vlan_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VLAN_T_FID_COUNT] = {
     bcmpkt_vlan_t_cfi_get,
     bcmpkt_vlan_t_pcp_get,
     bcmpkt_vlan_t_tpid_get,
     bcmpkt_vlan_t_vid_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_vlan_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_vlan_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VLAN_T_FID_COUNT] = {
     bcmpkt_vlan_t_cfi_set,
     bcmpkt_vlan_t_pcp_set,
     bcmpkt_vlan_t_tpid_set,
     bcmpkt_vlan_t_vid_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_vlan_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_vlan_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_vlan_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VLAN_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_vlan_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_vlan_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VLAN_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_vlan_t_field_data,
 };
 
 
@@ -7779,23 +8308,23 @@ static int32_t bcmpkt_vntag_t_tpid_set(uint32_t *data, int profile, uint32_t val
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_vntag_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VNTAG_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_vntag_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VNTAG_T_FID_COUNT] = {
     bcmpkt_vntag_t_tag_get,
     bcmpkt_vntag_t_tpid_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_vntag_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VNTAG_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_vntag_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VNTAG_T_FID_COUNT] = {
     bcmpkt_vntag_t_tag_set,
     bcmpkt_vntag_t_tpid_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_vntag_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VNTAG_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_vntag_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VNTAG_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_vntag_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VNTAG_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_vntag_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_vntag_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VNTAG_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_vntag_t_field_data,
 };
 
 
@@ -7845,25 +8374,25 @@ static int32_t bcmpkt_vxlan_t_vn_id_set(uint32_t *data, int profile, uint32_t va
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_vxlan_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VXLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_vxlan_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VXLAN_T_FID_COUNT] = {
     bcmpkt_vxlan_t_flags_reserved_1_get,
     bcmpkt_vxlan_t_reserved2_get,
     bcmpkt_vxlan_t_vn_id_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_vxlan_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VXLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_vxlan_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VXLAN_T_FID_COUNT] = {
     bcmpkt_vxlan_t_flags_reserved_1_set,
     bcmpkt_vxlan_t_reserved2_set,
     bcmpkt_vxlan_t_vn_id_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_vxlan_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_vxlan_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_vxlan_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_VXLAN_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_vxlan_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_vxlan_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_VXLAN_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_vxlan_t_field_data,
 };
 
 
@@ -7975,7 +8504,7 @@ static int32_t bcmpkt_wesp_t_wesp_iv_set(uint32_t *data, int profile, uint32_t v
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_wesp_t_fget[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_WESP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_31_7_0_wesp_t_fget[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_FID_COUNT] = {
     bcmpkt_wesp_t_flags_get,
     bcmpkt_wesp_t_header_len_get,
     bcmpkt_wesp_t_next_header_get,
@@ -7985,7 +8514,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_dna_6_5_30_2_0_wesp_t_fget[BCM56780_A0_DNA_6
     bcmpkt_wesp_t_wesp_iv_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_wesp_t_fset[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_WESP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_31_7_0_wesp_t_fset[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_FID_COUNT] = {
     bcmpkt_wesp_t_flags_set,
     bcmpkt_wesp_t_header_len_set,
     bcmpkt_wesp_t_next_header_set,
@@ -7995,527 +8524,527 @@ bcmpkt_flex_field_set_f bcm56780_a0_dna_6_5_30_2_0_wesp_t_fset[BCM56780_A0_DNA_6
     bcmpkt_wesp_t_wesp_iv_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_30_2_0_wesp_t_field_data[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_WESP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_dna_6_5_31_7_0_wesp_t_field_data[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_30_2_0_wesp_t_field_info = {
-    .num_fields = BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_WESP_T_FID_COUNT,
-    .info = bcm56780_a0_dna_6_5_30_2_0_wesp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_dna_6_5_31_7_0_wesp_t_field_info = {
+    .num_fields = BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_WESP_T_FID_COUNT,
+    .info = bcm56780_a0_dna_6_5_31_7_0_wesp_t_field_data,
 };
 
-static bcmpkt_flex_pmd_info_t bcm56780_a0_dna_6_5_30_2_0_flexhdr_info_list[BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_FLEXHDR_COUNT] = {
+static bcmpkt_flex_pmd_info_t bcm56780_a0_dna_6_5_31_7_0_flexhdr_info_list[BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_FLEXHDR_COUNT] = {
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_arp_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_arp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_arp_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_arp_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_arp_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_arp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_authen_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_authen_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_authen_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_authen_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_authen_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_authen_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_bfd_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_bfd_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_bfd_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_bfd_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_bfd_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_bfd_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_cntag_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_cntag_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_cntag_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_cntag_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_cntag_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_cntag_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_cpu_composites_0_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_cpu_composites_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_cpu_composites_0_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_cpu_composites_0_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_cpu_composites_0_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_cpu_composites_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_cpu_composites_1_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_cpu_composites_1_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_cpu_composites_1_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_cpu_composites_1_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_cpu_composites_1_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_cpu_composites_1_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_dest_option_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_dest_option_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_dest_option_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_dest_option_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_dest_option_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_dest_option_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_ep_nih_header_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_ep_nih_header_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_ep_nih_header_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_ep_nih_header_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_ep_nih_header_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_ep_nih_header_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_erspan3_fixed_hdr_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_erspan3_fixed_hdr_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_erspan3_fixed_hdr_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_erspan3_fixed_hdr_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_erspan3_fixed_hdr_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_erspan3_fixed_hdr_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_erspan3_subhdr_5_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_erspan3_subhdr_5_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_erspan3_subhdr_5_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_erspan3_subhdr_5_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_erspan3_subhdr_5_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_erspan3_subhdr_5_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_esp_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_esp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_esp_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_esp_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_esp_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_esp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_etag_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_etag_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_etag_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_etag_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_etag_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_etag_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_ethertype_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_ethertype_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_ethertype_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_ethertype_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_ethertype_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_ethertype_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_frag_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_frag_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_frag_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_frag_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_frag_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_frag_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_generic_loopback_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_generic_loopback_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_generic_loopback_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_generic_loopback_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_generic_loopback_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_generic_loopback_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_gpe_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_gpe_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_gpe_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_gpe_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_gpe_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_gpe_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_gre_chksum_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_gre_chksum_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_gre_chksum_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_gre_chksum_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_gre_chksum_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_gre_chksum_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_gre_key_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_gre_key_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_gre_key_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_gre_key_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_gre_key_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_gre_key_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_gre_rout_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_gre_rout_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_gre_rout_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_gre_rout_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_gre_rout_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_gre_rout_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_gre_seq_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_gre_seq_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_gre_seq_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_gre_seq_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_gre_seq_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_gre_seq_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_gre_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_gre_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_gre_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_gre_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_gre_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_gre_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_hg3_base_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_hg3_base_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_hg3_base_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_hg3_base_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_hg3_base_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_hg3_base_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_hg3_extension_0_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_hg3_extension_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_hg3_extension_0_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_hg3_extension_0_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_hg3_extension_0_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_hg3_extension_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_hop_by_hop_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_hop_by_hop_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_hop_by_hop_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_hop_by_hop_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_hop_by_hop_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_hop_by_hop_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_icmp_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_icmp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_icmp_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_icmp_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_icmp_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_icmp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_0_a_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_0_a_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_0_a_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_0_a_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_0_a_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_0_a_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_0_b_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_0_b_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_0_b_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_0_b_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_0_b_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_0_b_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_1_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_1_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_1_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_1_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_1_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_1_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_2_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_2_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_2_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_2_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_2_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_2_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_3_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_3_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_3_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_ifa_flex_md_3_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_3_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_ifa_flex_md_3_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_ifa_header_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_ifa_header_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_ifa_header_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_ifa_header_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_ifa_header_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_ifa_header_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_ifa_md_base_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_ifa_md_base_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_ifa_md_base_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_ifa_md_base_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_ifa_md_base_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_ifa_md_base_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_ifa_metadata_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_ifa_metadata_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_ifa_metadata_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_ifa_metadata_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_ifa_metadata_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_ifa_metadata_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_igmp_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_igmp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_igmp_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_igmp_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_igmp_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_igmp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_ipfix_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_ipfix_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_ipfix_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_ipfix_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_ipfix_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_ipfix_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_ipv4_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_ipv4_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_ipv4_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_ipv4_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_ipv4_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_ipv4_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_ipv6_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_ipv6_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_ipv6_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_ipv6_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_ipv6_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_ipv6_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_l2_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_l2_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_l2_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_l2_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_l2_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_l2_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_mirror_erspan_sn_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_mirror_erspan_sn_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_mirror_erspan_sn_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_mirror_erspan_sn_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_mirror_erspan_sn_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_mirror_erspan_sn_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_mirror_transport_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_mirror_transport_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_mirror_transport_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_mirror_transport_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_mirror_transport_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_mirror_transport_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_mpls_ach_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_mpls_ach_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_mpls_ach_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_mpls_ach_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_mpls_ach_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_mpls_ach_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_mpls_bv_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_mpls_bv_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_mpls_bv_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_mpls_bv_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_mpls_bv_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_mpls_bv_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_mpls_cw_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_mpls_cw_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_mpls_cw_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_mpls_cw_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_mpls_cw_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_mpls_cw_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_mpls_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_mpls_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_mpls_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_mpls_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_mpls_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_mpls_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_p_1588_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_p_1588_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_p_1588_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_p_1588_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_p_1588_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_p_1588_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_pim_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_pim_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_pim_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_pim_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_pim_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_pim_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_prog_ext_hdr_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_prog_ext_hdr_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_prog_ext_hdr_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_prog_ext_hdr_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_prog_ext_hdr_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_prog_ext_hdr_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_psamp_0_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_psamp_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_psamp_0_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_psamp_0_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_psamp_0_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_psamp_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_psamp_1_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_psamp_1_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_psamp_1_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_psamp_1_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_psamp_1_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_psamp_1_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_psamp_mirror_on_drop_0_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_psamp_mirror_on_drop_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_psamp_mirror_on_drop_0_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_psamp_mirror_on_drop_0_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_psamp_mirror_on_drop_0_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_psamp_mirror_on_drop_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_psamp_mirror_on_drop_3_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_psamp_mirror_on_drop_3_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_psamp_mirror_on_drop_3_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_psamp_mirror_on_drop_3_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_psamp_mirror_on_drop_3_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_psamp_mirror_on_drop_3_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_rarp_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_rarp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_rarp_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_rarp_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_rarp_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_rarp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_routing_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_routing_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_routing_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_routing_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_routing_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_routing_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_rspan_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_rspan_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_rspan_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_rspan_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_rspan_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_rspan_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_sflow_shim_0_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_sflow_shim_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_sflow_shim_0_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_sflow_shim_0_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_sflow_shim_0_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_sflow_shim_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_sflow_shim_1_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_sflow_shim_1_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_sflow_shim_1_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_sflow_shim_1_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_sflow_shim_1_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_sflow_shim_1_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_sflow_shim_2_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_sflow_shim_2_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_sflow_shim_2_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_sflow_shim_2_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_sflow_shim_2_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_sflow_shim_2_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_snap_llc_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_snap_llc_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_snap_llc_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_snap_llc_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_snap_llc_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_snap_llc_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_svtag_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_svtag_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_svtag_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_svtag_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_svtag_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_svtag_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_tcp_first_4bytes_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_tcp_first_4bytes_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_tcp_first_4bytes_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_tcp_first_4bytes_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_tcp_first_4bytes_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_tcp_first_4bytes_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_tcp_last_16bytes_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_tcp_last_16bytes_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_tcp_last_16bytes_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_tcp_last_16bytes_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_tcp_last_16bytes_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_tcp_last_16bytes_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_udp_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_udp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_udp_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_udp_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_udp_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_udp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_unknown_l3_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_unknown_l3_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_unknown_l3_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_unknown_l3_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_unknown_l3_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_unknown_l3_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_unknown_l4_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_unknown_l4_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_unknown_l4_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_unknown_l4_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_unknown_l4_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_unknown_l4_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_unknown_l5_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_unknown_l5_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_unknown_l5_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_unknown_l5_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_unknown_l5_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_unknown_l5_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_vlan_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_vlan_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_vlan_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_vlan_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_vlan_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_vlan_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_vntag_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_vntag_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_vntag_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_vntag_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_vntag_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_vntag_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_vxlan_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_vxlan_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_vxlan_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_vxlan_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_vxlan_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_vxlan_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_wesp_t_field_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_wesp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_dna_6_5_30_2_0_wesp_t_fget,
-        .flex_fset = bcm56780_a0_dna_6_5_30_2_0_wesp_t_fset,
+        .flex_fget = bcm56780_a0_dna_6_5_31_7_0_wesp_t_fget,
+        .flex_fset = bcm56780_a0_dna_6_5_31_7_0_wesp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_field_info,
-        .reasons_info = &bcm56780_a0_dna_6_5_30_2_0_rxpmd_flex_reasons_info,
+        .field_info = &bcm56780_a0_dna_6_5_31_7_0_rxpmd_flex_field_info,
+        .reasons_info = &bcm56780_a0_dna_6_5_31_7_0_rxpmd_flex_reasons_info,
         .flex_common_fget = bcm56780_a0_rxpmd_flex_fget,
         .flex_common_fset = bcm56780_a0_rxpmd_flex_fset,
     },
 };
 
-static shr_enum_map_t bcm56780_a0_dna_6_5_30_2_0_flexhdr_id_map[] = {
-    BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_FLEXHDR_NAME_MAP_INIT
+static shr_enum_map_t bcm56780_a0_dna_6_5_31_7_0_flexhdr_id_map[] = {
+    BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_FLEXHDR_NAME_MAP_INIT
 };
 
-shr_enum_map_t * bcm56780_a0_dna_6_5_30_2_0_flexhdr_map_get(void)
+shr_enum_map_t * bcm56780_a0_dna_6_5_31_7_0_flexhdr_map_get(void)
 {
-    return bcm56780_a0_dna_6_5_30_2_0_flexhdr_id_map;
+    return bcm56780_a0_dna_6_5_31_7_0_flexhdr_id_map;
 }
 
-bcmpkt_flex_pmd_info_t * bcm56780_a0_dna_6_5_30_2_0_flex_pmd_info_get(uint32_t hid)
+bcmpkt_flex_pmd_info_t * bcm56780_a0_dna_6_5_31_7_0_flex_pmd_info_get(uint32_t hid)
 {
-    if (hid >= BCM56780_A0_DNA_6_5_30_2_0_BCMPKT_FLEXHDR_COUNT) {
+    if (hid >= BCM56780_A0_DNA_6_5_31_7_0_BCMPKT_FLEXHDR_COUNT) {
         return NULL;
     }
 
-    return &bcm56780_a0_dna_6_5_30_2_0_flexhdr_info_list[hid];
+    return &bcm56780_a0_dna_6_5_31_7_0_flexhdr_info_list[hid];
 }
 
-int bcm56780_a0_dna_6_5_30_2_0_flexhdr_variant_support_map[BCMPKT_PMD_COUNT] = {
+int bcm56780_a0_dna_6_5_31_7_0_flexhdr_variant_support_map[BCMPKT_PMD_COUNT] = {
     14,
     21,
     22,
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_bcmpkt_rxpmd_match_id.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_bcmpkt_rxpmd_match_id.c
similarity index 83%
rename from platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_bcmpkt_rxpmd_match_id.c
rename to platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_bcmpkt_rxpmd_match_id.c
index 41eeeee2e12b..14e29e6984f6 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_bcmpkt_rxpmd_match_id.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_bcmpkt_rxpmd_match_id.c
@@ -2,8 +2,8 @@
  *
  * DO NOT EDIT THIS FILE!
  * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) bcm56780_a0_hna_6_5_30_6_0_sf_match_id_info.yml
- * for device bcm56780_a0 and variant hna_6_5_30_6_0.
+ * from the NPL output file(s) bcm56780_a0_hna_6_5_31_3_0_sf_match_id_info.yml
+ * for device bcm56780_a0 and variant hna_6_5_31_3_0.
  * Edits to this file will be lost when it is regenerated.
  *
  * $Id: $
@@ -29,13 +29,13 @@
 
 
 #include <bcmpkt/bcmpkt_rxpmd_match_id.h>
-#include <bcmpkt/xfcr/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_bcmpkt_rxpmd_match_id_defs.h>
+#include <bcmpkt/xfcr/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_bcmpkt_rxpmd_match_id_defs.h>
 
 
 static bcmpkt_rxpmd_match_id_db_t
-bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_COUNT] = {
+bcm56780_a0_hna_6_5_31_3_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_COUNT] = {
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ETAG */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ETAG */
         .name         = "EGRESS_PKT_FWD_L2_HDR_ETAG",
         .match        = 0x40,
         .match_mask   = 0x60,
@@ -49,7 +49,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG */
         .name         = "EGRESS_PKT_FWD_L2_HDR_ITAG",
         .match        = 0x10,
         .match_mask   = 0x10,
@@ -63,7 +63,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2 */
         .name         = "EGRESS_PKT_FWD_L2_HDR_L2",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -77,7 +77,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE */
         .name         = "EGRESS_PKT_FWD_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x7f,
@@ -91,7 +91,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG */
         .name         = "EGRESS_PKT_FWD_L2_HDR_OTAG",
         .match        = 0x8,
         .match_mask   = 0x8,
@@ -105,7 +105,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC */
         .name         = "EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC",
         .match        = 0x2,
         .match_mask   = 0x2,
@@ -119,7 +119,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SVTAG */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SVTAG */
         .name         = "EGRESS_PKT_FWD_L2_HDR_SVTAG",
         .match        = 0x4,
         .match_mask   = 0x4,
@@ -133,7 +133,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_VNTAG */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_VNTAG */
         .name         = "EGRESS_PKT_FWD_L2_HDR_VNTAG",
         .match        = 0x20,
         .match_mask   = 0x60,
@@ -147,7 +147,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ARP",
         .match        = 0x1800,
         .match_mask   = 0x3830,
@@ -161,7 +161,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1",
         .match        = 0x80,
         .match_mask   = 0x1c2,
@@ -175,7 +175,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2",
         .match        = 0x408,
         .match_mask   = 0x64c,
@@ -189,7 +189,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_BFD",
         .match        = 0x3800,
         .match_mask   = 0x3800,
@@ -203,7 +203,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT",
         .match        = 0x200,
         .match_mask   = 0x642,
@@ -217,7 +217,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -231,7 +231,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1",
         .match        = 0x100,
         .match_mask   = 0x1c0,
@@ -245,7 +245,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2",
         .match        = 0x600,
         .match_mask   = 0x640,
@@ -259,7 +259,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GPE",
         .match        = 0x1830,
         .match_mask   = 0x3870,
@@ -273,7 +273,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE",
         .match        = 0x2,
         .match_mask   = 0x42,
@@ -287,7 +287,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM",
         .match        = 0x202,
         .match_mask   = 0x642,
@@ -301,7 +301,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY",
         .match        = 0x1000,
         .match_mask   = 0x3800,
@@ -315,7 +315,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT",
         .match        = 0x82,
         .match_mask   = 0x1c2,
@@ -329,7 +329,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ",
         .match        = 0x12,
         .match_mask   = 0x72,
@@ -343,7 +343,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ICMP",
         .match        = 0x2000,
         .match_mask   = 0x3830,
@@ -357,7 +357,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA",
         .match        = 0x180,
         .match_mask   = 0x1c0,
@@ -371,7 +371,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IGMP",
         .match        = 0x404,
         .match_mask   = 0x64c,
@@ -385,7 +385,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IPV4",
         .match        = 0x4,
         .match_mask   = 0x4c,
@@ -399,7 +399,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IPV6",
         .match        = 0x8,
         .match_mask   = 0x4c,
@@ -413,7 +413,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS0",
         .match        = 0x40,
         .match_mask   = 0x40,
@@ -427,7 +427,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS1",
         .match        = 0x42,
         .match_mask   = 0x42,
@@ -441,7 +441,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS2",
         .match        = 0x44,
         .match_mask   = 0x44,
@@ -455,7 +455,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS3",
         .match        = 0x48,
         .match_mask   = 0x48,
@@ -469,7 +469,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS4",
         .match        = 0x50,
         .match_mask   = 0x50,
@@ -483,7 +483,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS5",
         .match        = 0x60,
         .match_mask   = 0x60,
@@ -497,7 +497,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS6",
         .match        = 0xc0,
         .match_mask   = 0xc0,
@@ -511,7 +511,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH",
         .match        = 0x140,
         .match_mask   = 0x140,
@@ -525,7 +525,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW",
         .match        = 0x240,
         .match_mask   = 0x240,
@@ -539,7 +539,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3fff,
@@ -553,7 +553,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_P_1588",
         .match        = 0x3000,
         .match_mask   = 0x3800,
@@ -567,7 +567,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_RARP",
         .match        = 0x800,
         .match_mask   = 0x3830,
@@ -581,7 +581,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x20,
         .match_mask   = 0x70,
@@ -595,7 +595,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x820,
         .match_mask   = 0x3870,
@@ -609,7 +609,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UDP",
         .match        = 0x30,
         .match_mask   = 0x70,
@@ -623,7 +623,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3",
         .match        = 0x10,
         .match_mask   = 0x72,
@@ -637,7 +637,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x2800,
         .match_mask   = 0x3800,
@@ -651,7 +651,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x2030,
         .match_mask   = 0x3870,
@@ -665,7 +665,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_VXLAN",
         .match        = 0x830,
         .match_mask   = 0x3870,
@@ -679,7 +679,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH */
         .name         = "EGRESS_PKT_SYS_HDR_EP_NIH",
         .match        = 0x2,
         .match_mask   = 0x3,
@@ -693,7 +693,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK */
         .name         = "EGRESS_PKT_SYS_HDR_LOOPBACK",
         .match        = 0x1,
         .match_mask   = 0x3,
@@ -707,7 +707,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE */
         .name         = "EGRESS_PKT_SYS_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3,
@@ -721,7 +721,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ETAG */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ETAG */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_ETAG",
         .match        = 0x40,
         .match_mask   = 0x60,
@@ -735,7 +735,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_ITAG",
         .match        = 0x10,
         .match_mask   = 0x10,
@@ -749,7 +749,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2 */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_L2",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -763,7 +763,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x7f,
@@ -777,7 +777,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_OTAG",
         .match        = 0x8,
         .match_mask   = 0x8,
@@ -791,7 +791,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC",
         .match        = 0x2,
         .match_mask   = 0x2,
@@ -805,7 +805,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SVTAG */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SVTAG */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_SVTAG",
         .match        = 0x4,
         .match_mask   = 0x4,
@@ -819,7 +819,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_VNTAG */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_VNTAG */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_VNTAG",
         .match        = 0x20,
         .match_mask   = 0x60,
@@ -833,7 +833,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP",
         .match        = 0x1800,
         .match_mask   = 0x3830,
@@ -847,7 +847,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1",
         .match        = 0x80,
         .match_mask   = 0x1c2,
@@ -861,7 +861,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2",
         .match        = 0x408,
         .match_mask   = 0x64c,
@@ -875,7 +875,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD",
         .match        = 0x3800,
         .match_mask   = 0x3800,
@@ -889,7 +889,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT",
         .match        = 0x200,
         .match_mask   = 0x642,
@@ -903,7 +903,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -917,7 +917,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1",
         .match        = 0x100,
         .match_mask   = 0x1c0,
@@ -931,7 +931,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2",
         .match        = 0x600,
         .match_mask   = 0x640,
@@ -945,7 +945,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE",
         .match        = 0x1830,
         .match_mask   = 0x3870,
@@ -959,7 +959,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE",
         .match        = 0x2,
         .match_mask   = 0x42,
@@ -973,7 +973,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM",
         .match        = 0x202,
         .match_mask   = 0x642,
@@ -987,7 +987,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY",
         .match        = 0x1000,
         .match_mask   = 0x3800,
@@ -1001,7 +1001,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT",
         .match        = 0x82,
         .match_mask   = 0x1c2,
@@ -1015,7 +1015,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ",
         .match        = 0x12,
         .match_mask   = 0x72,
@@ -1029,7 +1029,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP",
         .match        = 0x2000,
         .match_mask   = 0x3830,
@@ -1043,7 +1043,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA",
         .match        = 0x180,
         .match_mask   = 0x1c0,
@@ -1057,7 +1057,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP",
         .match        = 0x404,
         .match_mask   = 0x64c,
@@ -1071,7 +1071,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4",
         .match        = 0x4,
         .match_mask   = 0x4c,
@@ -1085,7 +1085,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6",
         .match        = 0x8,
         .match_mask   = 0x4c,
@@ -1099,7 +1099,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0",
         .match        = 0x40,
         .match_mask   = 0x40,
@@ -1113,7 +1113,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1",
         .match        = 0x42,
         .match_mask   = 0x42,
@@ -1127,7 +1127,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2",
         .match        = 0x44,
         .match_mask   = 0x44,
@@ -1141,7 +1141,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3",
         .match        = 0x48,
         .match_mask   = 0x48,
@@ -1155,7 +1155,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4",
         .match        = 0x50,
         .match_mask   = 0x50,
@@ -1169,7 +1169,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5",
         .match        = 0x60,
         .match_mask   = 0x60,
@@ -1183,7 +1183,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6",
         .match        = 0xc0,
         .match_mask   = 0xc0,
@@ -1197,7 +1197,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH",
         .match        = 0x140,
         .match_mask   = 0x140,
@@ -1211,7 +1211,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW",
         .match        = 0x240,
         .match_mask   = 0x240,
@@ -1225,7 +1225,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3fff,
@@ -1239,7 +1239,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588",
         .match        = 0x3000,
         .match_mask   = 0x3800,
@@ -1253,7 +1253,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP",
         .match        = 0x800,
         .match_mask   = 0x3830,
@@ -1267,7 +1267,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x20,
         .match_mask   = 0x70,
@@ -1281,7 +1281,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x820,
         .match_mask   = 0x3870,
@@ -1295,7 +1295,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP",
         .match        = 0x30,
         .match_mask   = 0x70,
@@ -1309,7 +1309,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3",
         .match        = 0x10,
         .match_mask   = 0x72,
@@ -1323,7 +1323,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x2800,
         .match_mask   = 0x3800,
@@ -1337,7 +1337,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x2030,
         .match_mask   = 0x3870,
@@ -1351,7 +1351,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN",
         .match        = 0x830,
         .match_mask   = 0x3870,
@@ -1365,7 +1365,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ETAG */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ETAG */
         .name         = "INGRESS_PKT_INNER_L2_HDR_ETAG",
         .match        = 0x40,
         .match_mask   = 0x60,
@@ -1379,7 +1379,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG */
         .name         = "INGRESS_PKT_INNER_L2_HDR_ITAG",
         .match        = 0x10,
         .match_mask   = 0x10,
@@ -1393,7 +1393,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2 */
         .name         = "INGRESS_PKT_INNER_L2_HDR_L2",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -1407,7 +1407,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE */
         .name         = "INGRESS_PKT_INNER_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x7f,
@@ -1421,7 +1421,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG */
         .name         = "INGRESS_PKT_INNER_L2_HDR_OTAG",
         .match        = 0x8,
         .match_mask   = 0x8,
@@ -1435,7 +1435,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC */
         .name         = "INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC",
         .match        = 0x2,
         .match_mask   = 0x2,
@@ -1449,7 +1449,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_VNTAG */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_VNTAG */
         .name         = "INGRESS_PKT_INNER_L2_HDR_VNTAG",
         .match        = 0x20,
         .match_mask   = 0x60,
@@ -1463,7 +1463,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ARP",
         .match        = 0x1800,
         .match_mask   = 0x3830,
@@ -1477,7 +1477,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1",
         .match        = 0x80,
         .match_mask   = 0x1c2,
@@ -1491,7 +1491,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2",
         .match        = 0x408,
         .match_mask   = 0x64c,
@@ -1505,7 +1505,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_BFD",
         .match        = 0x3800,
         .match_mask   = 0x3800,
@@ -1519,7 +1519,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT",
         .match        = 0x200,
         .match_mask   = 0x642,
@@ -1533,7 +1533,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -1547,7 +1547,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1",
         .match        = 0x100,
         .match_mask   = 0x1c0,
@@ -1561,7 +1561,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2",
         .match        = 0x600,
         .match_mask   = 0x640,
@@ -1575,7 +1575,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ICMP",
         .match        = 0x2000,
         .match_mask   = 0x3830,
@@ -1589,7 +1589,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA",
         .match        = 0x180,
         .match_mask   = 0x1c0,
@@ -1603,7 +1603,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_IGMP",
         .match        = 0x404,
         .match_mask   = 0x64c,
@@ -1617,7 +1617,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_IPV4",
         .match        = 0x4,
         .match_mask   = 0x4c,
@@ -1631,7 +1631,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_IPV6",
         .match        = 0x8,
         .match_mask   = 0x4c,
@@ -1645,7 +1645,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3fff,
@@ -1659,7 +1659,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_P_1588",
         .match        = 0x3000,
         .match_mask   = 0x3800,
@@ -1673,7 +1673,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_RARP",
         .match        = 0x800,
         .match_mask   = 0x3830,
@@ -1687,7 +1687,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x20,
         .match_mask   = 0x70,
@@ -1701,7 +1701,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x820,
         .match_mask   = 0x3870,
@@ -1715,7 +1715,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UDP",
         .match        = 0x30,
         .match_mask   = 0x70,
@@ -1729,7 +1729,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3",
         .match        = 0x10,
         .match_mask   = 0x72,
@@ -1743,7 +1743,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x2800,
         .match_mask   = 0x3800,
@@ -1757,7 +1757,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x2030,
         .match_mask   = 0x3870,
@@ -1771,7 +1771,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ETAG */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ETAG */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_ETAG",
         .match        = 0x40,
         .match_mask   = 0x60,
@@ -1785,7 +1785,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_ITAG",
         .match        = 0x10,
         .match_mask   = 0x10,
@@ -1799,7 +1799,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2 */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_L2",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -1813,7 +1813,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x7f,
@@ -1827,7 +1827,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_OTAG",
         .match        = 0x8,
         .match_mask   = 0x8,
@@ -1841,7 +1841,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC",
         .match        = 0x2,
         .match_mask   = 0x2,
@@ -1855,7 +1855,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SVTAG */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SVTAG */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_SVTAG",
         .match        = 0x4,
         .match_mask   = 0x4,
@@ -1869,7 +1869,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_VNTAG */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_VNTAG */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_VNTAG",
         .match        = 0x20,
         .match_mask   = 0x60,
@@ -1883,7 +1883,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ARP",
         .match        = 0x1800,
         .match_mask   = 0x3830,
@@ -1897,7 +1897,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1",
         .match        = 0x80,
         .match_mask   = 0x1c2,
@@ -1911,7 +1911,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2",
         .match        = 0x408,
         .match_mask   = 0x64c,
@@ -1925,7 +1925,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_BFD",
         .match        = 0x3800,
         .match_mask   = 0x3800,
@@ -1939,7 +1939,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT",
         .match        = 0x200,
         .match_mask   = 0x642,
@@ -1953,7 +1953,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -1967,7 +1967,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1",
         .match        = 0x100,
         .match_mask   = 0x1c0,
@@ -1981,7 +1981,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2",
         .match        = 0x600,
         .match_mask   = 0x640,
@@ -1995,7 +1995,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GPE",
         .match        = 0x1830,
         .match_mask   = 0x3870,
@@ -2009,7 +2009,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE",
         .match        = 0x2,
         .match_mask   = 0x42,
@@ -2023,7 +2023,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM",
         .match        = 0x202,
         .match_mask   = 0x642,
@@ -2037,7 +2037,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY",
         .match        = 0x1000,
         .match_mask   = 0x3800,
@@ -2051,7 +2051,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT",
         .match        = 0x82,
         .match_mask   = 0x1c2,
@@ -2065,7 +2065,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ",
         .match        = 0x12,
         .match_mask   = 0x72,
@@ -2079,7 +2079,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ICMP",
         .match        = 0x2000,
         .match_mask   = 0x3830,
@@ -2093,7 +2093,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA",
         .match        = 0x180,
         .match_mask   = 0x1c0,
@@ -2107,7 +2107,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IGMP",
         .match        = 0x404,
         .match_mask   = 0x64c,
@@ -2121,7 +2121,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IPV4",
         .match        = 0x4,
         .match_mask   = 0x4c,
@@ -2135,7 +2135,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IPV6",
         .match        = 0x8,
         .match_mask   = 0x4c,
@@ -2149,7 +2149,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0",
         .match        = 0x40,
         .match_mask   = 0x40,
@@ -2163,7 +2163,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1",
         .match        = 0x42,
         .match_mask   = 0x42,
@@ -2177,7 +2177,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2",
         .match        = 0x44,
         .match_mask   = 0x44,
@@ -2191,7 +2191,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3",
         .match        = 0x48,
         .match_mask   = 0x48,
@@ -2205,7 +2205,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4",
         .match        = 0x50,
         .match_mask   = 0x50,
@@ -2219,7 +2219,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5",
         .match        = 0x60,
         .match_mask   = 0x60,
@@ -2233,7 +2233,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6",
         .match        = 0xc0,
         .match_mask   = 0xc0,
@@ -2247,7 +2247,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH",
         .match        = 0x140,
         .match_mask   = 0x140,
@@ -2261,7 +2261,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW",
         .match        = 0x240,
         .match_mask   = 0x240,
@@ -2275,7 +2275,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3fff,
@@ -2289,7 +2289,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_P_1588",
         .match        = 0x3000,
         .match_mask   = 0x3800,
@@ -2303,7 +2303,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_RARP",
         .match        = 0x800,
         .match_mask   = 0x3830,
@@ -2317,7 +2317,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x20,
         .match_mask   = 0x70,
@@ -2331,7 +2331,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x820,
         .match_mask   = 0x3870,
@@ -2345,7 +2345,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UDP",
         .match        = 0x30,
         .match_mask   = 0x70,
@@ -2359,7 +2359,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3",
         .match        = 0x10,
         .match_mask   = 0x72,
@@ -2373,7 +2373,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x2800,
         .match_mask   = 0x3800,
@@ -2387,7 +2387,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x2030,
         .match_mask   = 0x3870,
@@ -2401,7 +2401,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN",
         .match        = 0x830,
         .match_mask   = 0x3870,
@@ -2415,7 +2415,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH */
         .name         = "INGRESS_PKT_SYS_HDR_EP_NIH",
         .match        = 0x2,
         .match_mask   = 0x3,
@@ -2429,7 +2429,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK */
         .name         = "INGRESS_PKT_SYS_HDR_LOOPBACK",
         .match        = 0x1,
         .match_mask   = 0x3,
@@ -2443,7 +2443,7 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
 
     },
     {
-        /* BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE */
+        /* BCM56780_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE */
         .name         = "INGRESS_PKT_SYS_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3,
@@ -2458,23 +2458,23 @@ bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db[BCM56780_A0_HNA_6_5_30_6_0_RXPMD_MA
     },
 };
 
-static bcmpkt_rxpmd_match_id_db_info_t bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db_info = {
+static bcmpkt_rxpmd_match_id_db_info_t bcm56780_a0_hna_6_5_31_3_0_rxpmd_match_id_db_info = {
     .num_entries = 173,
-    .db = bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db
+    .db = bcm56780_a0_hna_6_5_31_3_0_rxpmd_match_id_db
 };
-bcmpkt_rxpmd_match_id_db_info_t * bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db_info_get(void) {
-    return &bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_db_info;
+bcmpkt_rxpmd_match_id_db_info_t * bcm56780_a0_hna_6_5_31_3_0_rxpmd_match_id_db_info_get(void) {
+    return &bcm56780_a0_hna_6_5_31_3_0_rxpmd_match_id_db_info;
 }
 
-static shr_enum_map_t bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_map[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT
+static shr_enum_map_t bcm56780_a0_hna_6_5_31_3_0_rxpmd_match_id_map[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_rxpmd_match_id_map_info_t bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_map_info = {
+static bcmpkt_rxpmd_match_id_map_info_t bcm56780_a0_hna_6_5_31_3_0_rxpmd_match_id_map_info = {
     .num_entries = 173,
-    .map = bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_map
+    .map = bcm56780_a0_hna_6_5_31_3_0_rxpmd_match_id_map
 };
 
-bcmpkt_rxpmd_match_id_map_info_t * bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_map_info_get(void) {
-    return &bcm56780_a0_hna_6_5_30_6_0_rxpmd_match_id_map_info;
+bcmpkt_rxpmd_match_id_map_info_t * bcm56780_a0_hna_6_5_31_3_0_rxpmd_match_id_map_info_get(void) {
+    return &bcm56780_a0_hna_6_5_31_3_0_rxpmd_match_id_map_info;
 }
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_pkt_flexhdr.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_pkt_flexhdr.c
similarity index 77%
rename from platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_pkt_flexhdr.c
rename to platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_pkt_flexhdr.c
index 75b50b998967..66edd0cacffa 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_pkt_flexhdr.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_pkt_flexhdr.c
@@ -3,7 +3,7 @@
  * DO NOT EDIT THIS FILE!
  * This file is auto-generated by xfc_map_parser
  * from the NPL output file(s) map.yml
- * for device bcm56780_a0 and variant hna_6_5_30_6_0.
+ * for device bcm56780_a0 and variant hna_6_5_31_3_0.
  * Edits to this file will be lost when it is regenerated.
  *
  * $Id: $
@@ -31,315 +31,315 @@
 #include <shr/shr_error.h>
 #include <bcmpkt/bcmpkt_flexhdr.h>
 #include <bcmpkt/chip/bcm56780_a0/bcmpkt_bcm56780_a0_rxpmd.h>
-#include <bcmpkt/xfcr/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_bcmpkt_flexhdr.h>
-#include <bcmpkt/xfcr/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_bcmpkt_flexhdr_data.h>
-#include <bcmpkt/xfcr/bcm56780_a0/hna_6_5_30_6_0/bcm56780_a0_hna_6_5_30_6_0_bcmpkt_rxpmd_flex_data.h>
+#include <bcmpkt/xfcr/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_bcmpkt_flexhdr.h>
+#include <bcmpkt/xfcr/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_bcmpkt_flexhdr_data.h>
+#include <bcmpkt/xfcr/bcm56780_a0/hna_6_5_31_3_0/bcm56780_a0_hna_6_5_31_3_0_bcmpkt_rxpmd_flex_data.h>
 
 #define MASK(_bn) (((uint32_t)0x1<<(_bn))-1)
 #define WORD_FIELD_GET(_d,_s,_l) (((_d) >> (_s)) & MASK(_l))
 #define WORD_FIELD_SET(_d,_s,_l,_v) (_d)=(((_d) & ~(MASK(_l) << (_s))) | (((_v) & MASK(_l)) << (_s)))
 #define WORD_FIELD_MASK(_d,_s,_l) (_d)=((_d) | (MASK(_l) << (_s)))
 
-static void bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_reason_decode(uint32_t *data, bcmpkt_bitmap_t *reasons)
+static void bcm56780_a0_hna_6_5_31_3_0_rxpmd_flex_reason_decode(uint32_t *data, bcmpkt_bitmap_t *reasons)
 {
     uint32_t *reason = data + 0;
 
     if (reason[13] & (0x1 << 0)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU);
     }
     if (reason[13] & (0x1 << 1)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS);
     }
     if (reason[13] & (0x1 << 2)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE);
     }
     if (reason[13] & (0x1 << 3)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_RESERVED_TRACE_BIT);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_RESERVED_TRACE_BIT);
     }
     if (reason[13] & (0x1 << 4)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD);
     }
     if (reason[13] & (0x1 << 5)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED);
     }
     if (reason[13] & (0x1 << 6)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT);
     }
     if (reason[13] & (0x1 << 7)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD);
     }
     if (reason[13] & (0x1 << 8)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD);
     }
     if (reason[13] & (0x1 << 9)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS);
     }
     if (reason[13] & (0x1 << 10)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP);
     }
     if (reason[13] & (0x1 << 11)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS);
     }
     if (reason[13] & (0x1 << 12)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP);
     }
     if (reason[13] & (0x1 << 13)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR);
     }
     if (reason[13] & (0x1 << 14)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR);
     }
     if (reason[13] & (0x1 << 15)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED);
     }
     if (reason[13] & (0x1 << 16)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL);
     }
     if (reason[13] & (0x1 << 17)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_VFP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_VFP);
     }
     if (reason[13] & (0x1 << 18)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_IFP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP);
     }
     if (reason[13] & (0x1 << 19)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER);
     }
     if (reason[13] & (0x1 << 20)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP);
     }
     if (reason[13] & (0x1 << 21)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_SVP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_SVP);
     }
     if (reason[13] & (0x1 << 22)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT);
     }
     if (reason[13] & (0x1 << 23)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT);
     }
     if (reason[13] & (0x1 << 24)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED);
     }
     if (reason[13] & (0x1 << 25)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED);
     }
     if (reason[13] & (0x1 << 26)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP);
     }
     if (reason[13] & (0x1 << 27)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED);
     }
     if (reason[13] & (0x1 << 28)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF);
     }
     if (reason[13] & (0x1 << 29)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED);
     }
     if (reason[13] & (0x1 << 30)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED);
     }
     if (reason[13] & (0x1 << 31)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU);
     }
     if (reason[12] & (0x1 << 0)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0);
     }
     if (reason[12] & (0x1 << 1)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1);
     }
     if (reason[12] & (0x1 << 2)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2);
     }
     if (reason[12] & (0x1 << 3)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3);
     }
     if (reason[12] & (0x1 << 4)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4);
     }
     if (reason[12] & (0x1 << 5)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5);
     }
     if (reason[12] & (0x1 << 6)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6);
     }
     if (reason[12] & (0x1 << 7)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7);
     }
     if (reason[12] & (0x1 << 8)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MTOP_IPV4_GATEWAY);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MTOP_IPV4_GATEWAY);
     }
     if (reason[12] & (0x1 << 9)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED);
     }
     if (reason[12] & (0x1 << 10)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED);
     }
     if (reason[12] & (0x1 << 11)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE);
     }
     if (reason[12] & (0x1 << 12)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR);
     }
     if (reason[12] & (0x1 << 13)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU);
     }
     if (reason[12] & (0x1 << 15)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP);
     }
 }
 
-static void bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_reason_encode(bcmpkt_bitmap_t *reasons, uint32_t *data)
+static void bcm56780_a0_hna_6_5_31_3_0_rxpmd_flex_reason_encode(bcmpkt_bitmap_t *reasons, uint32_t *data)
 {
     uint32_t *reason = data + 0;
 
     reason[13] = 0;
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU)) {
         reason[13] |= (0x1 << 0);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS)) {
         reason[13] |= (0x1 << 1);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE)) {
         reason[13] |= (0x1 << 2);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_RESERVED_TRACE_BIT)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_RESERVED_TRACE_BIT)) {
         reason[13] |= (0x1 << 3);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD)) {
         reason[13] |= (0x1 << 4);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED)) {
         reason[13] |= (0x1 << 5);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT)) {
         reason[13] |= (0x1 << 6);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD)) {
         reason[13] |= (0x1 << 7);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD)) {
         reason[13] |= (0x1 << 8);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS)) {
         reason[13] |= (0x1 << 9);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP)) {
         reason[13] |= (0x1 << 10);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS)) {
         reason[13] |= (0x1 << 11);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP)) {
         reason[13] |= (0x1 << 12);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR)) {
         reason[13] |= (0x1 << 13);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR)) {
         reason[13] |= (0x1 << 14);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED)) {
         reason[13] |= (0x1 << 15);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL)) {
         reason[13] |= (0x1 << 16);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_VFP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_VFP)) {
         reason[13] |= (0x1 << 17);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_IFP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP)) {
         reason[13] |= (0x1 << 18);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER)) {
         reason[13] |= (0x1 << 19);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP)) {
         reason[13] |= (0x1 << 20);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_SVP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_SVP)) {
         reason[13] |= (0x1 << 21);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT)) {
         reason[13] |= (0x1 << 22);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT)) {
         reason[13] |= (0x1 << 23);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED)) {
         reason[13] |= (0x1 << 24);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED)) {
         reason[13] |= (0x1 << 25);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP)) {
         reason[13] |= (0x1 << 26);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED)) {
         reason[13] |= (0x1 << 27);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF)) {
         reason[13] |= (0x1 << 28);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED)) {
         reason[13] |= (0x1 << 29);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED)) {
         reason[13] |= (0x1 << 30);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU)) {
         reason[13] |= (0x1 << 31);
     }
     reason[12] = 0;
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0)) {
         reason[12] |= (0x1 << 0);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1)) {
         reason[12] |= (0x1 << 1);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2)) {
         reason[12] |= (0x1 << 2);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3)) {
         reason[12] |= (0x1 << 3);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4)) {
         reason[12] |= (0x1 << 4);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5)) {
         reason[12] |= (0x1 << 5);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6)) {
         reason[12] |= (0x1 << 6);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7)) {
         reason[12] |= (0x1 << 7);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_MTOP_IPV4_GATEWAY)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MTOP_IPV4_GATEWAY)) {
         reason[12] |= (0x1 << 8);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED)) {
         reason[12] |= (0x1 << 9);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED)) {
         reason[12] |= (0x1 << 10);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE)) {
         reason[12] |= (0x1 << 11);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR)) {
         reason[12] |= (0x1 << 12);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU)) {
         reason[12] |= (0x1 << 13);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP)) {
         reason[12] |= (0x1 << 15);
     }
 }
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_field_data[] = {
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_rxpmd_flex_field_data[] = {
     {
         .name = "DLB_ECMP_DESTINATION_15_0",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_DLB_ECMP_DESTINATION_15_0,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_DLB_ECMP_DESTINATION_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -368,7 +368,7 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_field_
     },
     {
         .name = "DROP_CODE_15_0",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -397,7 +397,7 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_field_
     },
     {
         .name = "DVP_15_0",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_DVP_15_0,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_DVP_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -426,7 +426,7 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_field_
     },
     {
         .name = "EFFECTIVE_TTL_7_0",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_7_0,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_7_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -455,7 +455,7 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_field_
     },
     {
         .name = "EGR_MTOP_INDEX_HI_3_0",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_EGR_MTOP_INDEX_HI_3_0,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EGR_MTOP_INDEX_HI_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -484,7 +484,7 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_field_
     },
     {
         .name = "EGR_MTOP_INDEX_LO_EP_NIH_DROP_CODE_OR_IFP_OPAQUE_OBJ_15_0",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_EGR_MTOP_INDEX_LO_EP_NIH_DROP_CODE_OR_IFP_OPAQUE_OBJ_15_0,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EGR_MTOP_INDEX_LO_EP_NIH_DROP_CODE_OR_IFP_OPAQUE_OBJ_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -511,7 +511,7 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_field_
     },
     {
         .name = "EM_FT_OPAQUE_OBJ_OR_IFP_OPAQUE_OBJ_15_0",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_EM_FT_OPAQUE_OBJ_OR_IFP_OPAQUE_OBJ_15_0,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EM_FT_OPAQUE_OBJ_OR_IFP_OPAQUE_OBJ_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -530,36 +530,36 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_field_
     },
     {
         .name = "ENTROPY_LABEL_HIGH_3_0",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_HIGH_3_0,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_HIGH_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 392, 395 }, /* Profile 2. */
-            { 392, 395 }, /* Profile 3. */
-            { 392, 395 }, /* Profile 4. */
-            { 392, 395 }, /* Profile 5. */
-            { 392, 395 }, /* Profile 6. */
-            { 392, 395 }, /* Profile 7. */
-            { 392, 395 }, /* Profile 8. */
-            { 392, 395 }, /* Profile 9. */
-            { 392, 395 }, /* Profile 10. */
-            { 392, 395 }, /* Profile 11. */
-            { 392, 395 }, /* Profile 12. */
-            { 392, 395 }, /* Profile 13. */
-            { 392, 395 }, /* Profile 14. */
-            { 392, 395 }, /* Profile 15. */
-            { 392, 395 }, /* Profile 16. */
-            { 392, 395 }, /* Profile 17. */
-            { 392, 395 }, /* Profile 18. */
-            { 392, 395 }, /* Profile 19. */
-            { 392, 395 }, /* Profile 20. */
-            { 392, 395 }, /* Profile 21. */
+            { 424, 427 }, /* Profile 2. */
+            { 424, 427 }, /* Profile 3. */
+            { 424, 427 }, /* Profile 4. */
+            { 424, 427 }, /* Profile 5. */
+            { 424, 427 }, /* Profile 6. */
+            { 424, 427 }, /* Profile 7. */
+            { 424, 427 }, /* Profile 8. */
+            { 424, 427 }, /* Profile 9. */
+            { 424, 427 }, /* Profile 10. */
+            { 424, 427 }, /* Profile 11. */
+            { 424, 427 }, /* Profile 12. */
+            { 424, 427 }, /* Profile 13. */
+            { 424, 427 }, /* Profile 14. */
+            { 424, 427 }, /* Profile 15. */
+            { 424, 427 }, /* Profile 16. */
+            { 424, 427 }, /* Profile 17. */
+            { 424, 427 }, /* Profile 18. */
+            { 424, 427 }, /* Profile 19. */
+            { 424, 427 }, /* Profile 20. */
+            { 424, 427 }, /* Profile 21. */
         },
         .profile_cnt = 22,
     },
     {
         .name = "ENTROPY_LABEL_LOW_15_0",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -588,7 +588,7 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_field_
     },
     {
         .name = "EP_NIH_HDR_TIMESTAMP_15_0",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_15_0,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -614,7 +614,7 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_field_
     },
     {
         .name = "EP_NIH_HDR_TIMESTAMP_31_16",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_31_16,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_31_16,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -640,7 +640,7 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_field_
     },
     {
         .name = "EVENT_TRACE_VECTOR_15_0",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_15_0,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -669,7 +669,7 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_field_
     },
     {
         .name = "EVENT_TRACE_VECTOR_31_16",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_16,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_16,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -698,7 +698,7 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_field_
     },
     {
         .name = "EVENT_TRACE_VECTOR_47_32",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -727,7 +727,7 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_field_
     },
     {
         .name = "I2E_CLASS_ID_15_0",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -756,36 +756,36 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_field_
     },
     {
         .name = "IFP_IOAM_GBP_ACTION_3_0",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_IFP_IOAM_GBP_ACTION_3_0,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_IFP_IOAM_GBP_ACTION_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 408, 411 }, /* Profile 2. */
-            { 408, 411 }, /* Profile 3. */
-            { 408, 411 }, /* Profile 4. */
-            { 408, 411 }, /* Profile 5. */
-            { 408, 411 }, /* Profile 6. */
-            { 408, 411 }, /* Profile 7. */
-            { 408, 411 }, /* Profile 8. */
-            { 408, 411 }, /* Profile 9. */
-            { 408, 411 }, /* Profile 10. */
-            { 408, 411 }, /* Profile 11. */
-            { 408, 411 }, /* Profile 12. */
-            { 408, 411 }, /* Profile 13. */
-            { 408, 411 }, /* Profile 14. */
-            { 408, 411 }, /* Profile 15. */
-            { 408, 411 }, /* Profile 16. */
-            { 408, 411 }, /* Profile 17. */
-            { 408, 411 }, /* Profile 18. */
-            { 408, 411 }, /* Profile 19. */
-            { 408, 411 }, /* Profile 20. */
-            { 408, 411 }, /* Profile 21. */
+            { 396, 399 }, /* Profile 2. */
+            { 396, 399 }, /* Profile 3. */
+            { 396, 399 }, /* Profile 4. */
+            { 396, 399 }, /* Profile 5. */
+            { 396, 399 }, /* Profile 6. */
+            { 396, 399 }, /* Profile 7. */
+            { 396, 399 }, /* Profile 8. */
+            { 396, 399 }, /* Profile 9. */
+            { 396, 399 }, /* Profile 10. */
+            { 396, 399 }, /* Profile 11. */
+            { 396, 399 }, /* Profile 12. */
+            { 396, 399 }, /* Profile 13. */
+            { 396, 399 }, /* Profile 14. */
+            { 396, 399 }, /* Profile 15. */
+            { 396, 399 }, /* Profile 16. */
+            { 396, 399 }, /* Profile 17. */
+            { 396, 399 }, /* Profile 18. */
+            { 396, 399 }, /* Profile 19. */
+            { 396, 399 }, /* Profile 20. */
+            { 396, 399 }, /* Profile 21. */
         },
         .profile_cnt = 22,
     },
     {
         .name = "IFP_TO_EP_MACSEC_INFO_OR_IFP_OPAQUE_OBJ_15_0",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_IFP_TO_EP_MACSEC_INFO_OR_IFP_OPAQUE_OBJ_15_0,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_IFP_TO_EP_MACSEC_INFO_OR_IFP_OPAQUE_OBJ_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -814,36 +814,36 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_field_
     },
     {
         .name = "IFP_TS_CONTROL_ACTION_3_0",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_IFP_TS_CONTROL_ACTION_3_0,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_IFP_TS_CONTROL_ACTION_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 420, 423 }, /* Profile 2. */
-            { 420, 423 }, /* Profile 3. */
-            { 420, 423 }, /* Profile 4. */
-            { 420, 423 }, /* Profile 5. */
-            { 420, 423 }, /* Profile 6. */
-            { 420, 423 }, /* Profile 7. */
-            { 420, 423 }, /* Profile 8. */
-            { 420, 423 }, /* Profile 9. */
-            { 420, 423 }, /* Profile 10. */
-            { 420, 423 }, /* Profile 11. */
-            { 420, 423 }, /* Profile 12. */
-            { 420, 423 }, /* Profile 13. */
-            { 420, 423 }, /* Profile 14. */
-            { 420, 423 }, /* Profile 15. */
-            { 420, 423 }, /* Profile 16. */
-            { 420, 423 }, /* Profile 17. */
-            { 420, 423 }, /* Profile 18. */
-            { 420, 423 }, /* Profile 19. */
-            { 420, 423 }, /* Profile 20. */
-            { 420, 423 }, /* Profile 21. */
+            { 404, 407 }, /* Profile 2. */
+            { 404, 407 }, /* Profile 3. */
+            { 404, 407 }, /* Profile 4. */
+            { 404, 407 }, /* Profile 5. */
+            { 404, 407 }, /* Profile 6. */
+            { 404, 407 }, /* Profile 7. */
+            { 404, 407 }, /* Profile 8. */
+            { 404, 407 }, /* Profile 9. */
+            { 404, 407 }, /* Profile 10. */
+            { 404, 407 }, /* Profile 11. */
+            { 404, 407 }, /* Profile 12. */
+            { 404, 407 }, /* Profile 13. */
+            { 404, 407 }, /* Profile 14. */
+            { 404, 407 }, /* Profile 15. */
+            { 404, 407 }, /* Profile 16. */
+            { 404, 407 }, /* Profile 17. */
+            { 404, 407 }, /* Profile 18. */
+            { 404, 407 }, /* Profile 19. */
+            { 404, 407 }, /* Profile 20. */
+            { 404, 407 }, /* Profile 21. */
         },
         .profile_cnt = 22,
     },
     {
         .name = "ING_TIMESTAMP_15_0",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_15_0,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -872,7 +872,7 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_field_
     },
     {
         .name = "ING_TIMESTAMP_31_16",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_16,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_16,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -901,7 +901,7 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_field_
     },
     {
         .name = "INGRESS_PP_PORT_7_0",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_INGRESS_PP_PORT_7_0,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_INGRESS_PP_PORT_7_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -930,7 +930,7 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_field_
     },
     {
         .name = "INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -959,65 +959,65 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_field_
     },
     {
         .name = "INGRESS_QOS_REMARK_CTRL_3_0",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 388, 391 }, /* Profile 2. */
-            { 388, 391 }, /* Profile 3. */
-            { 388, 391 }, /* Profile 4. */
-            { 388, 391 }, /* Profile 5. */
-            { 388, 391 }, /* Profile 6. */
-            { 388, 391 }, /* Profile 7. */
-            { 388, 391 }, /* Profile 8. */
-            { 388, 391 }, /* Profile 9. */
-            { 388, 391 }, /* Profile 10. */
-            { 388, 391 }, /* Profile 11. */
-            { 388, 391 }, /* Profile 12. */
-            { 388, 391 }, /* Profile 13. */
-            { 388, 391 }, /* Profile 14. */
-            { 388, 391 }, /* Profile 15. */
-            { 388, 391 }, /* Profile 16. */
-            { 388, 391 }, /* Profile 17. */
-            { 388, 391 }, /* Profile 18. */
-            { 388, 391 }, /* Profile 19. */
-            { 388, 391 }, /* Profile 20. */
-            { 388, 391 }, /* Profile 21. */
+            { 428, 431 }, /* Profile 2. */
+            { 428, 431 }, /* Profile 3. */
+            { 428, 431 }, /* Profile 4. */
+            { 428, 431 }, /* Profile 5. */
+            { 428, 431 }, /* Profile 6. */
+            { 428, 431 }, /* Profile 7. */
+            { 428, 431 }, /* Profile 8. */
+            { 428, 431 }, /* Profile 9. */
+            { 428, 431 }, /* Profile 10. */
+            { 428, 431 }, /* Profile 11. */
+            { 428, 431 }, /* Profile 12. */
+            { 428, 431 }, /* Profile 13. */
+            { 428, 431 }, /* Profile 14. */
+            { 428, 431 }, /* Profile 15. */
+            { 428, 431 }, /* Profile 16. */
+            { 428, 431 }, /* Profile 17. */
+            { 428, 431 }, /* Profile 18. */
+            { 428, 431 }, /* Profile 19. */
+            { 428, 431 }, /* Profile 20. */
+            { 428, 431 }, /* Profile 21. */
         },
         .profile_cnt = 22,
     },
     {
         .name = "INT_PRI_3_0",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_INT_PRI_3_0,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_INT_PRI_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 424, 427 }, /* Profile 2. */
-            { 424, 427 }, /* Profile 3. */
-            { 424, 427 }, /* Profile 4. */
-            { 424, 427 }, /* Profile 5. */
-            { 424, 427 }, /* Profile 6. */
-            { 424, 427 }, /* Profile 7. */
-            { 424, 427 }, /* Profile 8. */
-            { 424, 427 }, /* Profile 9. */
-            { 424, 427 }, /* Profile 10. */
-            { 424, 427 }, /* Profile 11. */
-            { 424, 427 }, /* Profile 12. */
-            { 424, 427 }, /* Profile 13. */
-            { 424, 427 }, /* Profile 14. */
-            { 424, 427 }, /* Profile 15. */
-            { 424, 427 }, /* Profile 16. */
-            { 424, 427 }, /* Profile 17. */
-            { 424, 427 }, /* Profile 18. */
-            { 424, 427 }, /* Profile 19. */
-            { 424, 427 }, /* Profile 20. */
-            { 424, 427 }, /* Profile 21. */
+            { 416, 419 }, /* Profile 2. */
+            { 416, 419 }, /* Profile 3. */
+            { 416, 419 }, /* Profile 4. */
+            { 416, 419 }, /* Profile 5. */
+            { 416, 419 }, /* Profile 6. */
+            { 416, 419 }, /* Profile 7. */
+            { 416, 419 }, /* Profile 8. */
+            { 416, 419 }, /* Profile 9. */
+            { 416, 419 }, /* Profile 10. */
+            { 416, 419 }, /* Profile 11. */
+            { 416, 419 }, /* Profile 12. */
+            { 416, 419 }, /* Profile 13. */
+            { 416, 419 }, /* Profile 14. */
+            { 416, 419 }, /* Profile 15. */
+            { 416, 419 }, /* Profile 16. */
+            { 416, 419 }, /* Profile 17. */
+            { 416, 419 }, /* Profile 18. */
+            { 416, 419 }, /* Profile 19. */
+            { 416, 419 }, /* Profile 20. */
+            { 416, 419 }, /* Profile 21. */
         },
         .profile_cnt = 22,
     },
     {
         .name = "L2_IIF_10_0",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_L2_IIF_10_0,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_L2_IIF_10_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1045,7 +1045,7 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_field_
     },
     {
         .name = "L2_OIF_10_0",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_L2_OIF_10_0,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_L2_OIF_10_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1074,7 +1074,7 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_field_
     },
     {
         .name = "L3_IIF_13_0",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_L3_IIF_13_0,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_L3_IIF_13_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1103,7 +1103,7 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_field_
     },
     {
         .name = "L3_OIF_1_13_0",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1132,7 +1132,7 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_field_
     },
     {
         .name = "NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1161,7 +1161,7 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_field_
     },
     {
         .name = "NHOP_INDEX_1_15_0",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_15_0,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1190,7 +1190,7 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_field_
     },
     {
         .name = "PARSER_VHLEN_0_15_0",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1219,36 +1219,36 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_field_
     },
     {
         .name = "PKT_MISC_CTRL_0_3_0",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 400, 403 }, /* Profile 2. */
-            { 400, 403 }, /* Profile 3. */
-            { 400, 403 }, /* Profile 4. */
-            { 400, 403 }, /* Profile 5. */
-            { 400, 403 }, /* Profile 6. */
-            { 400, 403 }, /* Profile 7. */
-            { 400, 403 }, /* Profile 8. */
-            { 400, 403 }, /* Profile 9. */
-            { 400, 403 }, /* Profile 10. */
-            { 400, 403 }, /* Profile 11. */
-            { 400, 403 }, /* Profile 12. */
-            { 400, 403 }, /* Profile 13. */
-            { 400, 403 }, /* Profile 14. */
-            { 400, 403 }, /* Profile 15. */
-            { 400, 403 }, /* Profile 16. */
-            { 400, 403 }, /* Profile 17. */
-            { 400, 403 }, /* Profile 18. */
-            { 400, 403 }, /* Profile 19. */
-            { 400, 403 }, /* Profile 20. */
-            { 400, 403 }, /* Profile 21. */
+            { 408, 411 }, /* Profile 2. */
+            { 408, 411 }, /* Profile 3. */
+            { 408, 411 }, /* Profile 4. */
+            { 408, 411 }, /* Profile 5. */
+            { 408, 411 }, /* Profile 6. */
+            { 408, 411 }, /* Profile 7. */
+            { 408, 411 }, /* Profile 8. */
+            { 408, 411 }, /* Profile 9. */
+            { 408, 411 }, /* Profile 10. */
+            { 408, 411 }, /* Profile 11. */
+            { 408, 411 }, /* Profile 12. */
+            { 408, 411 }, /* Profile 13. */
+            { 408, 411 }, /* Profile 14. */
+            { 408, 411 }, /* Profile 15. */
+            { 408, 411 }, /* Profile 16. */
+            { 408, 411 }, /* Profile 17. */
+            { 408, 411 }, /* Profile 18. */
+            { 408, 411 }, /* Profile 19. */
+            { 408, 411 }, /* Profile 20. */
+            { 408, 411 }, /* Profile 21. */
         },
         .profile_cnt = 22,
     },
     {
         .name = "SVP_15_0",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_SVP_15_0,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_SVP_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1277,36 +1277,36 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_field_
     },
     {
         .name = "SVP_NETWORK_GROUP_BITMAP_3_0",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 412, 415 }, /* Profile 2. */
-            { 412, 415 }, /* Profile 3. */
-            { 412, 415 }, /* Profile 4. */
-            { 412, 415 }, /* Profile 5. */
-            { 412, 415 }, /* Profile 6. */
-            { 412, 415 }, /* Profile 7. */
-            { 412, 415 }, /* Profile 8. */
-            { 412, 415 }, /* Profile 9. */
-            { 412, 415 }, /* Profile 10. */
-            { 412, 415 }, /* Profile 11. */
-            { 412, 415 }, /* Profile 12. */
-            { 412, 415 }, /* Profile 13. */
-            { 412, 415 }, /* Profile 14. */
-            { 412, 415 }, /* Profile 15. */
-            { 412, 415 }, /* Profile 16. */
-            { 412, 415 }, /* Profile 17. */
-            { 412, 415 }, /* Profile 18. */
-            { 412, 415 }, /* Profile 19. */
-            { 412, 415 }, /* Profile 20. */
-            { 412, 415 }, /* Profile 21. */
+            { 400, 403 }, /* Profile 2. */
+            { 400, 403 }, /* Profile 3. */
+            { 400, 403 }, /* Profile 4. */
+            { 400, 403 }, /* Profile 5. */
+            { 400, 403 }, /* Profile 6. */
+            { 400, 403 }, /* Profile 7. */
+            { 400, 403 }, /* Profile 8. */
+            { 400, 403 }, /* Profile 9. */
+            { 400, 403 }, /* Profile 10. */
+            { 400, 403 }, /* Profile 11. */
+            { 400, 403 }, /* Profile 12. */
+            { 400, 403 }, /* Profile 13. */
+            { 400, 403 }, /* Profile 14. */
+            { 400, 403 }, /* Profile 15. */
+            { 400, 403 }, /* Profile 16. */
+            { 400, 403 }, /* Profile 17. */
+            { 400, 403 }, /* Profile 18. */
+            { 400, 403 }, /* Profile 19. */
+            { 400, 403 }, /* Profile 20. */
+            { 400, 403 }, /* Profile 21. */
         },
         .profile_cnt = 22,
     },
     {
         .name = "SYSTEM_DESTINATION_15_0",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1335,36 +1335,36 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_field_
     },
     {
         .name = "SYSTEM_OPCODE_3_0",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 396, 399 }, /* Profile 2. */
-            { 396, 399 }, /* Profile 3. */
-            { 396, 399 }, /* Profile 4. */
-            { 396, 399 }, /* Profile 5. */
-            { 396, 399 }, /* Profile 6. */
-            { 396, 399 }, /* Profile 7. */
-            { 396, 399 }, /* Profile 8. */
-            { 396, 399 }, /* Profile 9. */
-            { 396, 399 }, /* Profile 10. */
-            { 396, 399 }, /* Profile 11. */
-            { 396, 399 }, /* Profile 12. */
-            { 396, 399 }, /* Profile 13. */
-            { 396, 399 }, /* Profile 14. */
-            { 396, 399 }, /* Profile 15. */
-            { 396, 399 }, /* Profile 16. */
-            { 396, 399 }, /* Profile 17. */
-            { 396, 399 }, /* Profile 18. */
-            { 396, 399 }, /* Profile 19. */
-            { 396, 399 }, /* Profile 20. */
-            { 396, 399 }, /* Profile 21. */
+            { 420, 423 }, /* Profile 2. */
+            { 420, 423 }, /* Profile 3. */
+            { 420, 423 }, /* Profile 4. */
+            { 420, 423 }, /* Profile 5. */
+            { 420, 423 }, /* Profile 6. */
+            { 420, 423 }, /* Profile 7. */
+            { 420, 423 }, /* Profile 8. */
+            { 420, 423 }, /* Profile 9. */
+            { 420, 423 }, /* Profile 10. */
+            { 420, 423 }, /* Profile 11. */
+            { 420, 423 }, /* Profile 12. */
+            { 420, 423 }, /* Profile 13. */
+            { 420, 423 }, /* Profile 14. */
+            { 420, 423 }, /* Profile 15. */
+            { 420, 423 }, /* Profile 16. */
+            { 420, 423 }, /* Profile 17. */
+            { 420, 423 }, /* Profile 18. */
+            { 420, 423 }, /* Profile 19. */
+            { 420, 423 }, /* Profile 20. */
+            { 420, 423 }, /* Profile 21. */
         },
         .profile_cnt = 22,
     },
     {
         .name = "SYSTEM_SOURCE_15_0",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_SYSTEM_SOURCE_15_0,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_SYSTEM_SOURCE_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1393,65 +1393,65 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_field_
     },
     {
         .name = "TIMESTAMP_CTRL_3_0",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_TIMESTAMP_CTRL_3_0,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_TIMESTAMP_CTRL_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 428, 431 }, /* Profile 2. */
-            { 428, 431 }, /* Profile 3. */
-            { 428, 431 }, /* Profile 4. */
-            { 428, 431 }, /* Profile 5. */
-            { 428, 431 }, /* Profile 6. */
-            { 428, 431 }, /* Profile 7. */
-            { 428, 431 }, /* Profile 8. */
-            { 428, 431 }, /* Profile 9. */
-            { 428, 431 }, /* Profile 10. */
-            { 428, 431 }, /* Profile 11. */
-            { 428, 431 }, /* Profile 12. */
-            { 428, 431 }, /* Profile 13. */
-            { 428, 431 }, /* Profile 14. */
-            { 428, 431 }, /* Profile 15. */
-            { 428, 431 }, /* Profile 16. */
-            { 428, 431 }, /* Profile 17. */
-            { 428, 431 }, /* Profile 18. */
-            { 428, 431 }, /* Profile 19. */
-            { 428, 431 }, /* Profile 20. */
-            { 428, 431 }, /* Profile 21. */
+            { 388, 391 }, /* Profile 2. */
+            { 388, 391 }, /* Profile 3. */
+            { 388, 391 }, /* Profile 4. */
+            { 388, 391 }, /* Profile 5. */
+            { 388, 391 }, /* Profile 6. */
+            { 388, 391 }, /* Profile 7. */
+            { 388, 391 }, /* Profile 8. */
+            { 388, 391 }, /* Profile 9. */
+            { 388, 391 }, /* Profile 10. */
+            { 388, 391 }, /* Profile 11. */
+            { 388, 391 }, /* Profile 12. */
+            { 388, 391 }, /* Profile 13. */
+            { 388, 391 }, /* Profile 14. */
+            { 388, 391 }, /* Profile 15. */
+            { 388, 391 }, /* Profile 16. */
+            { 388, 391 }, /* Profile 17. */
+            { 388, 391 }, /* Profile 18. */
+            { 388, 391 }, /* Profile 19. */
+            { 388, 391 }, /* Profile 20. */
+            { 388, 391 }, /* Profile 21. */
         },
         .profile_cnt = 22,
     },
     {
         .name = "TUNNEL_PROCESSING_RESULTS_1_3_0",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 416, 419 }, /* Profile 2. */
-            { 416, 419 }, /* Profile 3. */
-            { 416, 419 }, /* Profile 4. */
-            { 416, 419 }, /* Profile 5. */
-            { 416, 419 }, /* Profile 6. */
-            { 416, 419 }, /* Profile 7. */
-            { 416, 419 }, /* Profile 8. */
-            { 416, 419 }, /* Profile 9. */
-            { 416, 419 }, /* Profile 10. */
-            { 416, 419 }, /* Profile 11. */
-            { 416, 419 }, /* Profile 12. */
-            { 416, 419 }, /* Profile 13. */
-            { 416, 419 }, /* Profile 14. */
-            { 416, 419 }, /* Profile 15. */
-            { 416, 419 }, /* Profile 16. */
-            { 416, 419 }, /* Profile 17. */
-            { 416, 419 }, /* Profile 18. */
-            { 416, 419 }, /* Profile 19. */
-            { 416, 419 }, /* Profile 20. */
-            { 416, 419 }, /* Profile 21. */
+            { 412, 415 }, /* Profile 2. */
+            { 412, 415 }, /* Profile 3. */
+            { 412, 415 }, /* Profile 4. */
+            { 412, 415 }, /* Profile 5. */
+            { 412, 415 }, /* Profile 6. */
+            { 412, 415 }, /* Profile 7. */
+            { 412, 415 }, /* Profile 8. */
+            { 412, 415 }, /* Profile 9. */
+            { 412, 415 }, /* Profile 10. */
+            { 412, 415 }, /* Profile 11. */
+            { 412, 415 }, /* Profile 12. */
+            { 412, 415 }, /* Profile 13. */
+            { 412, 415 }, /* Profile 14. */
+            { 412, 415 }, /* Profile 15. */
+            { 412, 415 }, /* Profile 16. */
+            { 412, 415 }, /* Profile 17. */
+            { 412, 415 }, /* Profile 18. */
+            { 412, 415 }, /* Profile 19. */
+            { 412, 415 }, /* Profile 20. */
+            { 412, 415 }, /* Profile 21. */
         },
         .profile_cnt = 22,
     },
     {
         .name = "VFI_15_0",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_VFI_15_0,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_VFI_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1480,47 +1480,51 @@ static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_field_
     },
     {
         .name = "VLAN_TAG_PRESERVE_CTRL_SVP_MIRROR_ENABLE_3_0",
-        .fid = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_VLAN_TAG_PRESERVE_CTRL_SVP_MIRROR_ENABLE_3_0,
+        .fid = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_VLAN_TAG_PRESERVE_CTRL_SVP_MIRROR_ENABLE_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 404, 407 }, /* Profile 2. */
-            { 404, 407 }, /* Profile 3. */
-            { 404, 407 }, /* Profile 4. */
-            { 404, 407 }, /* Profile 5. */
-            { 404, 407 }, /* Profile 6. */
-            { 404, 407 }, /* Profile 7. */
-            { 404, 407 }, /* Profile 8. */
-            { 404, 407 }, /* Profile 9. */
-            { 404, 407 }, /* Profile 10. */
-            { 404, 407 }, /* Profile 11. */
-            { 404, 407 }, /* Profile 12. */
-            { 404, 407 }, /* Profile 13. */
-            { 404, 407 }, /* Profile 14. */
-            { 404, 407 }, /* Profile 15. */
-            { 404, 407 }, /* Profile 16. */
-            { 404, 407 }, /* Profile 17. */
-            { 404, 407 }, /* Profile 18. */
-            { 404, 407 }, /* Profile 19. */
-            { 404, 407 }, /* Profile 20. */
-            { 404, 407 }, /* Profile 21. */
+            { 392, 395 }, /* Profile 2. */
+            { 392, 395 }, /* Profile 3. */
+            { 392, 395 }, /* Profile 4. */
+            { 392, 395 }, /* Profile 5. */
+            { 392, 395 }, /* Profile 6. */
+            { 392, 395 }, /* Profile 7. */
+            { 392, 395 }, /* Profile 8. */
+            { 392, 395 }, /* Profile 9. */
+            { 392, 395 }, /* Profile 10. */
+            { 392, 395 }, /* Profile 11. */
+            { 392, 395 }, /* Profile 12. */
+            { 392, 395 }, /* Profile 13. */
+            { 392, 395 }, /* Profile 14. */
+            { 392, 395 }, /* Profile 15. */
+            { 392, 395 }, /* Profile 16. */
+            { 392, 395 }, /* Profile 17. */
+            { 392, 395 }, /* Profile 18. */
+            { 392, 395 }, /* Profile 19. */
+            { 392, 395 }, /* Profile 20. */
+            { 392, 395 }, /* Profile 21. */
         },
         .profile_cnt = 22,
     },
-};static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_field_data,
+};
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_rxpmd_flex_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_rxpmd_flex_field_data,
+    .profile_bmp_cnt = 1,
+    .profile_bmp[0] = 0x3ffffc,
+
 };
 
-static shr_enum_map_t bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_reason_names[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT
+static shr_enum_map_t bcm56780_a0_hna_6_5_31_3_0_rxpmd_flex_reason_names[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_reasons_info_t bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_reasons_info = {
-    .num_reasons = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RXPMD_FLEX_REASON_COUNT,
-    .reason_names = bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_reason_names,
-    .reason_encode = bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_reason_encode,
-    .reason_decode = bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_reason_decode,
+static bcmpkt_flex_reasons_info_t bcm56780_a0_hna_6_5_31_3_0_rxpmd_flex_reasons_info = {
+    .num_reasons = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_COUNT,
+    .reason_names = bcm56780_a0_hna_6_5_31_3_0_rxpmd_flex_reason_names,
+    .reason_encode = bcm56780_a0_hna_6_5_31_3_0_rxpmd_flex_reason_encode,
+    .reason_decode = bcm56780_a0_hna_6_5_31_3_0_rxpmd_flex_reason_decode,
 };
 
 
@@ -1663,7 +1667,7 @@ static int32_t bcmpkt_arp_t_target_ip_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_arp_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ARP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_arp_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_FID_COUNT] = {
     bcmpkt_arp_t_hardware_len_get,
     bcmpkt_arp_t_hardware_type_get,
     bcmpkt_arp_t_operation_get,
@@ -1675,7 +1679,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_arp_t_fget[BCM56780_A0_HNA_6_
     bcmpkt_arp_t_target_ip_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_arp_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ARP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_arp_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_FID_COUNT] = {
     bcmpkt_arp_t_hardware_len_set,
     bcmpkt_arp_t_hardware_type_set,
     bcmpkt_arp_t_operation_set,
@@ -1687,13 +1691,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_arp_t_fset[BCM56780_A0_HNA_6_
     bcmpkt_arp_t_target_ip_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_arp_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_arp_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_arp_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ARP_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_arp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_arp_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_arp_t_field_data,
 };
 
 
@@ -1790,7 +1794,7 @@ static int32_t bcmpkt_authen_t_spi_set(uint32_t *data, int profile, uint32_t val
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_authen_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_AUTHEN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_authen_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T_FID_COUNT] = {
     bcmpkt_authen_t_data_get,
     bcmpkt_authen_t_next_header_get,
     bcmpkt_authen_t_payload_len_get,
@@ -1799,7 +1803,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_authen_t_fget[BCM56780_A0_HNA
     bcmpkt_authen_t_spi_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_authen_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_AUTHEN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_authen_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T_FID_COUNT] = {
     bcmpkt_authen_t_data_set,
     bcmpkt_authen_t_next_header_set,
     bcmpkt_authen_t_payload_len_set,
@@ -1808,13 +1812,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_authen_t_fset[BCM56780_A0_HNA
     bcmpkt_authen_t_spi_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_authen_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_AUTHEN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_authen_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_authen_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_AUTHEN_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_authen_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_authen_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_authen_t_field_data,
 };
 
 
@@ -2063,7 +2067,7 @@ static int32_t bcmpkt_bfd_t_version_set(uint32_t *data, int profile, uint32_t va
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_bfd_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_bfd_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_FID_COUNT] = {
     bcmpkt_bfd_t_ap_get,
     bcmpkt_bfd_t_bfd_length_get,
     bcmpkt_bfd_t_cpi_get,
@@ -2082,7 +2086,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_bfd_t_fget[BCM56780_A0_HNA_6_
     bcmpkt_bfd_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_bfd_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_bfd_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_FID_COUNT] = {
     bcmpkt_bfd_t_ap_set,
     bcmpkt_bfd_t_bfd_length_set,
     bcmpkt_bfd_t_cpi_set,
@@ -2101,13 +2105,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_bfd_t_fset[BCM56780_A0_HNA_6_
     bcmpkt_bfd_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_bfd_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_bfd_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_bfd_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_BFD_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_bfd_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_bfd_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_bfd_t_field_data,
 };
 
 
@@ -2141,23 +2145,23 @@ static int32_t bcmpkt_cntag_t_tpid_set(uint32_t *data, int profile, uint32_t val
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_cntag_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CNTAG_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_cntag_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CNTAG_T_FID_COUNT] = {
     bcmpkt_cntag_t_rpid_get,
     bcmpkt_cntag_t_tpid_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_cntag_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CNTAG_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_cntag_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CNTAG_T_FID_COUNT] = {
     bcmpkt_cntag_t_rpid_set,
     bcmpkt_cntag_t_tpid_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_cntag_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CNTAG_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_cntag_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CNTAG_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_cntag_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CNTAG_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_cntag_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_cntag_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CNTAG_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_cntag_t_field_data,
 };
 
 
@@ -2273,7 +2277,7 @@ static int32_t bcmpkt_cpu_composites_0_t_dma_cont6_set(uint32_t *data, int profi
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_cpu_composites_0_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_cpu_composites_0_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
     bcmpkt_cpu_composites_0_t_dma_cont0_get,
     bcmpkt_cpu_composites_0_t_dma_cont1_get,
     bcmpkt_cpu_composites_0_t_dma_cont2_get,
@@ -2283,7 +2287,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_cpu_composites_0_t_fget[BCM56
     bcmpkt_cpu_composites_0_t_dma_cont6_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_cpu_composites_0_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_cpu_composites_0_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
     bcmpkt_cpu_composites_0_t_dma_cont0_set,
     bcmpkt_cpu_composites_0_t_dma_cont1_set,
     bcmpkt_cpu_composites_0_t_dma_cont2_set,
@@ -2293,13 +2297,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_cpu_composites_0_t_fset[BCM56
     bcmpkt_cpu_composites_0_t_dma_cont6_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_cpu_composites_0_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_cpu_composites_0_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_cpu_composites_0_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_cpu_composites_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_cpu_composites_0_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_cpu_composites_0_t_field_data,
 };
 
 
@@ -2479,7 +2483,7 @@ static int32_t bcmpkt_cpu_composites_1_t_dma_cont9_set(uint32_t *data, int profi
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_cpu_composites_1_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_cpu_composites_1_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
     bcmpkt_cpu_composites_1_t_dma_cont10_get,
     bcmpkt_cpu_composites_1_t_dma_cont11_get,
     bcmpkt_cpu_composites_1_t_dma_cont12_get,
@@ -2493,7 +2497,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_cpu_composites_1_t_fget[BCM56
     bcmpkt_cpu_composites_1_t_dma_cont9_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_cpu_composites_1_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_cpu_composites_1_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
     bcmpkt_cpu_composites_1_t_dma_cont10_set,
     bcmpkt_cpu_composites_1_t_dma_cont11_set,
     bcmpkt_cpu_composites_1_t_dma_cont12_set,
@@ -2507,13 +2511,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_cpu_composites_1_t_fset[BCM56
     bcmpkt_cpu_composites_1_t_dma_cont9_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_cpu_composites_1_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_cpu_composites_1_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_cpu_composites_1_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_cpu_composites_1_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_cpu_composites_1_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_cpu_composites_1_t_field_data,
 };
 
 
@@ -2563,25 +2567,25 @@ static int32_t bcmpkt_dest_option_t_option_set(uint32_t *data, int profile, uint
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_dest_option_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_DEST_OPTION_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_dest_option_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_DEST_OPTION_T_FID_COUNT] = {
     bcmpkt_dest_option_t_hdr_ext_len_get,
     bcmpkt_dest_option_t_next_header_get,
     bcmpkt_dest_option_t_option_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_dest_option_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_DEST_OPTION_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_dest_option_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_DEST_OPTION_T_FID_COUNT] = {
     bcmpkt_dest_option_t_hdr_ext_len_set,
     bcmpkt_dest_option_t_next_header_set,
     bcmpkt_dest_option_t_option_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_dest_option_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_DEST_OPTION_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_dest_option_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_DEST_OPTION_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_dest_option_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_DEST_OPTION_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_dest_option_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_dest_option_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_DEST_OPTION_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_dest_option_t_field_data,
 };
 
 
@@ -2767,7 +2771,7 @@ static int32_t bcmpkt_ep_nih_header_t_timestamp_set(uint32_t *data, int profile,
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_ep_nih_header_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_ep_nih_header_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT] = {
     bcmpkt_ep_nih_header_t_header_subtype_get,
     bcmpkt_ep_nih_header_t_header_type_get,
     bcmpkt_ep_nih_header_t_opaque_ctrl_a_get,
@@ -2782,7 +2786,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_ep_nih_header_t_fget[BCM56780
     bcmpkt_ep_nih_header_t_timestamp_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_ep_nih_header_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_ep_nih_header_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT] = {
     bcmpkt_ep_nih_header_t_header_subtype_set,
     bcmpkt_ep_nih_header_t_header_type_set,
     bcmpkt_ep_nih_header_t_opaque_ctrl_a_set,
@@ -2797,13 +2801,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_ep_nih_header_t_fset[BCM56780
     bcmpkt_ep_nih_header_t_timestamp_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_ep_nih_header_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_EP_NIH_HEADER_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_ep_nih_header_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_ep_nih_header_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_ep_nih_header_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_ep_nih_header_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_ep_nih_header_t_field_data,
 };
 
 
@@ -2943,7 +2947,7 @@ static int32_t bcmpkt_erspan3_fixed_hdr_t_vlan_set(uint32_t *data, int profile,
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_erspan3_fixed_hdr_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_erspan3_fixed_hdr_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
     bcmpkt_erspan3_fixed_hdr_t_bso_get,
     bcmpkt_erspan3_fixed_hdr_t_cos_get,
     bcmpkt_erspan3_fixed_hdr_t_gbp_sid_get,
@@ -2955,7 +2959,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_erspan3_fixed_hdr_t_fget[BCM5
     bcmpkt_erspan3_fixed_hdr_t_vlan_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_erspan3_fixed_hdr_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_erspan3_fixed_hdr_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
     bcmpkt_erspan3_fixed_hdr_t_bso_set,
     bcmpkt_erspan3_fixed_hdr_t_cos_set,
     bcmpkt_erspan3_fixed_hdr_t_gbp_sid_set,
@@ -2967,13 +2971,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_erspan3_fixed_hdr_t_fset[BCM5
     bcmpkt_erspan3_fixed_hdr_t_vlan_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_erspan3_fixed_hdr_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_erspan3_fixed_hdr_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_erspan3_fixed_hdr_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_erspan3_fixed_hdr_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_erspan3_fixed_hdr_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_erspan3_fixed_hdr_t_field_data,
 };
 
 
@@ -3038,27 +3042,27 @@ static int32_t bcmpkt_erspan3_subhdr_5_t_timestamp_set(uint32_t *data, int profi
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_erspan3_subhdr_5_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_erspan3_subhdr_5_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
     bcmpkt_erspan3_subhdr_5_t_platform_id_get,
     bcmpkt_erspan3_subhdr_5_t_port_id_get,
     bcmpkt_erspan3_subhdr_5_t_switch_id_get,
     bcmpkt_erspan3_subhdr_5_t_timestamp_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_erspan3_subhdr_5_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_erspan3_subhdr_5_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
     bcmpkt_erspan3_subhdr_5_t_platform_id_set,
     bcmpkt_erspan3_subhdr_5_t_port_id_set,
     bcmpkt_erspan3_subhdr_5_t_switch_id_set,
     bcmpkt_erspan3_subhdr_5_t_timestamp_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_erspan3_subhdr_5_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_erspan3_subhdr_5_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_erspan3_subhdr_5_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_erspan3_subhdr_5_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_erspan3_subhdr_5_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_erspan3_subhdr_5_t_field_data,
 };
 
 
@@ -3139,7 +3143,7 @@ static int32_t bcmpkt_esp_t_spi_set(uint32_t *data, int profile, uint32_t val) {
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_esp_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ESP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_esp_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ESP_T_FID_COUNT] = {
     bcmpkt_esp_t_next_header_get,
     bcmpkt_esp_t_pad_get,
     bcmpkt_esp_t_pad_len_get,
@@ -3147,7 +3151,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_esp_t_fget[BCM56780_A0_HNA_6_
     bcmpkt_esp_t_spi_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_esp_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ESP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_esp_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ESP_T_FID_COUNT] = {
     bcmpkt_esp_t_next_header_set,
     bcmpkt_esp_t_pad_set,
     bcmpkt_esp_t_pad_len_set,
@@ -3155,13 +3159,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_esp_t_fset[BCM56780_A0_HNA_6_
     bcmpkt_esp_t_spi_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_esp_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ESP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_esp_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ESP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_esp_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ESP_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_esp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_esp_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ESP_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_esp_t_field_data,
 };
 
 
@@ -3196,23 +3200,23 @@ static int32_t bcmpkt_etag_t_tpid_set(uint32_t *data, int profile, uint32_t val)
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_etag_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ETAG_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_etag_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ETAG_T_FID_COUNT] = {
     bcmpkt_etag_t_tag_get,
     bcmpkt_etag_t_tpid_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_etag_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ETAG_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_etag_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ETAG_T_FID_COUNT] = {
     bcmpkt_etag_t_tag_set,
     bcmpkt_etag_t_tpid_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_etag_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ETAG_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_etag_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ETAG_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_etag_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ETAG_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_etag_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_etag_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ETAG_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_etag_t_field_data,
 };
 
 
@@ -3231,21 +3235,21 @@ static int32_t bcmpkt_ethertype_t_type_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_ethertype_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_ethertype_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
     bcmpkt_ethertype_t_type_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_ethertype_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_ethertype_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
     bcmpkt_ethertype_t_type_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_ethertype_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_ethertype_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_ethertype_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ETHERTYPE_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_ethertype_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_ethertype_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_ethertype_t_field_data,
 };
 
 
@@ -3310,27 +3314,27 @@ static int32_t bcmpkt_frag_t_reserved_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_frag_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_FRAG_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_frag_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_FRAG_T_FID_COUNT] = {
     bcmpkt_frag_t_frag_info_get,
     bcmpkt_frag_t_id_get,
     bcmpkt_frag_t_next_header_get,
     bcmpkt_frag_t_reserved_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_frag_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_FRAG_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_frag_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_FRAG_T_FID_COUNT] = {
     bcmpkt_frag_t_frag_info_set,
     bcmpkt_frag_t_id_set,
     bcmpkt_frag_t_next_header_set,
     bcmpkt_frag_t_reserved_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_frag_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_FRAG_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_frag_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_FRAG_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_frag_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_FRAG_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_frag_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_frag_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_FRAG_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_frag_t_field_data,
 };
 
 
@@ -3559,7 +3563,7 @@ static int32_t bcmpkt_generic_loopback_t_svp_set(uint32_t *data, int profile, ui
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_generic_loopback_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_generic_loopback_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
     bcmpkt_generic_loopback_t_destination_obj_get,
     bcmpkt_generic_loopback_t_destination_type_get,
     bcmpkt_generic_loopback_t_entropy_obj_get,
@@ -3577,7 +3581,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_generic_loopback_t_fget[BCM56
     bcmpkt_generic_loopback_t_svp_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_generic_loopback_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_generic_loopback_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
     bcmpkt_generic_loopback_t_destination_obj_set,
     bcmpkt_generic_loopback_t_destination_type_set,
     bcmpkt_generic_loopback_t_entropy_obj_set,
@@ -3595,13 +3599,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_generic_loopback_t_fset[BCM56
     bcmpkt_generic_loopback_t_svp_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_generic_loopback_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_generic_loopback_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_generic_loopback_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_generic_loopback_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_generic_loopback_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_generic_loopback_t_field_data,
 };
 
 
@@ -3680,7 +3684,7 @@ static int32_t bcmpkt_gpe_t_vni_set(uint32_t *data, int profile, uint32_t val) {
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_gpe_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GPE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_gpe_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GPE_T_FID_COUNT] = {
     bcmpkt_gpe_t_flags_get,
     bcmpkt_gpe_t_next_protocol_get,
     bcmpkt_gpe_t_reserved0_get,
@@ -3688,7 +3692,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_gpe_t_fget[BCM56780_A0_HNA_6_
     bcmpkt_gpe_t_vni_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_gpe_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GPE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_gpe_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GPE_T_FID_COUNT] = {
     bcmpkt_gpe_t_flags_set,
     bcmpkt_gpe_t_next_protocol_set,
     bcmpkt_gpe_t_reserved0_set,
@@ -3696,13 +3700,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_gpe_t_fset[BCM56780_A0_HNA_6_
     bcmpkt_gpe_t_vni_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_gpe_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GPE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_gpe_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GPE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_gpe_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GPE_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_gpe_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_gpe_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GPE_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_gpe_t_field_data,
 };
 
 
@@ -3736,23 +3740,23 @@ static int32_t bcmpkt_gre_chksum_t_offset_set(uint32_t *data, int profile, uint3
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_gre_chksum_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_gre_chksum_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT] = {
     bcmpkt_gre_chksum_t_checksum_get,
     bcmpkt_gre_chksum_t_offset_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_gre_chksum_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_gre_chksum_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT] = {
     bcmpkt_gre_chksum_t_checksum_set,
     bcmpkt_gre_chksum_t_offset_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_gre_chksum_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_CHKSUM_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_gre_chksum_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_CHKSUM_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_gre_chksum_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_gre_chksum_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_gre_chksum_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_gre_chksum_t_field_data,
 };
 
 
@@ -3772,21 +3776,21 @@ static int32_t bcmpkt_gre_key_t_key_set(uint32_t *data, int profile, uint32_t va
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_gre_key_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_KEY_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_gre_key_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_KEY_T_FID_COUNT] = {
     bcmpkt_gre_key_t_key_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_gre_key_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_KEY_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_gre_key_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_KEY_T_FID_COUNT] = {
     bcmpkt_gre_key_t_key_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_gre_key_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_KEY_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_gre_key_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_KEY_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_gre_key_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_KEY_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_gre_key_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_gre_key_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_KEY_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_gre_key_t_field_data,
 };
 
 
@@ -3806,21 +3810,21 @@ static int32_t bcmpkt_gre_rout_t_routing_set(uint32_t *data, int profile, uint32
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_gre_rout_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_ROUT_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_gre_rout_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_ROUT_T_FID_COUNT] = {
     bcmpkt_gre_rout_t_routing_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_gre_rout_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_ROUT_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_gre_rout_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_ROUT_T_FID_COUNT] = {
     bcmpkt_gre_rout_t_routing_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_gre_rout_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_ROUT_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_gre_rout_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_ROUT_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_gre_rout_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_ROUT_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_gre_rout_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_gre_rout_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_ROUT_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_gre_rout_t_field_data,
 };
 
 
@@ -3840,21 +3844,21 @@ static int32_t bcmpkt_gre_seq_t_sequence_set(uint32_t *data, int profile, uint32
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_gre_seq_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_SEQ_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_gre_seq_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_SEQ_T_FID_COUNT] = {
     bcmpkt_gre_seq_t_sequence_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_gre_seq_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_SEQ_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_gre_seq_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_SEQ_T_FID_COUNT] = {
     bcmpkt_gre_seq_t_sequence_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_gre_seq_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_SEQ_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_gre_seq_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_SEQ_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_gre_seq_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_SEQ_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_gre_seq_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_gre_seq_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_SEQ_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_gre_seq_t_field_data,
 };
 
 
@@ -3918,27 +3922,27 @@ static int32_t bcmpkt_gre_t_version_set(uint32_t *data, int profile, uint32_t va
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_gre_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_gre_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_T_FID_COUNT] = {
     bcmpkt_gre_t_c_r_k_s_get,
     bcmpkt_gre_t_protocol_get,
     bcmpkt_gre_t_reserved_get,
     bcmpkt_gre_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_gre_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_gre_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_T_FID_COUNT] = {
     bcmpkt_gre_t_c_r_k_s_set,
     bcmpkt_gre_t_protocol_set,
     bcmpkt_gre_t_reserved_set,
     bcmpkt_gre_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_gre_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_gre_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_gre_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_GRE_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_gre_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_gre_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_GRE_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_gre_t_field_data,
 };
 
 
@@ -3988,25 +3992,25 @@ static int32_t bcmpkt_hop_by_hop_t_option_set(uint32_t *data, int profile, uint3
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_hop_by_hop_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_hop_by_hop_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT] = {
     bcmpkt_hop_by_hop_t_hdr_ext_len_get,
     bcmpkt_hop_by_hop_t_next_header_get,
     bcmpkt_hop_by_hop_t_option_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_hop_by_hop_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_hop_by_hop_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT] = {
     bcmpkt_hop_by_hop_t_hdr_ext_len_set,
     bcmpkt_hop_by_hop_t_next_header_set,
     bcmpkt_hop_by_hop_t_option_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_hop_by_hop_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_HOP_BY_HOP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_hop_by_hop_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_HOP_BY_HOP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_hop_by_hop_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_hop_by_hop_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_hop_by_hop_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_hop_by_hop_t_field_data,
 };
 
 
@@ -4055,25 +4059,25 @@ static int32_t bcmpkt_icmp_t_icmp_type_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_icmp_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ICMP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_icmp_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ICMP_T_FID_COUNT] = {
     bcmpkt_icmp_t_checksum_get,
     bcmpkt_icmp_t_code_get,
     bcmpkt_icmp_t_icmp_type_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_icmp_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ICMP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_icmp_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ICMP_T_FID_COUNT] = {
     bcmpkt_icmp_t_checksum_set,
     bcmpkt_icmp_t_code_set,
     bcmpkt_icmp_t_icmp_type_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_icmp_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_icmp_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_icmp_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ICMP_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_icmp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_icmp_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ICMP_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_icmp_t_field_data,
 };
 
 
@@ -4107,23 +4111,23 @@ static int32_t bcmpkt_ifa_flex_md_0_a_t_lns_device_id_set(uint32_t *data, int pr
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_0_a_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_0_a_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_0_a_t_fwd_hdr_ttl_get,
     bcmpkt_ifa_flex_md_0_a_t_lns_device_id_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_0_a_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_0_a_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_0_a_t_fwd_hdr_ttl_set,
     bcmpkt_ifa_flex_md_0_a_t_lns_device_id_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_0_a_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_0_A_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_0_a_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_A_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_0_a_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_0_a_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_0_a_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_0_a_t_field_data,
 };
 
 
@@ -4187,27 +4191,27 @@ static int32_t bcmpkt_ifa_flex_md_0_b_t_rx_timestamp_sec_set(uint32_t *data, int
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_0_b_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_0_b_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_0_b_t_cn_get,
     bcmpkt_ifa_flex_md_0_b_t_port_speed_get,
     bcmpkt_ifa_flex_md_0_b_t_queue_id_get,
     bcmpkt_ifa_flex_md_0_b_t_rx_timestamp_sec_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_0_b_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_0_b_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_0_b_t_cn_set,
     bcmpkt_ifa_flex_md_0_b_t_port_speed_set,
     bcmpkt_ifa_flex_md_0_b_t_queue_id_set,
     bcmpkt_ifa_flex_md_0_b_t_rx_timestamp_sec_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_0_b_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_0_B_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_0_b_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_0_b_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_0_b_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_0_b_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_0_b_t_field_data,
 };
 
 
@@ -4257,25 +4261,25 @@ static int32_t bcmpkt_ifa_flex_md_1_t_rx_timestamp_nanosec_set(uint32_t *data, i
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_1_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_1_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_1_t_egress_port_id_get,
     bcmpkt_ifa_flex_md_1_t_ingress_port_id_get,
     bcmpkt_ifa_flex_md_1_t_rx_timestamp_nanosec_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_1_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_1_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_1_t_egress_port_id_set,
     bcmpkt_ifa_flex_md_1_t_ingress_port_id_set,
     bcmpkt_ifa_flex_md_1_t_rx_timestamp_nanosec_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_1_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_1_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_1_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_1_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_1_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_1_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_1_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_1_t_field_data,
 };
 
 
@@ -4311,23 +4315,23 @@ static int32_t bcmpkt_ifa_flex_md_2_t_tx_queue_byte_count_set(uint32_t *data, in
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_2_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_2_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_2_t_residence_time_nanosec_get,
     bcmpkt_ifa_flex_md_2_t_tx_queue_byte_count_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_2_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_2_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_2_t_residence_time_nanosec_set,
     bcmpkt_ifa_flex_md_2_t_tx_queue_byte_count_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_2_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_2_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_2_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_2_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_2_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_2_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_2_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_2_t_field_data,
 };
 
 
@@ -4363,23 +4367,23 @@ static int32_t bcmpkt_ifa_flex_md_3_t_mmu_stat_1_set(uint32_t *data, int profile
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_3_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_3_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_3_t_mmu_stat_0_get,
     bcmpkt_ifa_flex_md_3_t_mmu_stat_1_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_3_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_3_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_3_t_mmu_stat_0_set,
     bcmpkt_ifa_flex_md_3_t_mmu_stat_1_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_3_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_3_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_3_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_3_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_3_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_3_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_3_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_3_t_field_data,
 };
 
 
@@ -4458,7 +4462,7 @@ static int32_t bcmpkt_ifa_header_t_ver_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_ifa_header_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_HEADER_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_ifa_header_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_HEADER_T_FID_COUNT] = {
     bcmpkt_ifa_header_t_flags_get,
     bcmpkt_ifa_header_t_gns_get,
     bcmpkt_ifa_header_t_max_length_get,
@@ -4466,7 +4470,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_ifa_header_t_fget[BCM56780_A0
     bcmpkt_ifa_header_t_ver_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_ifa_header_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_HEADER_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_ifa_header_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_HEADER_T_FID_COUNT] = {
     bcmpkt_ifa_header_t_flags_set,
     bcmpkt_ifa_header_t_gns_set,
     bcmpkt_ifa_header_t_max_length_set,
@@ -4474,13 +4478,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_ifa_header_t_fset[BCM56780_A0
     bcmpkt_ifa_header_t_ver_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_ifa_header_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_HEADER_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_ifa_header_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_HEADER_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_ifa_header_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_HEADER_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_ifa_header_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_ifa_header_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_HEADER_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_ifa_header_t_field_data,
 };
 
 
@@ -4529,25 +4533,25 @@ static int32_t bcmpkt_ifa_md_base_t_request_vector_set(uint32_t *data, int profi
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_ifa_md_base_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_MD_BASE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_ifa_md_base_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_MD_BASE_T_FID_COUNT] = {
     bcmpkt_ifa_md_base_t_action_vector_get,
     bcmpkt_ifa_md_base_t_hop_limit_current_length_get,
     bcmpkt_ifa_md_base_t_request_vector_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_ifa_md_base_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_MD_BASE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_ifa_md_base_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_MD_BASE_T_FID_COUNT] = {
     bcmpkt_ifa_md_base_t_action_vector_set,
     bcmpkt_ifa_md_base_t_hop_limit_current_length_set,
     bcmpkt_ifa_md_base_t_request_vector_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_ifa_md_base_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_MD_BASE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_ifa_md_base_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_MD_BASE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_ifa_md_base_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_MD_BASE_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_ifa_md_base_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_ifa_md_base_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_MD_BASE_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_ifa_md_base_t_field_data,
 };
 
 
@@ -4612,27 +4616,27 @@ static int32_t bcmpkt_ifa_metadata_t_request_vector_set(uint32_t *data, int prof
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_ifa_metadata_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_METADATA_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_ifa_metadata_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_METADATA_T_FID_COUNT] = {
     bcmpkt_ifa_metadata_t_action_vector_get,
     bcmpkt_ifa_metadata_t_hop_limit_current_length_get,
     bcmpkt_ifa_metadata_t_metadata_get,
     bcmpkt_ifa_metadata_t_request_vector_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_ifa_metadata_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_METADATA_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_ifa_metadata_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_METADATA_T_FID_COUNT] = {
     bcmpkt_ifa_metadata_t_action_vector_set,
     bcmpkt_ifa_metadata_t_hop_limit_current_length_set,
     bcmpkt_ifa_metadata_t_metadata_set,
     bcmpkt_ifa_metadata_t_request_vector_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_ifa_metadata_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_METADATA_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_ifa_metadata_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_METADATA_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_ifa_metadata_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IFA_METADATA_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_ifa_metadata_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_ifa_metadata_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IFA_METADATA_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_ifa_metadata_t_field_data,
 };
 
 
@@ -4697,27 +4701,27 @@ static int32_t bcmpkt_igmp_t_max_resp_time_set(uint32_t *data, int profile, uint
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_igmp_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IGMP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_igmp_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IGMP_T_FID_COUNT] = {
     bcmpkt_igmp_t_checksum_get,
     bcmpkt_igmp_t_group_address_get,
     bcmpkt_igmp_t_igmp_type_get,
     bcmpkt_igmp_t_max_resp_time_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_igmp_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IGMP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_igmp_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IGMP_T_FID_COUNT] = {
     bcmpkt_igmp_t_checksum_set,
     bcmpkt_igmp_t_group_address_set,
     bcmpkt_igmp_t_igmp_type_set,
     bcmpkt_igmp_t_max_resp_time_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_igmp_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IGMP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_igmp_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IGMP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_igmp_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IGMP_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_igmp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_igmp_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IGMP_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_igmp_t_field_data,
 };
 
 
@@ -4799,7 +4803,7 @@ static int32_t bcmpkt_ipfix_t_version_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_ipfix_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPFIX_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_ipfix_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPFIX_T_FID_COUNT] = {
     bcmpkt_ipfix_t_export_time_get,
     bcmpkt_ipfix_t_length_get,
     bcmpkt_ipfix_t_obs_domain_id_get,
@@ -4807,7 +4811,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_ipfix_t_fget[BCM56780_A0_HNA_
     bcmpkt_ipfix_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_ipfix_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPFIX_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_ipfix_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPFIX_T_FID_COUNT] = {
     bcmpkt_ipfix_t_export_time_set,
     bcmpkt_ipfix_t_length_set,
     bcmpkt_ipfix_t_obs_domain_id_set,
@@ -4815,13 +4819,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_ipfix_t_fset[BCM56780_A0_HNA_
     bcmpkt_ipfix_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_ipfix_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_ipfix_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_ipfix_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPFIX_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_ipfix_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_ipfix_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPFIX_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_ipfix_t_field_data,
 };
 
 
@@ -4993,7 +4997,7 @@ static int32_t bcmpkt_ipv4_t_version_hdr_len_set(uint32_t *data, int profile, ui
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_ipv4_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV4_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_ipv4_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_FID_COUNT] = {
     bcmpkt_ipv4_t_da_get,
     bcmpkt_ipv4_t_flags_frag_offset_get,
     bcmpkt_ipv4_t_hdr_checksum_get,
@@ -5007,7 +5011,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_ipv4_t_fget[BCM56780_A0_HNA_6
     bcmpkt_ipv4_t_version_hdr_len_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_ipv4_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV4_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_ipv4_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_FID_COUNT] = {
     bcmpkt_ipv4_t_da_set,
     bcmpkt_ipv4_t_flags_frag_offset_set,
     bcmpkt_ipv4_t_hdr_checksum_set,
@@ -5021,13 +5025,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_ipv4_t_fset[BCM56780_A0_HNA_6
     bcmpkt_ipv4_t_version_hdr_len_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_ipv4_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_ipv4_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_ipv4_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV4_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_ipv4_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_ipv4_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_ipv4_t_field_data,
 };
 
 
@@ -5153,7 +5157,7 @@ static int32_t bcmpkt_ipv6_t_version_set(uint32_t *data, int profile, uint32_t v
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_ipv6_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV6_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_ipv6_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_FID_COUNT] = {
     bcmpkt_ipv6_t_da_get,
     bcmpkt_ipv6_t_flow_label_get,
     bcmpkt_ipv6_t_hop_limit_get,
@@ -5164,7 +5168,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_ipv6_t_fget[BCM56780_A0_HNA_6
     bcmpkt_ipv6_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_ipv6_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV6_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_ipv6_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_FID_COUNT] = {
     bcmpkt_ipv6_t_da_set,
     bcmpkt_ipv6_t_flow_label_set,
     bcmpkt_ipv6_t_hop_limit_set,
@@ -5175,13 +5179,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_ipv6_t_fset[BCM56780_A0_HNA_6
     bcmpkt_ipv6_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_ipv6_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_ipv6_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_ipv6_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_IPV6_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_ipv6_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_ipv6_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_ipv6_t_field_data,
 };
 
 
@@ -5217,23 +5221,23 @@ static int32_t bcmpkt_l2_t_macsa_set(uint32_t *data, int profile, uint32_t val)
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_l2_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_L2_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_l2_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_L2_T_FID_COUNT] = {
     bcmpkt_l2_t_macda_get,
     bcmpkt_l2_t_macsa_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_l2_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_L2_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_l2_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_L2_T_FID_COUNT] = {
     bcmpkt_l2_t_macda_set,
     bcmpkt_l2_t_macsa_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_l2_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_L2_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_l2_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_L2_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_l2_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_L2_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_l2_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_l2_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_L2_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_l2_t_field_data,
 };
 
 
@@ -5253,21 +5257,21 @@ static int32_t bcmpkt_mirror_erspan_sn_t_seq_num_set(uint32_t *data, int profile
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_mirror_erspan_sn_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_mirror_erspan_sn_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
     bcmpkt_mirror_erspan_sn_t_seq_num_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_mirror_erspan_sn_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_mirror_erspan_sn_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
     bcmpkt_mirror_erspan_sn_t_seq_num_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_mirror_erspan_sn_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_mirror_erspan_sn_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_mirror_erspan_sn_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_mirror_erspan_sn_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_mirror_erspan_sn_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_mirror_erspan_sn_t_field_data,
 };
 
 
@@ -5287,21 +5291,21 @@ static int32_t bcmpkt_mirror_transport_t_data_set(uint32_t *data, int profile, u
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_mirror_transport_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_mirror_transport_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
     bcmpkt_mirror_transport_t_data_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_mirror_transport_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_mirror_transport_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
     bcmpkt_mirror_transport_t_data_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_mirror_transport_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_mirror_transport_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_mirror_transport_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_mirror_transport_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_mirror_transport_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_mirror_transport_t_field_data,
 };
 
 
@@ -5365,27 +5369,27 @@ static int32_t bcmpkt_mpls_ach_t_version_set(uint32_t *data, int profile, uint32
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_mpls_ach_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_ACH_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_mpls_ach_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_ACH_T_FID_COUNT] = {
     bcmpkt_mpls_ach_t_channel_type_get,
     bcmpkt_mpls_ach_t_cw_type_get,
     bcmpkt_mpls_ach_t_reserved_get,
     bcmpkt_mpls_ach_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_mpls_ach_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_ACH_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_mpls_ach_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_ACH_T_FID_COUNT] = {
     bcmpkt_mpls_ach_t_channel_type_set,
     bcmpkt_mpls_ach_t_cw_type_set,
     bcmpkt_mpls_ach_t_reserved_set,
     bcmpkt_mpls_ach_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_mpls_ach_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_ACH_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_mpls_ach_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_ACH_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_mpls_ach_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_ACH_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_mpls_ach_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_mpls_ach_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_ACH_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_mpls_ach_t_field_data,
 };
 
 
@@ -5405,21 +5409,21 @@ static int32_t bcmpkt_mpls_bv_t_value_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_mpls_bv_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_BV_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_mpls_bv_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_BV_T_FID_COUNT] = {
     bcmpkt_mpls_bv_t_value_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_mpls_bv_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_BV_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_mpls_bv_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_BV_T_FID_COUNT] = {
     bcmpkt_mpls_bv_t_value_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_mpls_bv_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_BV_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_mpls_bv_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_BV_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_mpls_bv_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_BV_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_mpls_bv_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_mpls_bv_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_BV_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_mpls_bv_t_field_data,
 };
 
 
@@ -5468,25 +5472,25 @@ static int32_t bcmpkt_mpls_cw_t_seq_number_set(uint32_t *data, int profile, uint
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_mpls_cw_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_CW_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_mpls_cw_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_CW_T_FID_COUNT] = {
     bcmpkt_mpls_cw_t_cw_type_get,
     bcmpkt_mpls_cw_t_reserved_get,
     bcmpkt_mpls_cw_t_seq_number_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_mpls_cw_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_CW_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_mpls_cw_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_CW_T_FID_COUNT] = {
     bcmpkt_mpls_cw_t_cw_type_set,
     bcmpkt_mpls_cw_t_reserved_set,
     bcmpkt_mpls_cw_t_seq_number_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_mpls_cw_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_CW_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_mpls_cw_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_CW_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_mpls_cw_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_CW_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_mpls_cw_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_mpls_cw_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_CW_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_mpls_cw_t_field_data,
 };
 
 
@@ -5550,27 +5554,27 @@ static int32_t bcmpkt_mpls_t_ttl_set(uint32_t *data, int profile, uint32_t val)
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_mpls_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_mpls_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_T_FID_COUNT] = {
     bcmpkt_mpls_t_bos_get,
     bcmpkt_mpls_t_exp_get,
     bcmpkt_mpls_t_label_get,
     bcmpkt_mpls_t_ttl_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_mpls_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_mpls_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_T_FID_COUNT] = {
     bcmpkt_mpls_t_bos_set,
     bcmpkt_mpls_t_exp_set,
     bcmpkt_mpls_t_label_set,
     bcmpkt_mpls_t_ttl_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_mpls_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_mpls_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_mpls_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_MPLS_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_mpls_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_mpls_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_mpls_t_field_data,
 };
 
 
@@ -5787,7 +5791,7 @@ static int32_t bcmpkt_p_1588_t_version_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_p_1588_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_P_1588_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_p_1588_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_FID_COUNT] = {
     bcmpkt_p_1588_t_cntrl_get,
     bcmpkt_p_1588_t_correction_get,
     bcmpkt_p_1588_t_domain_nb_get,
@@ -5804,7 +5808,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_p_1588_t_fget[BCM56780_A0_HNA
     bcmpkt_p_1588_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_p_1588_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_P_1588_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_p_1588_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_FID_COUNT] = {
     bcmpkt_p_1588_t_cntrl_set,
     bcmpkt_p_1588_t_correction_set,
     bcmpkt_p_1588_t_domain_nb_set,
@@ -5821,13 +5825,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_p_1588_t_fset[BCM56780_A0_HNA
     bcmpkt_p_1588_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_p_1588_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_P_1588_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_p_1588_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_p_1588_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_P_1588_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_p_1588_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_p_1588_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_p_1588_t_field_data,
 };
 
 
@@ -5877,25 +5881,25 @@ static int32_t bcmpkt_prog_ext_hdr_t_option_set(uint32_t *data, int profile, uin
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_prog_ext_hdr_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_prog_ext_hdr_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT] = {
     bcmpkt_prog_ext_hdr_t_hdr_ext_len_get,
     bcmpkt_prog_ext_hdr_t_next_header_get,
     bcmpkt_prog_ext_hdr_t_option_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_prog_ext_hdr_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_prog_ext_hdr_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT] = {
     bcmpkt_prog_ext_hdr_t_hdr_ext_len_set,
     bcmpkt_prog_ext_hdr_t_next_header_set,
     bcmpkt_prog_ext_hdr_t_option_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_prog_ext_hdr_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PROG_EXT_HDR_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_prog_ext_hdr_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PROG_EXT_HDR_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_prog_ext_hdr_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_prog_ext_hdr_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_prog_ext_hdr_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_prog_ext_hdr_t_field_data,
 };
 
 
@@ -5991,7 +5995,7 @@ static int32_t bcmpkt_psamp_0_t_template_id_set(uint32_t *data, int profile, uin
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_psamp_0_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_psamp_0_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T_FID_COUNT] = {
     bcmpkt_psamp_0_t_flowset_get,
     bcmpkt_psamp_0_t_length_get,
     bcmpkt_psamp_0_t_next_hop_index_get,
@@ -6000,7 +6004,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_psamp_0_t_fget[BCM56780_A0_HN
     bcmpkt_psamp_0_t_template_id_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_psamp_0_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_psamp_0_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T_FID_COUNT] = {
     bcmpkt_psamp_0_t_flowset_set,
     bcmpkt_psamp_0_t_length_set,
     bcmpkt_psamp_0_t_next_hop_index_set,
@@ -6009,13 +6013,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_psamp_0_t_fset[BCM56780_A0_HN
     bcmpkt_psamp_0_t_template_id_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_psamp_0_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_psamp_0_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_psamp_0_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_0_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_psamp_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_psamp_0_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_psamp_0_t_field_data,
 };
 
 
@@ -6124,7 +6128,7 @@ static int32_t bcmpkt_psamp_1_t_variable_flag_set(uint32_t *data, int profile, u
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_psamp_1_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_1_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_psamp_1_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_FID_COUNT] = {
     bcmpkt_psamp_1_t_dlb_id_get,
     bcmpkt_psamp_1_t_egress_port_get,
     bcmpkt_psamp_1_t_epoch_get,
@@ -6134,7 +6138,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_psamp_1_t_fget[BCM56780_A0_HN
     bcmpkt_psamp_1_t_variable_flag_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_psamp_1_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_1_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_psamp_1_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_FID_COUNT] = {
     bcmpkt_psamp_1_t_dlb_id_set,
     bcmpkt_psamp_1_t_egress_port_set,
     bcmpkt_psamp_1_t_epoch_set,
@@ -6144,13 +6148,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_psamp_1_t_fset[BCM56780_A0_HN
     bcmpkt_psamp_1_t_variable_flag_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_psamp_1_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_1_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_psamp_1_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_psamp_1_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_1_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_psamp_1_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_psamp_1_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_psamp_1_t_field_data,
 };
 
 
@@ -6262,7 +6266,7 @@ static int32_t bcmpkt_psamp_mirror_on_drop_0_t_template_id_set(uint32_t *data, i
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_psamp_mirror_on_drop_0_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_psamp_mirror_on_drop_0_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_0_t_egress_mod_port_get,
     bcmpkt_psamp_mirror_on_drop_0_t_ingress_port_get,
     bcmpkt_psamp_mirror_on_drop_0_t_length_get,
@@ -6272,7 +6276,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_psamp_mirror_on_drop_0_t_fget
     bcmpkt_psamp_mirror_on_drop_0_t_template_id_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_psamp_mirror_on_drop_0_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_psamp_mirror_on_drop_0_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_0_t_egress_mod_port_set,
     bcmpkt_psamp_mirror_on_drop_0_t_ingress_port_set,
     bcmpkt_psamp_mirror_on_drop_0_t_length_set,
@@ -6282,13 +6286,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_psamp_mirror_on_drop_0_t_fset
     bcmpkt_psamp_mirror_on_drop_0_t_template_id_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_psamp_mirror_on_drop_0_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_psamp_mirror_on_drop_0_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_psamp_mirror_on_drop_0_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_psamp_mirror_on_drop_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_psamp_mirror_on_drop_0_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_psamp_mirror_on_drop_0_t_field_data,
 };
 
 
@@ -6397,7 +6401,7 @@ static int32_t bcmpkt_psamp_mirror_on_drop_3_t_var_len_indicator_set(uint32_t *d
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_psamp_mirror_on_drop_3_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_psamp_mirror_on_drop_3_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_3_t_drop_reason_get,
     bcmpkt_psamp_mirror_on_drop_3_t_reserved_0_get,
     bcmpkt_psamp_mirror_on_drop_3_t_sampled_length_get,
@@ -6407,7 +6411,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_psamp_mirror_on_drop_3_t_fget
     bcmpkt_psamp_mirror_on_drop_3_t_var_len_indicator_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_psamp_mirror_on_drop_3_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_psamp_mirror_on_drop_3_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_3_t_drop_reason_set,
     bcmpkt_psamp_mirror_on_drop_3_t_reserved_0_set,
     bcmpkt_psamp_mirror_on_drop_3_t_sampled_length_set,
@@ -6417,13 +6421,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_psamp_mirror_on_drop_3_t_fset
     bcmpkt_psamp_mirror_on_drop_3_t_var_len_indicator_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_psamp_mirror_on_drop_3_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_psamp_mirror_on_drop_3_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_psamp_mirror_on_drop_3_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_psamp_mirror_on_drop_3_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_psamp_mirror_on_drop_3_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_psamp_mirror_on_drop_3_t_field_data,
 };
 
 
@@ -6566,7 +6570,7 @@ static int32_t bcmpkt_rarp_t_target_ip_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_rarp_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RARP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_rarp_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_FID_COUNT] = {
     bcmpkt_rarp_t_hardware_len_get,
     bcmpkt_rarp_t_hardware_type_get,
     bcmpkt_rarp_t_operation_get,
@@ -6578,7 +6582,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_rarp_t_fget[BCM56780_A0_HNA_6
     bcmpkt_rarp_t_target_ip_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_rarp_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RARP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_rarp_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_FID_COUNT] = {
     bcmpkt_rarp_t_hardware_len_set,
     bcmpkt_rarp_t_hardware_type_set,
     bcmpkt_rarp_t_operation_set,
@@ -6590,13 +6594,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_rarp_t_fset[BCM56780_A0_HNA_6
     bcmpkt_rarp_t_target_ip_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_rarp_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_rarp_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_rarp_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RARP_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_rarp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_rarp_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_rarp_t_field_data,
 };
 
 
@@ -6676,7 +6680,7 @@ static int32_t bcmpkt_routing_t_segments_left_set(uint32_t *data, int profile, u
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_routing_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ROUTING_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_routing_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ROUTING_T_FID_COUNT] = {
     bcmpkt_routing_t_data_get,
     bcmpkt_routing_t_hdr_ext_len_get,
     bcmpkt_routing_t_next_header_get,
@@ -6684,7 +6688,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_routing_t_fget[BCM56780_A0_HN
     bcmpkt_routing_t_segments_left_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_routing_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ROUTING_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_routing_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ROUTING_T_FID_COUNT] = {
     bcmpkt_routing_t_data_set,
     bcmpkt_routing_t_hdr_ext_len_set,
     bcmpkt_routing_t_next_header_set,
@@ -6692,13 +6696,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_routing_t_fset[BCM56780_A0_HN
     bcmpkt_routing_t_segments_left_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_routing_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ROUTING_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_routing_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ROUTING_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_routing_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_ROUTING_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_routing_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_routing_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_ROUTING_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_routing_t_field_data,
 };
 
 
@@ -6732,23 +6736,23 @@ static int32_t bcmpkt_rspan_t_tpid_set(uint32_t *data, int profile, uint32_t val
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_rspan_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RSPAN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_rspan_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RSPAN_T_FID_COUNT] = {
     bcmpkt_rspan_t_tag_get,
     bcmpkt_rspan_t_tpid_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_rspan_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RSPAN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_rspan_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RSPAN_T_FID_COUNT] = {
     bcmpkt_rspan_t_tag_set,
     bcmpkt_rspan_t_tpid_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_rspan_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RSPAN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_rspan_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RSPAN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_rspan_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_RSPAN_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_rspan_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_rspan_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_RSPAN_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_rspan_t_field_data,
 };
 
 
@@ -6798,25 +6802,25 @@ static int32_t bcmpkt_sflow_shim_0_t_version_set(uint32_t *data, int profile, ui
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_sflow_shim_0_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_sflow_shim_0_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT] = {
     bcmpkt_sflow_shim_0_t_sys_destination_get,
     bcmpkt_sflow_shim_0_t_sys_source_get,
     bcmpkt_sflow_shim_0_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_sflow_shim_0_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_sflow_shim_0_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT] = {
     bcmpkt_sflow_shim_0_t_sys_destination_set,
     bcmpkt_sflow_shim_0_t_sys_source_set,
     bcmpkt_sflow_shim_0_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_sflow_shim_0_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_sflow_shim_0_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_sflow_shim_0_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_sflow_shim_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_sflow_shim_0_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_sflow_shim_0_t_field_data,
 };
 
 
@@ -6940,7 +6944,7 @@ static int32_t bcmpkt_sflow_shim_1_t_sys_opcode_set(uint32_t *data, int profile,
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_sflow_shim_1_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_sflow_shim_1_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT] = {
     bcmpkt_sflow_shim_1_t_flag_dest_sample_get,
     bcmpkt_sflow_shim_1_t_flag_discarded_get,
     bcmpkt_sflow_shim_1_t_flag_flex_sample_get,
@@ -6951,7 +6955,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_sflow_shim_1_t_fget[BCM56780_
     bcmpkt_sflow_shim_1_t_sys_opcode_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_sflow_shim_1_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_sflow_shim_1_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT] = {
     bcmpkt_sflow_shim_1_t_flag_dest_sample_set,
     bcmpkt_sflow_shim_1_t_flag_discarded_set,
     bcmpkt_sflow_shim_1_t_flag_flex_sample_set,
@@ -6962,13 +6966,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_sflow_shim_1_t_fset[BCM56780_
     bcmpkt_sflow_shim_1_t_sys_opcode_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_sflow_shim_1_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_1_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_sflow_shim_1_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_sflow_shim_1_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_sflow_shim_1_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_sflow_shim_1_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_sflow_shim_1_t_field_data,
 };
 
 
@@ -7003,23 +7007,23 @@ static int32_t bcmpkt_sflow_shim_2_t_user_meta_data_set(uint32_t *data, int prof
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_sflow_shim_2_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_sflow_shim_2_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT] = {
     bcmpkt_sflow_shim_2_t_sequence_num_get,
     bcmpkt_sflow_shim_2_t_user_meta_data_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_sflow_shim_2_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_sflow_shim_2_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT] = {
     bcmpkt_sflow_shim_2_t_sequence_num_set,
     bcmpkt_sflow_shim_2_t_user_meta_data_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_sflow_shim_2_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_2_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_sflow_shim_2_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_2_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_sflow_shim_2_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_sflow_shim_2_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_sflow_shim_2_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_sflow_shim_2_t_field_data,
 };
 
 
@@ -7054,23 +7058,23 @@ static int32_t bcmpkt_snap_llc_t_snap_llc_set(uint32_t *data, int profile, uint3
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_snap_llc_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SNAP_LLC_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_snap_llc_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SNAP_LLC_T_FID_COUNT] = {
     bcmpkt_snap_llc_t_length_get,
     bcmpkt_snap_llc_t_snap_llc_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_snap_llc_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SNAP_LLC_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_snap_llc_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SNAP_LLC_T_FID_COUNT] = {
     bcmpkt_snap_llc_t_length_set,
     bcmpkt_snap_llc_t_snap_llc_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_snap_llc_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SNAP_LLC_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_snap_llc_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SNAP_LLC_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_snap_llc_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SNAP_LLC_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_snap_llc_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_snap_llc_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SNAP_LLC_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_snap_llc_t_field_data,
 };
 
 
@@ -7104,23 +7108,23 @@ static int32_t bcmpkt_svtag_t_data_upr_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_svtag_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SVTAG_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_svtag_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SVTAG_T_FID_COUNT] = {
     bcmpkt_svtag_t_data_lwr_get,
     bcmpkt_svtag_t_data_upr_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_svtag_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SVTAG_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_svtag_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SVTAG_T_FID_COUNT] = {
     bcmpkt_svtag_t_data_lwr_set,
     bcmpkt_svtag_t_data_upr_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_svtag_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SVTAG_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_svtag_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SVTAG_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_svtag_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_SVTAG_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_svtag_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_svtag_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_SVTAG_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_svtag_t_field_data,
 };
 
 
@@ -7154,23 +7158,23 @@ static int32_t bcmpkt_tcp_first_4bytes_t_src_port_set(uint32_t *data, int profil
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_tcp_first_4bytes_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_tcp_first_4bytes_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_first_4bytes_t_dst_port_get,
     bcmpkt_tcp_first_4bytes_t_src_port_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_tcp_first_4bytes_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_tcp_first_4bytes_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_first_4bytes_t_dst_port_set,
     bcmpkt_tcp_first_4bytes_t_src_port_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_tcp_first_4bytes_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_tcp_first_4bytes_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_tcp_first_4bytes_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_tcp_first_4bytes_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_tcp_first_4bytes_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_tcp_first_4bytes_t_field_data,
 };
 
 
@@ -7266,7 +7270,7 @@ static int32_t bcmpkt_tcp_last_16bytes_t_win_size_set(uint32_t *data, int profil
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_tcp_last_16bytes_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_tcp_last_16bytes_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_last_16bytes_t_ack_num_get,
     bcmpkt_tcp_last_16bytes_t_checksum_get,
     bcmpkt_tcp_last_16bytes_t_hdr_len_and_flags_get,
@@ -7275,7 +7279,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_tcp_last_16bytes_t_fget[BCM56
     bcmpkt_tcp_last_16bytes_t_win_size_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_tcp_last_16bytes_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_tcp_last_16bytes_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_last_16bytes_t_ack_num_set,
     bcmpkt_tcp_last_16bytes_t_checksum_set,
     bcmpkt_tcp_last_16bytes_t_hdr_len_and_flags_set,
@@ -7284,13 +7288,13 @@ bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_tcp_last_16bytes_t_fset[BCM56
     bcmpkt_tcp_last_16bytes_t_win_size_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_tcp_last_16bytes_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_tcp_last_16bytes_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_tcp_last_16bytes_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_tcp_last_16bytes_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_tcp_last_16bytes_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_tcp_last_16bytes_t_field_data,
 };
 
 
@@ -7354,27 +7358,27 @@ static int32_t bcmpkt_udp_t_udp_length_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_udp_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UDP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_udp_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UDP_T_FID_COUNT] = {
     bcmpkt_udp_t_checksum_get,
     bcmpkt_udp_t_dst_port_get,
     bcmpkt_udp_t_src_port_get,
     bcmpkt_udp_t_udp_length_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_udp_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UDP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_udp_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UDP_T_FID_COUNT] = {
     bcmpkt_udp_t_checksum_set,
     bcmpkt_udp_t_dst_port_set,
     bcmpkt_udp_t_src_port_set,
     bcmpkt_udp_t_udp_length_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_udp_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_udp_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_udp_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UDP_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_udp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_udp_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UDP_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_udp_t_field_data,
 };
 
 
@@ -7410,23 +7414,23 @@ static int32_t bcmpkt_unknown_l3_t_next_16bytes_of_l3_payload_set(uint32_t *data
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_unknown_l3_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_unknown_l3_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
     bcmpkt_unknown_l3_t_first_16bytes_of_l3_payload_get,
     bcmpkt_unknown_l3_t_next_16bytes_of_l3_payload_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_unknown_l3_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_unknown_l3_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
     bcmpkt_unknown_l3_t_first_16bytes_of_l3_payload_set,
     bcmpkt_unknown_l3_t_next_16bytes_of_l3_payload_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_unknown_l3_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_unknown_l3_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_unknown_l3_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_unknown_l3_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_unknown_l3_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_unknown_l3_t_field_data,
 };
 
 
@@ -7446,21 +7450,21 @@ static int32_t bcmpkt_unknown_l4_t_first_4bytes_of_l4_payload_set(uint32_t *data
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_unknown_l4_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_unknown_l4_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
     bcmpkt_unknown_l4_t_first_4bytes_of_l4_payload_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_unknown_l4_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_unknown_l4_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
     bcmpkt_unknown_l4_t_first_4bytes_of_l4_payload_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_unknown_l4_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_unknown_l4_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_unknown_l4_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_unknown_l4_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_unknown_l4_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_unknown_l4_t_field_data,
 };
 
 
@@ -7510,25 +7514,25 @@ static int32_t bcmpkt_unknown_l5_t_l5_bytes_4_7_set(uint32_t *data, int profile,
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_unknown_l5_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_unknown_l5_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
     bcmpkt_unknown_l5_t_l5_bytes_0_1_get,
     bcmpkt_unknown_l5_t_l5_bytes_2_3_get,
     bcmpkt_unknown_l5_t_l5_bytes_4_7_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_unknown_l5_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_unknown_l5_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
     bcmpkt_unknown_l5_t_l5_bytes_0_1_set,
     bcmpkt_unknown_l5_t_l5_bytes_2_3_set,
     bcmpkt_unknown_l5_t_l5_bytes_4_7_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_unknown_l5_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_unknown_l5_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_unknown_l5_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_unknown_l5_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_unknown_l5_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_unknown_l5_t_field_data,
 };
 
 
@@ -7592,27 +7596,27 @@ static int32_t bcmpkt_vlan_t_vid_set(uint32_t *data, int profile, uint32_t val)
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_vlan_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_vlan_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VLAN_T_FID_COUNT] = {
     bcmpkt_vlan_t_cfi_get,
     bcmpkt_vlan_t_pcp_get,
     bcmpkt_vlan_t_tpid_get,
     bcmpkt_vlan_t_vid_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_vlan_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_vlan_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VLAN_T_FID_COUNT] = {
     bcmpkt_vlan_t_cfi_set,
     bcmpkt_vlan_t_pcp_set,
     bcmpkt_vlan_t_tpid_set,
     bcmpkt_vlan_t_vid_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_vlan_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_vlan_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_vlan_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VLAN_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_vlan_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_vlan_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VLAN_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_vlan_t_field_data,
 };
 
 
@@ -7647,23 +7651,23 @@ static int32_t bcmpkt_vntag_t_tpid_set(uint32_t *data, int profile, uint32_t val
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_vntag_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VNTAG_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_vntag_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VNTAG_T_FID_COUNT] = {
     bcmpkt_vntag_t_tag_get,
     bcmpkt_vntag_t_tpid_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_vntag_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VNTAG_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_vntag_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VNTAG_T_FID_COUNT] = {
     bcmpkt_vntag_t_tag_set,
     bcmpkt_vntag_t_tpid_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_vntag_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VNTAG_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_vntag_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VNTAG_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_vntag_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VNTAG_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_vntag_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_vntag_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VNTAG_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_vntag_t_field_data,
 };
 
 
@@ -7713,25 +7717,25 @@ static int32_t bcmpkt_vxlan_t_vn_id_set(uint32_t *data, int profile, uint32_t va
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_vxlan_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VXLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_vxlan_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VXLAN_T_FID_COUNT] = {
     bcmpkt_vxlan_t_flags_reserved_1_get,
     bcmpkt_vxlan_t_reserved2_get,
     bcmpkt_vxlan_t_vn_id_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_vxlan_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VXLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_vxlan_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VXLAN_T_FID_COUNT] = {
     bcmpkt_vxlan_t_flags_reserved_1_set,
     bcmpkt_vxlan_t_reserved2_set,
     bcmpkt_vxlan_t_vn_id_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_vxlan_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_vxlan_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_vxlan_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_VXLAN_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_vxlan_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_vxlan_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_VXLAN_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_vxlan_t_field_data,
 };
 
 
@@ -7843,7 +7847,7 @@ static int32_t bcmpkt_wesp_t_wesp_iv_set(uint32_t *data, int profile, uint32_t v
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_wesp_t_fget[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_WESP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_31_3_0_wesp_t_fget[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_FID_COUNT] = {
     bcmpkt_wesp_t_flags_get,
     bcmpkt_wesp_t_header_len_get,
     bcmpkt_wesp_t_next_header_get,
@@ -7853,7 +7857,7 @@ bcmpkt_flex_field_get_f bcm56780_a0_hna_6_5_30_6_0_wesp_t_fget[BCM56780_A0_HNA_6
     bcmpkt_wesp_t_wesp_iv_get,
 };
 
-bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_wesp_t_fset[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_WESP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_31_3_0_wesp_t_fset[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_FID_COUNT] = {
     bcmpkt_wesp_t_flags_set,
     bcmpkt_wesp_t_header_len_set,
     bcmpkt_wesp_t_next_header_set,
@@ -7863,506 +7867,506 @@ bcmpkt_flex_field_set_f bcm56780_a0_hna_6_5_30_6_0_wesp_t_fset[BCM56780_A0_HNA_6
     bcmpkt_wesp_t_wesp_iv_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_30_6_0_wesp_t_field_data[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_WESP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56780_a0_hna_6_5_31_3_0_wesp_t_field_data[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_30_6_0_wesp_t_field_info = {
-    .num_fields = BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_WESP_T_FID_COUNT,
-    .info = bcm56780_a0_hna_6_5_30_6_0_wesp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56780_a0_hna_6_5_31_3_0_wesp_t_field_info = {
+    .num_fields = BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_FID_COUNT,
+    .info = bcm56780_a0_hna_6_5_31_3_0_wesp_t_field_data,
 };
 
-static bcmpkt_flex_pmd_info_t bcm56780_a0_hna_6_5_30_6_0_flexhdr_info_list[BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_FLEXHDR_COUNT] = {
+static bcmpkt_flex_pmd_info_t bcm56780_a0_hna_6_5_31_3_0_flexhdr_info_list[BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_FLEXHDR_COUNT] = {
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_arp_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_arp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_arp_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_arp_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_arp_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_arp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_authen_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_authen_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_authen_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_authen_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_authen_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_authen_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_bfd_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_bfd_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_bfd_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_bfd_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_bfd_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_bfd_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_cntag_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_cntag_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_cntag_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_cntag_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_cntag_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_cntag_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_cpu_composites_0_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_cpu_composites_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_cpu_composites_0_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_cpu_composites_0_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_cpu_composites_0_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_cpu_composites_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_cpu_composites_1_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_cpu_composites_1_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_cpu_composites_1_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_cpu_composites_1_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_cpu_composites_1_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_cpu_composites_1_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_dest_option_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_dest_option_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_dest_option_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_dest_option_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_dest_option_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_dest_option_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_ep_nih_header_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_ep_nih_header_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_ep_nih_header_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_ep_nih_header_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_ep_nih_header_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_ep_nih_header_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_erspan3_fixed_hdr_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_erspan3_fixed_hdr_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_erspan3_fixed_hdr_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_erspan3_fixed_hdr_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_erspan3_fixed_hdr_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_erspan3_fixed_hdr_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_erspan3_subhdr_5_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_erspan3_subhdr_5_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_erspan3_subhdr_5_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_erspan3_subhdr_5_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_erspan3_subhdr_5_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_erspan3_subhdr_5_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_esp_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_esp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_esp_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_esp_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_esp_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_esp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_etag_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_etag_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_etag_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_etag_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_etag_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_etag_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_ethertype_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_ethertype_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_ethertype_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_ethertype_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_ethertype_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_ethertype_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_frag_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_frag_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_frag_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_frag_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_frag_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_frag_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_generic_loopback_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_generic_loopback_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_generic_loopback_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_generic_loopback_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_generic_loopback_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_generic_loopback_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_gpe_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_gpe_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_gpe_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_gpe_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_gpe_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_gpe_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_gre_chksum_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_gre_chksum_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_gre_chksum_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_gre_chksum_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_gre_chksum_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_gre_chksum_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_gre_key_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_gre_key_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_gre_key_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_gre_key_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_gre_key_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_gre_key_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_gre_rout_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_gre_rout_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_gre_rout_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_gre_rout_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_gre_rout_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_gre_rout_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_gre_seq_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_gre_seq_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_gre_seq_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_gre_seq_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_gre_seq_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_gre_seq_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_gre_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_gre_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_gre_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_gre_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_gre_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_gre_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_hop_by_hop_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_hop_by_hop_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_hop_by_hop_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_hop_by_hop_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_hop_by_hop_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_hop_by_hop_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_icmp_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_icmp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_icmp_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_icmp_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_icmp_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_icmp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_0_a_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_0_a_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_0_a_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_0_a_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_0_a_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_0_a_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_0_b_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_0_b_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_0_b_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_0_b_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_0_b_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_0_b_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_1_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_1_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_1_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_1_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_1_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_1_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_2_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_2_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_2_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_2_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_2_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_2_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_3_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_3_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_3_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_ifa_flex_md_3_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_3_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_ifa_flex_md_3_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_ifa_header_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_ifa_header_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_ifa_header_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_ifa_header_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_ifa_header_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_ifa_header_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_ifa_md_base_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_ifa_md_base_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_ifa_md_base_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_ifa_md_base_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_ifa_md_base_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_ifa_md_base_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_ifa_metadata_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_ifa_metadata_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_ifa_metadata_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_ifa_metadata_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_ifa_metadata_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_ifa_metadata_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_igmp_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_igmp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_igmp_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_igmp_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_igmp_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_igmp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_ipfix_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_ipfix_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_ipfix_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_ipfix_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_ipfix_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_ipfix_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_ipv4_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_ipv4_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_ipv4_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_ipv4_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_ipv4_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_ipv4_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_ipv6_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_ipv6_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_ipv6_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_ipv6_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_ipv6_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_ipv6_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_l2_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_l2_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_l2_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_l2_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_l2_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_l2_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_mirror_erspan_sn_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_mirror_erspan_sn_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_mirror_erspan_sn_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_mirror_erspan_sn_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_mirror_erspan_sn_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_mirror_erspan_sn_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_mirror_transport_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_mirror_transport_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_mirror_transport_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_mirror_transport_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_mirror_transport_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_mirror_transport_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_mpls_ach_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_mpls_ach_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_mpls_ach_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_mpls_ach_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_mpls_ach_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_mpls_ach_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_mpls_bv_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_mpls_bv_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_mpls_bv_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_mpls_bv_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_mpls_bv_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_mpls_bv_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_mpls_cw_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_mpls_cw_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_mpls_cw_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_mpls_cw_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_mpls_cw_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_mpls_cw_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_mpls_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_mpls_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_mpls_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_mpls_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_mpls_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_mpls_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_p_1588_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_p_1588_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_p_1588_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_p_1588_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_p_1588_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_p_1588_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_prog_ext_hdr_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_prog_ext_hdr_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_prog_ext_hdr_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_prog_ext_hdr_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_prog_ext_hdr_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_prog_ext_hdr_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_psamp_0_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_psamp_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_psamp_0_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_psamp_0_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_psamp_0_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_psamp_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_psamp_1_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_psamp_1_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_psamp_1_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_psamp_1_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_psamp_1_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_psamp_1_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_psamp_mirror_on_drop_0_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_psamp_mirror_on_drop_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_psamp_mirror_on_drop_0_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_psamp_mirror_on_drop_0_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_psamp_mirror_on_drop_0_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_psamp_mirror_on_drop_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_psamp_mirror_on_drop_3_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_psamp_mirror_on_drop_3_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_psamp_mirror_on_drop_3_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_psamp_mirror_on_drop_3_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_psamp_mirror_on_drop_3_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_psamp_mirror_on_drop_3_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_rarp_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_rarp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_rarp_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_rarp_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_rarp_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_rarp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_routing_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_routing_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_routing_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_routing_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_routing_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_routing_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_rspan_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_rspan_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_rspan_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_rspan_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_rspan_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_rspan_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_sflow_shim_0_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_sflow_shim_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_sflow_shim_0_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_sflow_shim_0_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_sflow_shim_0_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_sflow_shim_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_sflow_shim_1_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_sflow_shim_1_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_sflow_shim_1_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_sflow_shim_1_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_sflow_shim_1_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_sflow_shim_1_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_sflow_shim_2_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_sflow_shim_2_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_sflow_shim_2_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_sflow_shim_2_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_sflow_shim_2_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_sflow_shim_2_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_snap_llc_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_snap_llc_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_snap_llc_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_snap_llc_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_snap_llc_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_snap_llc_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_svtag_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_svtag_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_svtag_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_svtag_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_svtag_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_svtag_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_tcp_first_4bytes_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_tcp_first_4bytes_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_tcp_first_4bytes_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_tcp_first_4bytes_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_tcp_first_4bytes_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_tcp_first_4bytes_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_tcp_last_16bytes_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_tcp_last_16bytes_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_tcp_last_16bytes_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_tcp_last_16bytes_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_tcp_last_16bytes_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_tcp_last_16bytes_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_udp_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_udp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_udp_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_udp_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_udp_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_udp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_unknown_l3_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_unknown_l3_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_unknown_l3_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_unknown_l3_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_unknown_l3_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_unknown_l3_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_unknown_l4_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_unknown_l4_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_unknown_l4_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_unknown_l4_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_unknown_l4_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_unknown_l4_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_unknown_l5_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_unknown_l5_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_unknown_l5_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_unknown_l5_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_unknown_l5_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_unknown_l5_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_vlan_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_vlan_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_vlan_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_vlan_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_vlan_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_vlan_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_vntag_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_vntag_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_vntag_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_vntag_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_vntag_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_vntag_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_vxlan_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_vxlan_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_vxlan_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_vxlan_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_vxlan_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_vxlan_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_wesp_t_field_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_wesp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56780_a0_hna_6_5_30_6_0_wesp_t_fget,
-        .flex_fset = bcm56780_a0_hna_6_5_30_6_0_wesp_t_fset,
+        .flex_fget = bcm56780_a0_hna_6_5_31_3_0_wesp_t_fget,
+        .flex_fset = bcm56780_a0_hna_6_5_31_3_0_wesp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_field_info,
-        .reasons_info = &bcm56780_a0_hna_6_5_30_6_0_rxpmd_flex_reasons_info,
+        .field_info = &bcm56780_a0_hna_6_5_31_3_0_rxpmd_flex_field_info,
+        .reasons_info = &bcm56780_a0_hna_6_5_31_3_0_rxpmd_flex_reasons_info,
         .flex_common_fget = bcm56780_a0_rxpmd_flex_fget,
         .flex_common_fset = bcm56780_a0_rxpmd_flex_fset,
     },
 };
 
-static shr_enum_map_t bcm56780_a0_hna_6_5_30_6_0_flexhdr_id_map[] = {
-    BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_FLEXHDR_NAME_MAP_INIT
+static shr_enum_map_t bcm56780_a0_hna_6_5_31_3_0_flexhdr_id_map[] = {
+    BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_FLEXHDR_NAME_MAP_INIT
 };
 
-shr_enum_map_t * bcm56780_a0_hna_6_5_30_6_0_flexhdr_map_get(void)
+shr_enum_map_t * bcm56780_a0_hna_6_5_31_3_0_flexhdr_map_get(void)
 {
-    return bcm56780_a0_hna_6_5_30_6_0_flexhdr_id_map;
+    return bcm56780_a0_hna_6_5_31_3_0_flexhdr_id_map;
 }
 
-bcmpkt_flex_pmd_info_t * bcm56780_a0_hna_6_5_30_6_0_flex_pmd_info_get(uint32_t hid)
+bcmpkt_flex_pmd_info_t * bcm56780_a0_hna_6_5_31_3_0_flex_pmd_info_get(uint32_t hid)
 {
-    if (hid >= BCM56780_A0_HNA_6_5_30_6_0_BCMPKT_FLEXHDR_COUNT) {
+    if (hid >= BCM56780_A0_HNA_6_5_31_3_0_BCMPKT_FLEXHDR_COUNT) {
         return NULL;
     }
 
-    return &bcm56780_a0_hna_6_5_30_6_0_flexhdr_info_list[hid];
+    return &bcm56780_a0_hna_6_5_31_3_0_flexhdr_info_list[hid];
 }
 
-int bcm56780_a0_hna_6_5_30_6_0_flexhdr_variant_support_map[BCMPKT_PMD_COUNT] = {
+int bcm56780_a0_hna_6_5_31_3_0_flexhdr_variant_support_map[BCMPKT_PMD_COUNT] = {
     14,
     -1,
     -1,
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_bcmpkt_rxpmd_match_id.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_bcmpkt_rxpmd_match_id.c
similarity index 83%
rename from platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_bcmpkt_rxpmd_match_id.c
rename to platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_bcmpkt_rxpmd_match_id.c
index 1be0c5ede9cb..0c419122f5a3 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_bcmpkt_rxpmd_match_id.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_bcmpkt_rxpmd_match_id.c
@@ -2,8 +2,8 @@
  *
  * DO NOT EDIT THIS FILE!
  * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) bcm56880_a0_dna_6_5_30_1_1_sf_match_id_info.yml
- * for device bcm56880_a0 and variant dna_6_5_30_1_1.
+ * from the NPL output file(s) bcm56880_a0_dna_6_5_31_6_0_sf_match_id_info.yml
+ * for device bcm56880_a0 and variant dna_6_5_31_6_0.
  * Edits to this file will be lost when it is regenerated.
  *
  * $Id: $
@@ -29,13 +29,13 @@
 
 
 #include <bcmpkt/bcmpkt_rxpmd_match_id.h>
-#include <bcmpkt/xfcr/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_bcmpkt_rxpmd_match_id_defs.h>
+#include <bcmpkt/xfcr/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_bcmpkt_rxpmd_match_id_defs.h>
 
 
 static bcmpkt_rxpmd_match_id_db_t
-bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_COUNT] = {
+bcm56880_a0_dna_6_5_31_6_0_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_COUNT] = {
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ETAG */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ETAG */
         .name         = "EGRESS_PKT_FWD_L2_HDR_ETAG",
         .match        = 0x80,
         .match_mask   = 0xc0,
@@ -49,7 +49,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_BASE */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_BASE */
         .name         = "EGRESS_PKT_FWD_L2_HDR_HG3_BASE",
         .match        = 0x2,
         .match_mask   = 0x2,
@@ -63,7 +63,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0 */
         .name         = "EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0",
         .match        = 0x8,
         .match_mask   = 0x8,
@@ -77,7 +77,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG */
         .name         = "EGRESS_PKT_FWD_L2_HDR_ITAG",
         .match        = 0x20,
         .match_mask   = 0x20,
@@ -91,7 +91,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2 */
         .name         = "EGRESS_PKT_FWD_L2_HDR_L2",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -105,7 +105,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE */
         .name         = "EGRESS_PKT_FWD_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0xff,
@@ -119,7 +119,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG */
         .name         = "EGRESS_PKT_FWD_L2_HDR_OTAG",
         .match        = 0x10,
         .match_mask   = 0x10,
@@ -133,7 +133,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC */
         .name         = "EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC",
         .match        = 0x4,
         .match_mask   = 0x4,
@@ -147,7 +147,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_VNTAG */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_VNTAG */
         .name         = "EGRESS_PKT_FWD_L2_HDR_VNTAG",
         .match        = 0x40,
         .match_mask   = 0xc0,
@@ -161,7 +161,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ARP",
         .match        = 0x1800,
         .match_mask   = 0x3830,
@@ -175,7 +175,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1",
         .match        = 0x80,
         .match_mask   = 0x1c2,
@@ -189,7 +189,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2",
         .match        = 0x408,
         .match_mask   = 0x64c,
@@ -203,7 +203,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_BFD",
         .match        = 0x3800,
         .match_mask   = 0x3800,
@@ -217,7 +217,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT",
         .match        = 0x200,
         .match_mask   = 0x642,
@@ -231,7 +231,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -245,7 +245,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1",
         .match        = 0x100,
         .match_mask   = 0x1c0,
@@ -259,7 +259,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2",
         .match        = 0x600,
         .match_mask   = 0x640,
@@ -273,7 +273,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GPE",
         .match        = 0x1830,
         .match_mask   = 0x3870,
@@ -287,7 +287,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE",
         .match        = 0x2,
         .match_mask   = 0x42,
@@ -301,7 +301,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM",
         .match        = 0x202,
         .match_mask   = 0x642,
@@ -315,7 +315,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY",
         .match        = 0x1000,
         .match_mask   = 0x3800,
@@ -329,7 +329,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT",
         .match        = 0x82,
         .match_mask   = 0x1c2,
@@ -343,7 +343,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ",
         .match        = 0x12,
         .match_mask   = 0x72,
@@ -357,7 +357,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ICMP",
         .match        = 0x2000,
         .match_mask   = 0x3830,
@@ -371,7 +371,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA",
         .match        = 0x180,
         .match_mask   = 0x1c0,
@@ -385,7 +385,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IGMP",
         .match        = 0x404,
         .match_mask   = 0x64c,
@@ -399,7 +399,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IPV4",
         .match        = 0x4,
         .match_mask   = 0x4c,
@@ -413,7 +413,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IPV6",
         .match        = 0x8,
         .match_mask   = 0x4c,
@@ -427,7 +427,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS0",
         .match        = 0x40,
         .match_mask   = 0x40,
@@ -441,7 +441,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS1",
         .match        = 0x42,
         .match_mask   = 0x42,
@@ -455,7 +455,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS2",
         .match        = 0x44,
         .match_mask   = 0x44,
@@ -469,7 +469,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS3",
         .match        = 0x48,
         .match_mask   = 0x48,
@@ -483,7 +483,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS4",
         .match        = 0x50,
         .match_mask   = 0x50,
@@ -497,7 +497,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS5",
         .match        = 0x60,
         .match_mask   = 0x60,
@@ -511,7 +511,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS6",
         .match        = 0xc0,
         .match_mask   = 0xc0,
@@ -525,7 +525,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH",
         .match        = 0x140,
         .match_mask   = 0x140,
@@ -539,7 +539,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW",
         .match        = 0x240,
         .match_mask   = 0x240,
@@ -553,7 +553,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3fff,
@@ -567,7 +567,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_P_1588",
         .match        = 0x3000,
         .match_mask   = 0x3800,
@@ -581,7 +581,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_RARP",
         .match        = 0x800,
         .match_mask   = 0x3830,
@@ -595,7 +595,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x20,
         .match_mask   = 0x70,
@@ -609,7 +609,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x820,
         .match_mask   = 0x3870,
@@ -623,7 +623,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UDP",
         .match        = 0x30,
         .match_mask   = 0x70,
@@ -637,7 +637,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3",
         .match        = 0x10,
         .match_mask   = 0x72,
@@ -651,7 +651,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x2800,
         .match_mask   = 0x3800,
@@ -665,7 +665,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x2030,
         .match_mask   = 0x3870,
@@ -679,7 +679,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_VXLAN",
         .match        = 0x830,
         .match_mask   = 0x3870,
@@ -693,7 +693,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK */
         .name         = "EGRESS_PKT_SYS_HDR_LOOPBACK",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -707,7 +707,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE */
         .name         = "EGRESS_PKT_SYS_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x1,
@@ -721,7 +721,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ETAG */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ETAG */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_ETAG",
         .match        = 0x80,
         .match_mask   = 0xc0,
@@ -735,7 +735,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE",
         .match        = 0x2,
         .match_mask   = 0x2,
@@ -749,7 +749,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0 */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0",
         .match        = 0x8,
         .match_mask   = 0x8,
@@ -763,7 +763,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_ITAG",
         .match        = 0x20,
         .match_mask   = 0x20,
@@ -777,7 +777,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2 */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_L2",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -791,7 +791,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0xff,
@@ -805,7 +805,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_OTAG",
         .match        = 0x10,
         .match_mask   = 0x10,
@@ -819,7 +819,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC",
         .match        = 0x4,
         .match_mask   = 0x4,
@@ -833,7 +833,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_VNTAG */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_VNTAG */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_VNTAG",
         .match        = 0x40,
         .match_mask   = 0xc0,
@@ -847,7 +847,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP",
         .match        = 0x1800,
         .match_mask   = 0x3830,
@@ -861,7 +861,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1",
         .match        = 0x80,
         .match_mask   = 0x1c2,
@@ -875,7 +875,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2",
         .match        = 0x408,
         .match_mask   = 0x64c,
@@ -889,7 +889,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD",
         .match        = 0x3800,
         .match_mask   = 0x3800,
@@ -903,7 +903,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT",
         .match        = 0x200,
         .match_mask   = 0x642,
@@ -917,7 +917,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -931,7 +931,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1",
         .match        = 0x100,
         .match_mask   = 0x1c0,
@@ -945,7 +945,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2",
         .match        = 0x600,
         .match_mask   = 0x640,
@@ -959,7 +959,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE",
         .match        = 0x1830,
         .match_mask   = 0x3870,
@@ -973,7 +973,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE",
         .match        = 0x2,
         .match_mask   = 0x42,
@@ -987,7 +987,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM",
         .match        = 0x202,
         .match_mask   = 0x642,
@@ -1001,7 +1001,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY",
         .match        = 0x1000,
         .match_mask   = 0x3800,
@@ -1015,7 +1015,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT",
         .match        = 0x82,
         .match_mask   = 0x1c2,
@@ -1029,7 +1029,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ",
         .match        = 0x12,
         .match_mask   = 0x72,
@@ -1043,7 +1043,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP",
         .match        = 0x2000,
         .match_mask   = 0x3830,
@@ -1057,7 +1057,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA",
         .match        = 0x180,
         .match_mask   = 0x1c0,
@@ -1071,7 +1071,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP",
         .match        = 0x404,
         .match_mask   = 0x64c,
@@ -1085,7 +1085,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4",
         .match        = 0x4,
         .match_mask   = 0x4c,
@@ -1099,7 +1099,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6",
         .match        = 0x8,
         .match_mask   = 0x4c,
@@ -1113,7 +1113,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0",
         .match        = 0x40,
         .match_mask   = 0x40,
@@ -1127,7 +1127,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1",
         .match        = 0x42,
         .match_mask   = 0x42,
@@ -1141,7 +1141,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2",
         .match        = 0x44,
         .match_mask   = 0x44,
@@ -1155,7 +1155,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3",
         .match        = 0x48,
         .match_mask   = 0x48,
@@ -1169,7 +1169,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4",
         .match        = 0x50,
         .match_mask   = 0x50,
@@ -1183,7 +1183,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5",
         .match        = 0x60,
         .match_mask   = 0x60,
@@ -1197,7 +1197,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6",
         .match        = 0xc0,
         .match_mask   = 0xc0,
@@ -1211,7 +1211,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH",
         .match        = 0x140,
         .match_mask   = 0x140,
@@ -1225,7 +1225,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW",
         .match        = 0x240,
         .match_mask   = 0x240,
@@ -1239,7 +1239,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3fff,
@@ -1253,7 +1253,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588",
         .match        = 0x3000,
         .match_mask   = 0x3800,
@@ -1267,7 +1267,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP",
         .match        = 0x800,
         .match_mask   = 0x3830,
@@ -1281,7 +1281,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x20,
         .match_mask   = 0x70,
@@ -1295,7 +1295,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x820,
         .match_mask   = 0x3870,
@@ -1309,7 +1309,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP",
         .match        = 0x30,
         .match_mask   = 0x70,
@@ -1323,7 +1323,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3",
         .match        = 0x10,
         .match_mask   = 0x72,
@@ -1337,7 +1337,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x2800,
         .match_mask   = 0x3800,
@@ -1351,7 +1351,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x2030,
         .match_mask   = 0x3870,
@@ -1365,7 +1365,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN",
         .match        = 0x830,
         .match_mask   = 0x3870,
@@ -1379,7 +1379,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ETAG */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ETAG */
         .name         = "INGRESS_PKT_INNER_L2_HDR_ETAG",
         .match        = 0x80,
         .match_mask   = 0xc0,
@@ -1393,7 +1393,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG */
         .name         = "INGRESS_PKT_INNER_L2_HDR_ITAG",
         .match        = 0x20,
         .match_mask   = 0x20,
@@ -1407,7 +1407,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2 */
         .name         = "INGRESS_PKT_INNER_L2_HDR_L2",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -1421,7 +1421,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE */
         .name         = "INGRESS_PKT_INNER_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0xff,
@@ -1435,7 +1435,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG */
         .name         = "INGRESS_PKT_INNER_L2_HDR_OTAG",
         .match        = 0x10,
         .match_mask   = 0x10,
@@ -1449,7 +1449,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC */
         .name         = "INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC",
         .match        = 0x4,
         .match_mask   = 0x4,
@@ -1463,7 +1463,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_VNTAG */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_VNTAG */
         .name         = "INGRESS_PKT_INNER_L2_HDR_VNTAG",
         .match        = 0x40,
         .match_mask   = 0xc0,
@@ -1477,7 +1477,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ARP",
         .match        = 0x1800,
         .match_mask   = 0x3830,
@@ -1491,7 +1491,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1",
         .match        = 0x80,
         .match_mask   = 0x1c2,
@@ -1505,7 +1505,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2",
         .match        = 0x408,
         .match_mask   = 0x64c,
@@ -1519,7 +1519,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_BFD",
         .match        = 0x3800,
         .match_mask   = 0x3800,
@@ -1533,7 +1533,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT",
         .match        = 0x200,
         .match_mask   = 0x642,
@@ -1547,7 +1547,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -1561,7 +1561,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1",
         .match        = 0x100,
         .match_mask   = 0x1c0,
@@ -1575,7 +1575,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2",
         .match        = 0x600,
         .match_mask   = 0x640,
@@ -1589,7 +1589,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ICMP",
         .match        = 0x2000,
         .match_mask   = 0x3830,
@@ -1603,7 +1603,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA",
         .match        = 0x180,
         .match_mask   = 0x1c0,
@@ -1617,7 +1617,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_IGMP",
         .match        = 0x404,
         .match_mask   = 0x64c,
@@ -1631,7 +1631,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_IPV4",
         .match        = 0x4,
         .match_mask   = 0x4c,
@@ -1645,7 +1645,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_IPV6",
         .match        = 0x8,
         .match_mask   = 0x4c,
@@ -1659,7 +1659,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3fff,
@@ -1673,7 +1673,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_P_1588",
         .match        = 0x3000,
         .match_mask   = 0x3800,
@@ -1687,7 +1687,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_RARP",
         .match        = 0x800,
         .match_mask   = 0x3830,
@@ -1701,7 +1701,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x20,
         .match_mask   = 0x70,
@@ -1715,7 +1715,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x820,
         .match_mask   = 0x3870,
@@ -1729,7 +1729,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UDP",
         .match        = 0x30,
         .match_mask   = 0x70,
@@ -1743,7 +1743,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3",
         .match        = 0x10,
         .match_mask   = 0x72,
@@ -1757,7 +1757,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x2800,
         .match_mask   = 0x3800,
@@ -1771,7 +1771,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x2030,
         .match_mask   = 0x3870,
@@ -1785,7 +1785,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ETAG */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ETAG */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_ETAG",
         .match        = 0x80,
         .match_mask   = 0xc0,
@@ -1799,7 +1799,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_BASE */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_BASE */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_HG3_BASE",
         .match        = 0x2,
         .match_mask   = 0x2,
@@ -1813,7 +1813,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0 */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0",
         .match        = 0x8,
         .match_mask   = 0x8,
@@ -1827,7 +1827,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_ITAG",
         .match        = 0x20,
         .match_mask   = 0x20,
@@ -1841,7 +1841,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2 */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_L2",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -1855,7 +1855,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0xff,
@@ -1869,7 +1869,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_OTAG",
         .match        = 0x10,
         .match_mask   = 0x10,
@@ -1883,7 +1883,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC",
         .match        = 0x4,
         .match_mask   = 0x4,
@@ -1897,7 +1897,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_VNTAG */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_VNTAG */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_VNTAG",
         .match        = 0x40,
         .match_mask   = 0xc0,
@@ -1911,7 +1911,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ARP",
         .match        = 0x1800,
         .match_mask   = 0x3830,
@@ -1925,7 +1925,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1",
         .match        = 0x80,
         .match_mask   = 0x1c2,
@@ -1939,7 +1939,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2",
         .match        = 0x408,
         .match_mask   = 0x64c,
@@ -1953,7 +1953,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_BFD",
         .match        = 0x3800,
         .match_mask   = 0x3800,
@@ -1967,7 +1967,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT",
         .match        = 0x200,
         .match_mask   = 0x642,
@@ -1981,7 +1981,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -1995,7 +1995,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1",
         .match        = 0x100,
         .match_mask   = 0x1c0,
@@ -2009,7 +2009,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2",
         .match        = 0x600,
         .match_mask   = 0x640,
@@ -2023,7 +2023,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GPE",
         .match        = 0x1830,
         .match_mask   = 0x3870,
@@ -2037,7 +2037,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE",
         .match        = 0x2,
         .match_mask   = 0x42,
@@ -2051,7 +2051,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM",
         .match        = 0x202,
         .match_mask   = 0x642,
@@ -2065,7 +2065,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY",
         .match        = 0x1000,
         .match_mask   = 0x3800,
@@ -2079,7 +2079,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT",
         .match        = 0x82,
         .match_mask   = 0x1c2,
@@ -2093,7 +2093,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ",
         .match        = 0x12,
         .match_mask   = 0x72,
@@ -2107,7 +2107,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ICMP",
         .match        = 0x2000,
         .match_mask   = 0x3830,
@@ -2121,7 +2121,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA",
         .match        = 0x180,
         .match_mask   = 0x1c0,
@@ -2135,7 +2135,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IGMP",
         .match        = 0x404,
         .match_mask   = 0x64c,
@@ -2149,7 +2149,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IPV4",
         .match        = 0x4,
         .match_mask   = 0x4c,
@@ -2163,7 +2163,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IPV6",
         .match        = 0x8,
         .match_mask   = 0x4c,
@@ -2177,7 +2177,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0",
         .match        = 0x40,
         .match_mask   = 0x40,
@@ -2191,7 +2191,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1",
         .match        = 0x42,
         .match_mask   = 0x42,
@@ -2205,7 +2205,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2",
         .match        = 0x44,
         .match_mask   = 0x44,
@@ -2219,7 +2219,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3",
         .match        = 0x48,
         .match_mask   = 0x48,
@@ -2233,7 +2233,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4",
         .match        = 0x50,
         .match_mask   = 0x50,
@@ -2247,7 +2247,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5",
         .match        = 0x60,
         .match_mask   = 0x60,
@@ -2261,7 +2261,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6",
         .match        = 0xc0,
         .match_mask   = 0xc0,
@@ -2275,7 +2275,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH",
         .match        = 0x140,
         .match_mask   = 0x140,
@@ -2289,7 +2289,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW",
         .match        = 0x240,
         .match_mask   = 0x240,
@@ -2303,7 +2303,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3fff,
@@ -2317,7 +2317,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_P_1588",
         .match        = 0x3000,
         .match_mask   = 0x3800,
@@ -2331,7 +2331,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_RARP",
         .match        = 0x800,
         .match_mask   = 0x3830,
@@ -2345,7 +2345,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x20,
         .match_mask   = 0x70,
@@ -2359,7 +2359,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x820,
         .match_mask   = 0x3870,
@@ -2373,7 +2373,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UDP",
         .match        = 0x30,
         .match_mask   = 0x70,
@@ -2387,7 +2387,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3",
         .match        = 0x10,
         .match_mask   = 0x72,
@@ -2401,7 +2401,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x2800,
         .match_mask   = 0x3800,
@@ -2415,7 +2415,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x2030,
         .match_mask   = 0x3870,
@@ -2429,7 +2429,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN",
         .match        = 0x830,
         .match_mask   = 0x3870,
@@ -2443,7 +2443,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK */
         .name         = "INGRESS_PKT_SYS_HDR_LOOPBACK",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -2457,7 +2457,7 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE */
+        /* BCM56880_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE */
         .name         = "INGRESS_PKT_SYS_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x1,
@@ -2472,23 +2472,23 @@ bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_DNA_6_5_30_1_1_RXPMD_MA
     },
 };
 
-static bcmpkt_rxpmd_match_id_db_info_t bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db_info = {
+static bcmpkt_rxpmd_match_id_db_info_t bcm56880_a0_dna_6_5_31_6_0_rxpmd_match_id_db_info = {
     .num_entries = 174,
-    .db = bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db
+    .db = bcm56880_a0_dna_6_5_31_6_0_rxpmd_match_id_db
 };
-bcmpkt_rxpmd_match_id_db_info_t * bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db_info_get(void) {
-    return &bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_db_info;
+bcmpkt_rxpmd_match_id_db_info_t * bcm56880_a0_dna_6_5_31_6_0_rxpmd_match_id_db_info_get(void) {
+    return &bcm56880_a0_dna_6_5_31_6_0_rxpmd_match_id_db_info;
 }
 
-static shr_enum_map_t bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_map[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT
+static shr_enum_map_t bcm56880_a0_dna_6_5_31_6_0_rxpmd_match_id_map[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_rxpmd_match_id_map_info_t bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_map_info = {
+static bcmpkt_rxpmd_match_id_map_info_t bcm56880_a0_dna_6_5_31_6_0_rxpmd_match_id_map_info = {
     .num_entries = 174,
-    .map = bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_map
+    .map = bcm56880_a0_dna_6_5_31_6_0_rxpmd_match_id_map
 };
 
-bcmpkt_rxpmd_match_id_map_info_t * bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_map_info_get(void) {
-    return &bcm56880_a0_dna_6_5_30_1_1_rxpmd_match_id_map_info;
+bcmpkt_rxpmd_match_id_map_info_t * bcm56880_a0_dna_6_5_31_6_0_rxpmd_match_id_map_info_get(void) {
+    return &bcm56880_a0_dna_6_5_31_6_0_rxpmd_match_id_map_info;
 }
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_pkt_flexhdr.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_pkt_flexhdr.c
similarity index 72%
rename from platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_pkt_flexhdr.c
rename to platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_pkt_flexhdr.c
index 5ecea72ca06c..c74f3da18a71 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_pkt_flexhdr.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_pkt_flexhdr.c
@@ -3,7 +3,7 @@
  * DO NOT EDIT THIS FILE!
  * This file is auto-generated by xfc_map_parser
  * from the NPL output file(s) map.yml
- * for device bcm56880_a0 and variant dna_6_5_30_1_1.
+ * for device bcm56880_a0 and variant dna_6_5_31_6_0.
  * Edits to this file will be lost when it is regenerated.
  *
  * $Id: $
@@ -31,292 +31,296 @@
 #include <shr/shr_error.h>
 #include <bcmpkt/bcmpkt_flexhdr.h>
 #include <bcmpkt/chip/bcm56880_a0/bcmpkt_bcm56880_a0_rxpmd.h>
-#include <bcmpkt/xfcr/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_bcmpkt_flexhdr.h>
-#include <bcmpkt/xfcr/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_bcmpkt_flexhdr_data.h>
-#include <bcmpkt/xfcr/bcm56880_a0/dna_6_5_30_1_1/bcm56880_a0_dna_6_5_30_1_1_bcmpkt_rxpmd_flex_data.h>
+#include <bcmpkt/xfcr/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_bcmpkt_flexhdr.h>
+#include <bcmpkt/xfcr/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_bcmpkt_flexhdr_data.h>
+#include <bcmpkt/xfcr/bcm56880_a0/dna_6_5_31_6_0/bcm56880_a0_dna_6_5_31_6_0_bcmpkt_rxpmd_flex_data.h>
 
 #define MASK(_bn) (((uint32_t)0x1<<(_bn))-1)
 #define WORD_FIELD_GET(_d,_s,_l) (((_d) >> (_s)) & MASK(_l))
 #define WORD_FIELD_SET(_d,_s,_l,_v) (_d)=(((_d) & ~(MASK(_l) << (_s))) | (((_v) & MASK(_l)) << (_s)))
 #define WORD_FIELD_MASK(_d,_s,_l) (_d)=((_d) | (MASK(_l) << (_s)))
 
-static void bcm56880_a0_dna_6_5_30_1_1_rxpmd_flex_reason_decode(uint32_t *data, bcmpkt_bitmap_t *reasons)
+static void bcm56880_a0_dna_6_5_31_6_0_rxpmd_flex_reason_decode(uint32_t *data, bcmpkt_bitmap_t *reasons)
 {
     uint32_t *reason = data + 0;
 
     if (reason[12] & (0x1 << 0)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU);
     }
     if (reason[12] & (0x1 << 1)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS);
     }
     if (reason[12] & (0x1 << 2)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE);
     }
     if (reason[12] & (0x1 << 3)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_RESERVED_TRACE_BIT);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_RESERVED_TRACE_BIT);
     }
     if (reason[12] & (0x1 << 4)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD);
     }
     if (reason[12] & (0x1 << 5)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED);
     }
     if (reason[12] & (0x1 << 6)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT);
     }
     if (reason[12] & (0x1 << 7)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD);
     }
     if (reason[12] & (0x1 << 8)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD);
     }
     if (reason[12] & (0x1 << 9)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS);
     }
     if (reason[12] & (0x1 << 10)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP);
     }
     if (reason[12] & (0x1 << 11)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS);
     }
     if (reason[12] & (0x1 << 12)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP);
     }
     if (reason[12] & (0x1 << 13)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR);
     }
     if (reason[12] & (0x1 << 14)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR);
     }
     if (reason[12] & (0x1 << 15)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED);
     }
     if (reason[12] & (0x1 << 16)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL);
     }
     if (reason[12] & (0x1 << 17)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_VFP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_VFP);
     }
     if (reason[12] & (0x1 << 18)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_IFP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_IFP);
     }
     if (reason[12] & (0x1 << 19)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_IFP_METER);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER);
     }
     if (reason[12] & (0x1 << 20)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_DST_FP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP);
     }
     if (reason[12] & (0x1 << 21)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_SVP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_SVP);
     }
     if (reason[12] & (0x1 << 22)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_EM_FT);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT);
     }
     if (reason[12] & (0x1 << 23)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_IVXLT);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT);
     }
     if (reason[12] & (0x1 << 24)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED);
     }
     if (reason[12] & (0x1 << 25)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED);
     }
     if (reason[12] & (0x1 << 26)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_SER_DROP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP);
     }
     if (reason[12] & (0x1 << 27)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED);
     }
     if (reason[12] & (0x1 << 28)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF);
     }
     if (reason[12] & (0x1 << 29)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED);
     }
     if (reason[12] & (0x1 << 30)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED);
     }
     if (reason[12] & (0x1 << 31)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU);
     }
     if (reason[11] & (0x1 << 0)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0);
     }
     if (reason[11] & (0x1 << 1)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1);
     }
     if (reason[11] & (0x1 << 2)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2);
     }
     if (reason[11] & (0x1 << 3)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3);
     }
     if (reason[11] & (0x1 << 4)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4);
     }
     if (reason[11] & (0x1 << 5)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5);
     }
     if (reason[11] & (0x1 << 6)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6);
     }
     if (reason[11] & (0x1 << 7)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7);
     }
     if (reason[11] & (0x1 << 15)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP);
     }
 }
 
-static void bcm56880_a0_dna_6_5_30_1_1_rxpmd_flex_reason_encode(bcmpkt_bitmap_t *reasons, uint32_t *data)
+static void bcm56880_a0_dna_6_5_31_6_0_rxpmd_flex_reason_encode(bcmpkt_bitmap_t *reasons, uint32_t *data)
 {
     uint32_t *reason = data + 0;
 
     reason[12] = 0;
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU)) {
         reason[12] |= (0x1 << 0);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS)) {
         reason[12] |= (0x1 << 1);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE)) {
         reason[12] |= (0x1 << 2);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_RESERVED_TRACE_BIT)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_RESERVED_TRACE_BIT)) {
         reason[12] |= (0x1 << 3);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD)) {
         reason[12] |= (0x1 << 4);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED)) {
         reason[12] |= (0x1 << 5);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT)) {
         reason[12] |= (0x1 << 6);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD)) {
         reason[12] |= (0x1 << 7);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD)) {
         reason[12] |= (0x1 << 8);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS)) {
         reason[12] |= (0x1 << 9);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP)) {
         reason[12] |= (0x1 << 10);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS)) {
         reason[12] |= (0x1 << 11);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP)) {
         reason[12] |= (0x1 << 12);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR)) {
         reason[12] |= (0x1 << 13);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR)) {
         reason[12] |= (0x1 << 14);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED)) {
         reason[12] |= (0x1 << 15);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL)) {
         reason[12] |= (0x1 << 16);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_VFP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_VFP)) {
         reason[12] |= (0x1 << 17);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_IFP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_IFP)) {
         reason[12] |= (0x1 << 18);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_IFP_METER)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER)) {
         reason[12] |= (0x1 << 19);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_DST_FP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP)) {
         reason[12] |= (0x1 << 20);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_SVP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_SVP)) {
         reason[12] |= (0x1 << 21);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_EM_FT)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT)) {
         reason[12] |= (0x1 << 22);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_IVXLT)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT)) {
         reason[12] |= (0x1 << 23);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED)) {
         reason[12] |= (0x1 << 24);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED)) {
         reason[12] |= (0x1 << 25);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_SER_DROP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP)) {
         reason[12] |= (0x1 << 26);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED)) {
         reason[12] |= (0x1 << 27);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF)) {
         reason[12] |= (0x1 << 28);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED)) {
         reason[12] |= (0x1 << 29);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED)) {
         reason[12] |= (0x1 << 30);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU)) {
         reason[12] |= (0x1 << 31);
     }
     reason[11] = 0;
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0)) {
         reason[11] |= (0x1 << 0);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1)) {
         reason[11] |= (0x1 << 1);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2)) {
         reason[11] |= (0x1 << 2);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3)) {
         reason[11] |= (0x1 << 3);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4)) {
         reason[11] |= (0x1 << 4);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5)) {
         reason[11] |= (0x1 << 5);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6)) {
         reason[11] |= (0x1 << 6);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7)) {
         reason[11] |= (0x1 << 7);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP)) {
         reason[11] |= (0x1 << 15);
     }
 }
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_rxpmd_flex_field_data[] = {
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_rxpmd_flex_field_data[] = {
     {
         .name = "DLB_ECMP_DESTINATION_15_0",
-        .fid = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_DLB_ECMP_DESTINATION_15_0,
+        .fid = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_DLB_ECMP_DESTINATION_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { -1, -1 }, /* Profile 2. */
             { -1, -1 }, /* Profile 3. */
             { 208, 223 }, /* Profile 4. */
-            { 208, 223 }, /* Profile 5. */
+            { 192, 207 }, /* Profile 5. */
+            { -1, -1 }, /* Profile 6. */
+            { -1, -1 }, /* Profile 7. */
+            { 208, 223 }, /* Profile 8. */
+            { 192, 207 }, /* Profile 9. */
         },
-        .profile_cnt = 6,
+        .profile_cnt = 10,
     },
     {
         .name = "DROP_CODE_15_0",
-        .fid = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0,
+        .fid = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -324,75 +328,99 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_rxpmd_flex_field_
             { 48, 63 }, /* Profile 3. */
             { 48, 63 }, /* Profile 4. */
             { 48, 63 }, /* Profile 5. */
+            { 48, 63 }, /* Profile 6. */
+            { 48, 63 }, /* Profile 7. */
+            { 48, 63 }, /* Profile 8. */
+            { 48, 63 }, /* Profile 9. */
         },
-        .profile_cnt = 6,
+        .profile_cnt = 10,
     },
     {
         .name = "DVP_15_0",
-        .fid = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_DVP_15_0,
+        .fid = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_DVP_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 320, 335 }, /* Profile 2. */
-            { 320, 335 }, /* Profile 3. */
-            { 320, 335 }, /* Profile 4. */
-            { 320, 335 }, /* Profile 5. */
+            { 240, 255 }, /* Profile 2. */
+            { 224, 239 }, /* Profile 3. */
+            { 240, 255 }, /* Profile 4. */
+            { 224, 239 }, /* Profile 5. */
+            { 240, 255 }, /* Profile 6. */
+            { 224, 239 }, /* Profile 7. */
+            { 240, 255 }, /* Profile 8. */
+            { 224, 239 }, /* Profile 9. */
         },
-        .profile_cnt = 6,
+        .profile_cnt = 10,
     },
     {
         .name = "EFFECTIVE_TTL_7_0",
-        .fid = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_7_0,
+        .fid = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_7_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 304, 311 }, /* Profile 2. */
-            { 304, 311 }, /* Profile 3. */
-            { 304, 311 }, /* Profile 4. */
-            { 304, 311 }, /* Profile 5. */
+            { 224, 231 }, /* Profile 2. */
+            { 208, 215 }, /* Profile 3. */
+            { 224, 231 }, /* Profile 4. */
+            { 208, 215 }, /* Profile 5. */
+            { 224, 231 }, /* Profile 6. */
+            { 208, 215 }, /* Profile 7. */
+            { 224, 231 }, /* Profile 8. */
+            { 208, 215 }, /* Profile 9. */
         },
-        .profile_cnt = 6,
+        .profile_cnt = 10,
     },
     {
         .name = "EM_FT_OPAQUE_OBJ_OR_IFP_OPAQUE_OBJ_15_0",
-        .fid = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_EM_FT_OPAQUE_OBJ_OR_IFP_OPAQUE_OBJ_15_0,
+        .fid = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_EM_FT_OPAQUE_OBJ_OR_IFP_OPAQUE_OBJ_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 208, 223 }, /* Profile 2. */
-            { 208, 223 }, /* Profile 3. */
+            { 192, 207 }, /* Profile 3. */
+            { -1, -1 }, /* Profile 4. */
+            { -1, -1 }, /* Profile 5. */
+            { 208, 223 }, /* Profile 6. */
+            { 192, 207 }, /* Profile 7. */
         },
-        .profile_cnt = 4,
+        .profile_cnt = 8,
     },
     {
         .name = "ENTROPY_LABEL_HIGH_3_0",
-        .fid = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_HIGH_3_0,
+        .fid = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_HIGH_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 376, 379 }, /* Profile 2. */
-            { 376, 379 }, /* Profile 3. */
-            { 376, 379 }, /* Profile 4. */
-            { 376, 379 }, /* Profile 5. */
+            { 412, 415 }, /* Profile 2. */
+            { 412, 415 }, /* Profile 3. */
+            { 412, 415 }, /* Profile 4. */
+            { 412, 415 }, /* Profile 5. */
+            { 412, 415 }, /* Profile 6. */
+            { 412, 415 }, /* Profile 7. */
+            { 412, 415 }, /* Profile 8. */
+            { 412, 415 }, /* Profile 9. */
         },
-        .profile_cnt = 6,
+        .profile_cnt = 10,
     },
     {
         .name = "ENTROPY_LABEL_LOW_15_0",
-        .fid = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0,
+        .fid = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 272, 287 }, /* Profile 2. */
-            { 272, 287 }, /* Profile 3. */
-            { 272, 287 }, /* Profile 4. */
-            { 272, 287 }, /* Profile 5. */
+            { 320, 335 }, /* Profile 2. */
+            { 304, 319 }, /* Profile 3. */
+            { 320, 335 }, /* Profile 4. */
+            { 304, 319 }, /* Profile 5. */
+            { 320, 335 }, /* Profile 6. */
+            { 304, 319 }, /* Profile 7. */
+            { 320, 335 }, /* Profile 8. */
+            { 304, 319 }, /* Profile 9. */
         },
-        .profile_cnt = 6,
+        .profile_cnt = 10,
     },
     {
         .name = "EVENT_TRACE_VECTOR_31_0",
-        .fid = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_0,
+        .fid = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -400,12 +428,16 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_rxpmd_flex_field_
             { 0, 31 }, /* Profile 3. */
             { 0, 31 }, /* Profile 4. */
             { 0, 31 }, /* Profile 5. */
+            { 0, 31 }, /* Profile 6. */
+            { 0, 31 }, /* Profile 7. */
+            { 0, 31 }, /* Profile 8. */
+            { 0, 31 }, /* Profile 9. */
         },
-        .profile_cnt = 6,
+        .profile_cnt = 10,
     },
     {
         .name = "EVENT_TRACE_VECTOR_47_32",
-        .fid = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32,
+        .fid = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -413,38 +445,50 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_rxpmd_flex_field_
             { 32, 47 }, /* Profile 3. */
             { 32, 47 }, /* Profile 4. */
             { 32, 47 }, /* Profile 5. */
+            { 32, 47 }, /* Profile 6. */
+            { 32, 47 }, /* Profile 7. */
+            { 32, 47 }, /* Profile 8. */
+            { 32, 47 }, /* Profile 9. */
         },
-        .profile_cnt = 6,
+        .profile_cnt = 10,
     },
     {
         .name = "I2E_CLASS_ID_15_0",
-        .fid = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0,
+        .fid = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 192, 207 }, /* Profile 2. */
-            { 192, 207 }, /* Profile 3. */
+            { 176, 191 }, /* Profile 3. */
             { 192, 207 }, /* Profile 4. */
-            { 192, 207 }, /* Profile 5. */
+            { 176, 191 }, /* Profile 5. */
+            { 192, 207 }, /* Profile 6. */
+            { 176, 191 }, /* Profile 7. */
+            { 192, 207 }, /* Profile 8. */
+            { 176, 191 }, /* Profile 9. */
         },
-        .profile_cnt = 6,
+        .profile_cnt = 10,
     },
     {
         .name = "IFP_IOAM_GBP_ACTION_3_0",
-        .fid = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_IFP_IOAM_GBP_ACTION_3_0,
+        .fid = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_IFP_IOAM_GBP_ACTION_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 372, 375 }, /* Profile 2. */
-            { 372, 375 }, /* Profile 3. */
-            { 372, 375 }, /* Profile 4. */
-            { 372, 375 }, /* Profile 5. */
+            { 400, 403 }, /* Profile 2. */
+            { 400, 403 }, /* Profile 3. */
+            { 400, 403 }, /* Profile 4. */
+            { 400, 403 }, /* Profile 5. */
+            { 400, 403 }, /* Profile 6. */
+            { 400, 403 }, /* Profile 7. */
+            { 400, 403 }, /* Profile 8. */
+            { 400, 403 }, /* Profile 9. */
         },
-        .profile_cnt = 6,
+        .profile_cnt = 10,
     },
     {
         .name = "IFP_TS_CONTROL_ACTION_3_0",
-        .fid = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_IFP_TS_CONTROL_ACTION_3_0,
+        .fid = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_IFP_TS_CONTROL_ACTION_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -452,12 +496,16 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_rxpmd_flex_field_
             { 384, 387 }, /* Profile 3. */
             { 384, 387 }, /* Profile 4. */
             { 384, 387 }, /* Profile 5. */
+            { 384, 387 }, /* Profile 6. */
+            { 384, 387 }, /* Profile 7. */
+            { 384, 387 }, /* Profile 8. */
+            { 384, 387 }, /* Profile 9. */
         },
-        .profile_cnt = 6,
+        .profile_cnt = 10,
     },
     {
         .name = "ING_TIMESTAMP_31_0",
-        .fid = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_0,
+        .fid = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -465,154 +513,202 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_rxpmd_flex_field_
             { 64, 95 }, /* Profile 3. */
             { 64, 95 }, /* Profile 4. */
             { 64, 95 }, /* Profile 5. */
+            { 64, 95 }, /* Profile 6. */
+            { 64, 95 }, /* Profile 7. */
+            { 64, 95 }, /* Profile 8. */
+            { 64, 95 }, /* Profile 9. */
         },
-        .profile_cnt = 6,
+        .profile_cnt = 10,
     },
     {
         .name = "INGRESS_PP_PORT_7_0",
-        .fid = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_INGRESS_PP_PORT_7_0,
+        .fid = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_INGRESS_PP_PORT_7_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 224, 231 }, /* Profile 2. */
-            { 224, 231 }, /* Profile 3. */
-            { 224, 231 }, /* Profile 4. */
-            { 224, 231 }, /* Profile 5. */
+            { 272, 279 }, /* Profile 2. */
+            { 256, 263 }, /* Profile 3. */
+            { 272, 279 }, /* Profile 4. */
+            { 256, 263 }, /* Profile 5. */
+            { 272, 279 }, /* Profile 6. */
+            { 256, 263 }, /* Profile 7. */
+            { 272, 279 }, /* Profile 8. */
+            { 256, 263 }, /* Profile 9. */
         },
-        .profile_cnt = 6,
+        .profile_cnt = 10,
     },
     {
         .name = "INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0",
-        .fid = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0,
+        .fid = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 144, 159 }, /* Profile 2. */
-            { 160, 175 }, /* Profile 3. */
-            { 144, 159 }, /* Profile 4. */
-            { 160, 175 }, /* Profile 5. */
+            { 352, 367 }, /* Profile 2. */
+            { 336, 351 }, /* Profile 3. */
+            { 352, 367 }, /* Profile 4. */
+            { 336, 351 }, /* Profile 5. */
+            { 352, 367 }, /* Profile 6. */
+            { 336, 351 }, /* Profile 7. */
+            { 352, 367 }, /* Profile 8. */
+            { 336, 351 }, /* Profile 9. */
         },
-        .profile_cnt = 6,
+        .profile_cnt = 10,
     },
     {
         .name = "INGRESS_QOS_REMARK_CTRL_3_0",
-        .fid = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0,
+        .fid = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 408, 411 }, /* Profile 2. */
-            { 408, 411 }, /* Profile 3. */
-            { 408, 411 }, /* Profile 4. */
-            { 408, 411 }, /* Profile 5. */
+            { 396, 399 }, /* Profile 2. */
+            { 396, 399 }, /* Profile 3. */
+            { 396, 399 }, /* Profile 4. */
+            { 396, 399 }, /* Profile 5. */
+            { 396, 399 }, /* Profile 6. */
+            { 396, 399 }, /* Profile 7. */
+            { 396, 399 }, /* Profile 8. */
+            { 396, 399 }, /* Profile 9. */
         },
-        .profile_cnt = 6,
+        .profile_cnt = 10,
     },
     {
         .name = "INT_PRI_3_0",
-        .fid = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_INT_PRI_3_0,
+        .fid = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_INT_PRI_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 404, 407 }, /* Profile 2. */
-            { 404, 407 }, /* Profile 3. */
-            { 404, 407 }, /* Profile 4. */
-            { 404, 407 }, /* Profile 5. */
+            { 372, 375 }, /* Profile 2. */
+            { 372, 375 }, /* Profile 3. */
+            { 372, 375 }, /* Profile 4. */
+            { 372, 375 }, /* Profile 5. */
+            { 372, 375 }, /* Profile 6. */
+            { 372, 375 }, /* Profile 7. */
+            { 372, 375 }, /* Profile 8. */
+            { 372, 375 }, /* Profile 9. */
         },
-        .profile_cnt = 6,
+        .profile_cnt = 10,
     },
     {
         .name = "L2_IIF_10_0",
-        .fid = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_L2_IIF_10_0,
+        .fid = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_L2_IIF_10_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 176, 186 }, /* Profile 2. */
             { -1, -1 }, /* Profile 3. */
             { 176, 186 }, /* Profile 4. */
+            { -1, -1 }, /* Profile 5. */
+            { 176, 186 }, /* Profile 6. */
+            { -1, -1 }, /* Profile 7. */
+            { 176, 186 }, /* Profile 8. */
         },
-        .profile_cnt = 5,
+        .profile_cnt = 9,
     },
     {
         .name = "L2_OIF_10_0",
-        .fid = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_L2_OIF_10_0,
+        .fid = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_L2_OIF_10_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { -1, -1 }, /* Profile 2. */
-            { 144, 154 }, /* Profile 3. */
+            { 352, 362 }, /* Profile 3. */
             { -1, -1 }, /* Profile 4. */
-            { 144, 154 }, /* Profile 5. */
+            { 352, 362 }, /* Profile 5. */
+            { -1, -1 }, /* Profile 6. */
+            { 352, 362 }, /* Profile 7. */
+            { -1, -1 }, /* Profile 8. */
+            { 352, 362 }, /* Profile 9. */
         },
-        .profile_cnt = 6,
+        .profile_cnt = 10,
     },
     {
         .name = "L3_IIF_13_0",
-        .fid = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_L3_IIF_13_0,
+        .fid = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_L3_IIF_13_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 240, 253 }, /* Profile 2. */
-            { 240, 253 }, /* Profile 3. */
-            { 240, 253 }, /* Profile 4. */
-            { 240, 253 }, /* Profile 5. */
+            { 288, 301 }, /* Profile 2. */
+            { 272, 285 }, /* Profile 3. */
+            { 288, 301 }, /* Profile 4. */
+            { 272, 285 }, /* Profile 5. */
+            { 288, 301 }, /* Profile 6. */
+            { 272, 285 }, /* Profile 7. */
+            { 288, 301 }, /* Profile 8. */
+            { 272, 285 }, /* Profile 9. */
         },
-        .profile_cnt = 6,
+        .profile_cnt = 10,
     },
     {
         .name = "L3_OIF_1_13_0",
-        .fid = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0,
+        .fid = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 352, 365 }, /* Profile 2. */
-            { 352, 365 }, /* Profile 3. */
-            { 352, 365 }, /* Profile 4. */
-            { 352, 365 }, /* Profile 5. */
+            { 336, 349 }, /* Profile 2. */
+            { 320, 333 }, /* Profile 3. */
+            { 336, 349 }, /* Profile 4. */
+            { 320, 333 }, /* Profile 5. */
+            { 336, 349 }, /* Profile 6. */
+            { 320, 333 }, /* Profile 7. */
+            { 336, 349 }, /* Profile 8. */
+            { 320, 333 }, /* Profile 9. */
         },
-        .profile_cnt = 6,
+        .profile_cnt = 10,
     },
     {
         .name = "MPLS_LABEL_DECAP_COUNT_3_0",
-        .fid = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_MPLS_LABEL_DECAP_COUNT_3_0,
+        .fid = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_MPLS_LABEL_DECAP_COUNT_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 380, 383 }, /* Profile 2. */
-            { 380, 383 }, /* Profile 3. */
-            { 380, 383 }, /* Profile 4. */
-            { 380, 383 }, /* Profile 5. */
+            { 388, 391 }, /* Profile 2. */
+            { 388, 391 }, /* Profile 3. */
+            { 388, 391 }, /* Profile 4. */
+            { 388, 391 }, /* Profile 5. */
+            { 388, 391 }, /* Profile 6. */
+            { 388, 391 }, /* Profile 7. */
+            { 388, 391 }, /* Profile 8. */
+            { 388, 391 }, /* Profile 9. */
         },
-        .profile_cnt = 6,
+        .profile_cnt = 10,
     },
     {
         .name = "NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0",
-        .fid = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0,
+        .fid = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 160, 175 }, /* Profile 2. */
-            { 176, 191 }, /* Profile 3. */
+            { 160, 175 }, /* Profile 3. */
             { 160, 175 }, /* Profile 4. */
-            { 176, 191 }, /* Profile 5. */
+            { 160, 175 }, /* Profile 5. */
+            { 160, 175 }, /* Profile 6. */
+            { 160, 175 }, /* Profile 7. */
+            { 160, 175 }, /* Profile 8. */
+            { 160, 175 }, /* Profile 9. */
         },
-        .profile_cnt = 6,
+        .profile_cnt = 10,
     },
     {
         .name = "NHOP_INDEX_1_15_0",
-        .fid = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_15_0,
+        .fid = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 336, 351 }, /* Profile 2. */
-            { 336, 351 }, /* Profile 3. */
-            { 336, 351 }, /* Profile 4. */
-            { 336, 351 }, /* Profile 5. */
+            { 256, 271 }, /* Profile 2. */
+            { 240, 255 }, /* Profile 3. */
+            { 256, 271 }, /* Profile 4. */
+            { 240, 255 }, /* Profile 5. */
+            { 256, 271 }, /* Profile 6. */
+            { 240, 255 }, /* Profile 7. */
+            { 256, 271 }, /* Profile 8. */
+            { 240, 255 }, /* Profile 9. */
         },
-        .profile_cnt = 6,
+        .profile_cnt = 10,
     },
     {
         .name = "PARSER_VHLEN_0_15_0",
-        .fid = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0,
+        .fid = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -620,116 +716,165 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_rxpmd_flex_field_
             { 96, 111 }, /* Profile 3. */
             { 96, 111 }, /* Profile 4. */
             { 96, 111 }, /* Profile 5. */
+            { 96, 111 }, /* Profile 6. */
+            { 96, 111 }, /* Profile 7. */
+            { 96, 111 }, /* Profile 8. */
+            { 96, 111 }, /* Profile 9. */
         },
-        .profile_cnt = 6,
+        .profile_cnt = 10,
     },
     {
         .name = "PKT_MISC_CTRL_0_3_0",
-        .fid = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0,
+        .fid = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 412, 415 }, /* Profile 2. */
-            { 412, 415 }, /* Profile 3. */
-            { 412, 415 }, /* Profile 4. */
-            { 412, 415 }, /* Profile 5. */
+            { 392, 395 }, /* Profile 2. */
+            { 392, 395 }, /* Profile 3. */
+            { 392, 395 }, /* Profile 4. */
+            { 392, 395 }, /* Profile 5. */
+            { 392, 395 }, /* Profile 6. */
+            { 392, 395 }, /* Profile 7. */
+            { 392, 395 }, /* Profile 8. */
+            { 392, 395 }, /* Profile 9. */
         },
-        .profile_cnt = 6,
+        .profile_cnt = 10,
     },
     {
         .name = "SVP_15_0",
-        .fid = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_SVP_15_0,
+        .fid = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_SVP_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 256, 271 }, /* Profile 2. */
-            { 256, 271 }, /* Profile 3. */
-            { 256, 271 }, /* Profile 4. */
-            { 256, 271 }, /* Profile 5. */
+            { 144, 159 }, /* Profile 2. */
+            { 144, 159 }, /* Profile 3. */
+            { 144, 159 }, /* Profile 4. */
+            { 144, 159 }, /* Profile 5. */
+            { 304, 319 }, /* Profile 6. */
+            { 288, 303 }, /* Profile 7. */
+            { 304, 319 }, /* Profile 8. */
+            { 288, 303 }, /* Profile 9. */
         },
-        .profile_cnt = 6,
+        .profile_cnt = 10,
     },
     {
         .name = "SVP_NETWORK_GROUP_BITMAP_3_0",
-        .fid = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0,
+        .fid = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 400, 403 }, /* Profile 2. */
-            { 400, 403 }, /* Profile 3. */
-            { 400, 403 }, /* Profile 4. */
-            { 400, 403 }, /* Profile 5. */
+            { 376, 379 }, /* Profile 2. */
+            { 376, 379 }, /* Profile 3. */
+            { 376, 379 }, /* Profile 4. */
+            { 376, 379 }, /* Profile 5. */
+            { 376, 379 }, /* Profile 6. */
+            { 376, 379 }, /* Profile 7. */
+            { 376, 379 }, /* Profile 8. */
+            { 376, 379 }, /* Profile 9. */
         },
-        .profile_cnt = 6,
+        .profile_cnt = 10,
     },
     {
         .name = "SYSTEM_DESTINATION_15_0",
-        .fid = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0,
+        .fid = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 288, 303 }, /* Profile 2. */
+            { 128, 143 }, /* Profile 2. */
+            { 128, 143 }, /* Profile 3. */
+            { 128, 143 }, /* Profile 4. */
+            { 128, 143 }, /* Profile 5. */
+            { 128, 143 }, /* Profile 6. */
+            { 128, 143 }, /* Profile 7. */
+            { 128, 143 }, /* Profile 8. */
+            { 128, 143 }, /* Profile 9. */
+        },
+        .profile_cnt = 10,
+    },
+    {
+        .name = "SYSTEM_ENTROPY_15_0",
+        .fid = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_SYSTEM_ENTROPY_15_0,
+        .profile = {
+            { -1, -1 }, /* Profile 0. */
+            { -1, -1 }, /* Profile 1. */
+            { 304, 319 }, /* Profile 2. */
             { 288, 303 }, /* Profile 3. */
-            { 288, 303 }, /* Profile 4. */
+            { 304, 319 }, /* Profile 4. */
             { 288, 303 }, /* Profile 5. */
         },
         .profile_cnt = 6,
     },
     {
         .name = "SYSTEM_OPCODE_3_0",
-        .fid = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0,
+        .fid = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 396, 399 }, /* Profile 2. */
-            { 396, 399 }, /* Profile 3. */
-            { 396, 399 }, /* Profile 4. */
-            { 396, 399 }, /* Profile 5. */
+            { 380, 383 }, /* Profile 2. */
+            { 380, 383 }, /* Profile 3. */
+            { 380, 383 }, /* Profile 4. */
+            { 380, 383 }, /* Profile 5. */
+            { 380, 383 }, /* Profile 6. */
+            { 380, 383 }, /* Profile 7. */
+            { 380, 383 }, /* Profile 8. */
+            { 380, 383 }, /* Profile 9. */
         },
-        .profile_cnt = 6,
+        .profile_cnt = 10,
     },
     {
         .name = "SYSTEM_SOURCE_15_0",
-        .fid = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_SYSTEM_SOURCE_15_0,
+        .fid = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_SYSTEM_SOURCE_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 128, 143 }, /* Profile 2. */
-            { 128, 143 }, /* Profile 3. */
-            { 128, 143 }, /* Profile 4. */
-            { 128, 143 }, /* Profile 5. */
+            { -1, -1 }, /* Profile 2. */
+            { -1, -1 }, /* Profile 3. */
+            { -1, -1 }, /* Profile 4. */
+            { -1, -1 }, /* Profile 5. */
+            { 144, 159 }, /* Profile 6. */
+            { 144, 159 }, /* Profile 7. */
+            { 144, 159 }, /* Profile 8. */
+            { 144, 159 }, /* Profile 9. */
         },
-        .profile_cnt = 6,
+        .profile_cnt = 10,
     },
     {
         .name = "TIMESTAMP_CTRL_3_0",
-        .fid = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_TIMESTAMP_CTRL_3_0,
+        .fid = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_TIMESTAMP_CTRL_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 388, 391 }, /* Profile 2. */
-            { 388, 391 }, /* Profile 3. */
-            { 388, 391 }, /* Profile 4. */
-            { 388, 391 }, /* Profile 5. */
+            { 408, 411 }, /* Profile 2. */
+            { 408, 411 }, /* Profile 3. */
+            { 408, 411 }, /* Profile 4. */
+            { 408, 411 }, /* Profile 5. */
+            { 408, 411 }, /* Profile 6. */
+            { 408, 411 }, /* Profile 7. */
+            { 408, 411 }, /* Profile 8. */
+            { 408, 411 }, /* Profile 9. */
         },
-        .profile_cnt = 6,
+        .profile_cnt = 10,
     },
     {
         .name = "TUNNEL_PROCESSING_RESULTS_1_3_0",
-        .fid = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0,
+        .fid = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 392, 395 }, /* Profile 2. */
-            { 392, 395 }, /* Profile 3. */
-            { 392, 395 }, /* Profile 4. */
-            { 392, 395 }, /* Profile 5. */
+            { 404, 407 }, /* Profile 2. */
+            { 404, 407 }, /* Profile 3. */
+            { 404, 407 }, /* Profile 4. */
+            { 404, 407 }, /* Profile 5. */
+            { 404, 407 }, /* Profile 6. */
+            { 404, 407 }, /* Profile 7. */
+            { 404, 407 }, /* Profile 8. */
+            { 404, 407 }, /* Profile 9. */
         },
-        .profile_cnt = 6,
+        .profile_cnt = 10,
     },
     {
         .name = "VFI_15_0",
-        .fid = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_VFI_15_0,
+        .fid = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_VFI_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -737,12 +882,16 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_rxpmd_flex_field_
             { 112, 127 }, /* Profile 3. */
             { 112, 127 }, /* Profile 4. */
             { 112, 127 }, /* Profile 5. */
+            { 112, 127 }, /* Profile 6. */
+            { 112, 127 }, /* Profile 7. */
+            { 112, 127 }, /* Profile 8. */
+            { 112, 127 }, /* Profile 9. */
         },
-        .profile_cnt = 6,
+        .profile_cnt = 10,
     },
     {
         .name = "VLAN_TAG_PRESERVE_CTRL_SVP_MIRROR_ENABLE_1_0",
-        .fid = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_VLAN_TAG_PRESERVE_CTRL_SVP_MIRROR_ENABLE_1_0,
+        .fid = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_VLAN_TAG_PRESERVE_CTRL_SVP_MIRROR_ENABLE_1_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -750,23 +899,31 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_rxpmd_flex_field_
             { 368, 369 }, /* Profile 3. */
             { 368, 369 }, /* Profile 4. */
             { 368, 369 }, /* Profile 5. */
+            { 368, 369 }, /* Profile 6. */
+            { 368, 369 }, /* Profile 7. */
+            { 368, 369 }, /* Profile 8. */
+            { 368, 369 }, /* Profile 9. */
         },
-        .profile_cnt = 6,
+        .profile_cnt = 10,
     },
-};static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_rxpmd_flex_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_rxpmd_flex_field_data,
+};
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_rxpmd_flex_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_rxpmd_flex_field_data,
+    .profile_bmp_cnt = 1,
+    .profile_bmp[0] = 0x3fc,
+
 };
 
-static shr_enum_map_t bcm56880_a0_dna_6_5_30_1_1_rxpmd_flex_reason_names[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT
+static shr_enum_map_t bcm56880_a0_dna_6_5_31_6_0_rxpmd_flex_reason_names[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_reasons_info_t bcm56880_a0_dna_6_5_30_1_1_rxpmd_flex_reasons_info = {
-    .num_reasons = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_COUNT,
-    .reason_names = bcm56880_a0_dna_6_5_30_1_1_rxpmd_flex_reason_names,
-    .reason_encode = bcm56880_a0_dna_6_5_30_1_1_rxpmd_flex_reason_encode,
-    .reason_decode = bcm56880_a0_dna_6_5_30_1_1_rxpmd_flex_reason_decode,
+static bcmpkt_flex_reasons_info_t bcm56880_a0_dna_6_5_31_6_0_rxpmd_flex_reasons_info = {
+    .num_reasons = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_COUNT,
+    .reason_names = bcm56880_a0_dna_6_5_31_6_0_rxpmd_flex_reason_names,
+    .reason_encode = bcm56880_a0_dna_6_5_31_6_0_rxpmd_flex_reason_encode,
+    .reason_decode = bcm56880_a0_dna_6_5_31_6_0_rxpmd_flex_reason_decode,
 };
 
 
@@ -909,7 +1066,7 @@ static int32_t bcmpkt_arp_t_target_ip_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_arp_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ARP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_arp_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_FID_COUNT] = {
     bcmpkt_arp_t_hardware_len_get,
     bcmpkt_arp_t_hardware_type_get,
     bcmpkt_arp_t_operation_get,
@@ -921,7 +1078,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_arp_t_fget[BCM56880_A0_DNA_6_
     bcmpkt_arp_t_target_ip_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_arp_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ARP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_arp_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_FID_COUNT] = {
     bcmpkt_arp_t_hardware_len_set,
     bcmpkt_arp_t_hardware_type_set,
     bcmpkt_arp_t_operation_set,
@@ -933,13 +1090,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_arp_t_fset[BCM56880_A0_DNA_6_
     bcmpkt_arp_t_target_ip_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_arp_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_arp_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_arp_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ARP_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_arp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_arp_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_arp_t_field_data,
 };
 
 
@@ -1036,7 +1193,7 @@ static int32_t bcmpkt_authen_t_spi_set(uint32_t *data, int profile, uint32_t val
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_authen_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_AUTHEN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_authen_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T_FID_COUNT] = {
     bcmpkt_authen_t_data_get,
     bcmpkt_authen_t_next_header_get,
     bcmpkt_authen_t_payload_len_get,
@@ -1045,7 +1202,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_authen_t_fget[BCM56880_A0_DNA
     bcmpkt_authen_t_spi_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_authen_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_AUTHEN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_authen_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T_FID_COUNT] = {
     bcmpkt_authen_t_data_set,
     bcmpkt_authen_t_next_header_set,
     bcmpkt_authen_t_payload_len_set,
@@ -1054,13 +1211,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_authen_t_fset[BCM56880_A0_DNA
     bcmpkt_authen_t_spi_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_authen_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_AUTHEN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_authen_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_authen_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_AUTHEN_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_authen_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_authen_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_authen_t_field_data,
 };
 
 
@@ -1309,7 +1466,7 @@ static int32_t bcmpkt_bfd_t_version_set(uint32_t *data, int profile, uint32_t va
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_bfd_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_bfd_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_FID_COUNT] = {
     bcmpkt_bfd_t_ap_get,
     bcmpkt_bfd_t_bfd_length_get,
     bcmpkt_bfd_t_cpi_get,
@@ -1328,7 +1485,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_bfd_t_fget[BCM56880_A0_DNA_6_
     bcmpkt_bfd_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_bfd_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_bfd_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_FID_COUNT] = {
     bcmpkt_bfd_t_ap_set,
     bcmpkt_bfd_t_bfd_length_set,
     bcmpkt_bfd_t_cpi_set,
@@ -1347,13 +1504,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_bfd_t_fset[BCM56880_A0_DNA_6_
     bcmpkt_bfd_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_bfd_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_bfd_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_bfd_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_BFD_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_bfd_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_bfd_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_bfd_t_field_data,
 };
 
 
@@ -1387,23 +1544,23 @@ static int32_t bcmpkt_cntag_t_tpid_set(uint32_t *data, int profile, uint32_t val
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_cntag_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CNTAG_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_cntag_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CNTAG_T_FID_COUNT] = {
     bcmpkt_cntag_t_rpid_get,
     bcmpkt_cntag_t_tpid_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_cntag_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CNTAG_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_cntag_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CNTAG_T_FID_COUNT] = {
     bcmpkt_cntag_t_rpid_set,
     bcmpkt_cntag_t_tpid_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_cntag_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CNTAG_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_cntag_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CNTAG_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_cntag_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CNTAG_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_cntag_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_cntag_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CNTAG_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_cntag_t_field_data,
 };
 
 
@@ -1551,7 +1708,7 @@ static int32_t bcmpkt_cpu_composites_0_ifa_l2_t_macsa_set(uint32_t *data, int pr
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_cpu_composites_0_ifa_l2_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_cpu_composites_0_ifa_l2_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_FID_COUNT] = {
     bcmpkt_cpu_composites_0_ifa_l2_t_dma_cont0_get,
     bcmpkt_cpu_composites_0_ifa_l2_t_dma_cont1_get,
     bcmpkt_cpu_composites_0_ifa_l2_t_dma_cont2_get,
@@ -1563,7 +1720,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_cpu_composites_0_ifa_l2_t_fge
     bcmpkt_cpu_composites_0_ifa_l2_t_macsa_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_cpu_composites_0_ifa_l2_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_cpu_composites_0_ifa_l2_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_FID_COUNT] = {
     bcmpkt_cpu_composites_0_ifa_l2_t_dma_cont0_set,
     bcmpkt_cpu_composites_0_ifa_l2_t_dma_cont1_set,
     bcmpkt_cpu_composites_0_ifa_l2_t_dma_cont2_set,
@@ -1575,13 +1732,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_cpu_composites_0_ifa_l2_t_fse
     bcmpkt_cpu_composites_0_ifa_l2_t_macsa_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_cpu_composites_0_ifa_l2_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_cpu_composites_0_ifa_l2_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_cpu_composites_0_ifa_l2_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_cpu_composites_0_ifa_l2_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_cpu_composites_0_ifa_l2_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_IFA_L2_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_cpu_composites_0_ifa_l2_t_field_data,
 };
 
 
@@ -1697,7 +1854,7 @@ static int32_t bcmpkt_cpu_composites_0_t_dma_cont6_set(uint32_t *data, int profi
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_cpu_composites_0_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_cpu_composites_0_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
     bcmpkt_cpu_composites_0_t_dma_cont0_get,
     bcmpkt_cpu_composites_0_t_dma_cont1_get,
     bcmpkt_cpu_composites_0_t_dma_cont2_get,
@@ -1707,7 +1864,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_cpu_composites_0_t_fget[BCM56
     bcmpkt_cpu_composites_0_t_dma_cont6_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_cpu_composites_0_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_cpu_composites_0_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
     bcmpkt_cpu_composites_0_t_dma_cont0_set,
     bcmpkt_cpu_composites_0_t_dma_cont1_set,
     bcmpkt_cpu_composites_0_t_dma_cont2_set,
@@ -1717,13 +1874,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_cpu_composites_0_t_fset[BCM56
     bcmpkt_cpu_composites_0_t_dma_cont6_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_cpu_composites_0_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_cpu_composites_0_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_cpu_composites_0_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_cpu_composites_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_cpu_composites_0_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_cpu_composites_0_t_field_data,
 };
 
 
@@ -1903,7 +2060,7 @@ static int32_t bcmpkt_cpu_composites_1_t_dma_cont9_set(uint32_t *data, int profi
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_cpu_composites_1_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_cpu_composites_1_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
     bcmpkt_cpu_composites_1_t_dma_cont10_get,
     bcmpkt_cpu_composites_1_t_dma_cont11_get,
     bcmpkt_cpu_composites_1_t_dma_cont12_get,
@@ -1917,7 +2074,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_cpu_composites_1_t_fget[BCM56
     bcmpkt_cpu_composites_1_t_dma_cont9_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_cpu_composites_1_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_cpu_composites_1_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
     bcmpkt_cpu_composites_1_t_dma_cont10_set,
     bcmpkt_cpu_composites_1_t_dma_cont11_set,
     bcmpkt_cpu_composites_1_t_dma_cont12_set,
@@ -1931,13 +2088,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_cpu_composites_1_t_fset[BCM56
     bcmpkt_cpu_composites_1_t_dma_cont9_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_cpu_composites_1_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_cpu_composites_1_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_cpu_composites_1_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_cpu_composites_1_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_cpu_composites_1_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_cpu_composites_1_t_field_data,
 };
 
 
@@ -1987,25 +2144,25 @@ static int32_t bcmpkt_dest_option_t_option_set(uint32_t *data, int profile, uint
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_dest_option_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_DEST_OPTION_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_dest_option_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_DEST_OPTION_T_FID_COUNT] = {
     bcmpkt_dest_option_t_hdr_ext_len_get,
     bcmpkt_dest_option_t_next_header_get,
     bcmpkt_dest_option_t_option_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_dest_option_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_DEST_OPTION_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_dest_option_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_DEST_OPTION_T_FID_COUNT] = {
     bcmpkt_dest_option_t_hdr_ext_len_set,
     bcmpkt_dest_option_t_next_header_set,
     bcmpkt_dest_option_t_option_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_dest_option_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_DEST_OPTION_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_dest_option_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_DEST_OPTION_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_dest_option_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_DEST_OPTION_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_dest_option_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_dest_option_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_DEST_OPTION_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_dest_option_t_field_data,
 };
 
 
@@ -2145,7 +2302,7 @@ static int32_t bcmpkt_erspan3_fixed_hdr_t_vlan_set(uint32_t *data, int profile,
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_erspan3_fixed_hdr_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_erspan3_fixed_hdr_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
     bcmpkt_erspan3_fixed_hdr_t_bso_get,
     bcmpkt_erspan3_fixed_hdr_t_cos_get,
     bcmpkt_erspan3_fixed_hdr_t_gbp_sid_get,
@@ -2157,7 +2314,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_erspan3_fixed_hdr_t_fget[BCM5
     bcmpkt_erspan3_fixed_hdr_t_vlan_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_erspan3_fixed_hdr_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_erspan3_fixed_hdr_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
     bcmpkt_erspan3_fixed_hdr_t_bso_set,
     bcmpkt_erspan3_fixed_hdr_t_cos_set,
     bcmpkt_erspan3_fixed_hdr_t_gbp_sid_set,
@@ -2169,13 +2326,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_erspan3_fixed_hdr_t_fset[BCM5
     bcmpkt_erspan3_fixed_hdr_t_vlan_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_erspan3_fixed_hdr_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_erspan3_fixed_hdr_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_erspan3_fixed_hdr_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_erspan3_fixed_hdr_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_erspan3_fixed_hdr_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_erspan3_fixed_hdr_t_field_data,
 };
 
 
@@ -2240,27 +2397,27 @@ static int32_t bcmpkt_erspan3_subhdr_5_t_timestamp_set(uint32_t *data, int profi
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_erspan3_subhdr_5_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_erspan3_subhdr_5_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
     bcmpkt_erspan3_subhdr_5_t_platform_id_get,
     bcmpkt_erspan3_subhdr_5_t_port_id_get,
     bcmpkt_erspan3_subhdr_5_t_switch_id_get,
     bcmpkt_erspan3_subhdr_5_t_timestamp_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_erspan3_subhdr_5_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_erspan3_subhdr_5_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
     bcmpkt_erspan3_subhdr_5_t_platform_id_set,
     bcmpkt_erspan3_subhdr_5_t_port_id_set,
     bcmpkt_erspan3_subhdr_5_t_switch_id_set,
     bcmpkt_erspan3_subhdr_5_t_timestamp_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_erspan3_subhdr_5_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_erspan3_subhdr_5_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_erspan3_subhdr_5_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_erspan3_subhdr_5_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_erspan3_subhdr_5_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_erspan3_subhdr_5_t_field_data,
 };
 
 
@@ -2341,7 +2498,7 @@ static int32_t bcmpkt_esp_t_spi_set(uint32_t *data, int profile, uint32_t val) {
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_esp_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ESP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_esp_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ESP_T_FID_COUNT] = {
     bcmpkt_esp_t_next_header_get,
     bcmpkt_esp_t_pad_get,
     bcmpkt_esp_t_pad_len_get,
@@ -2349,7 +2506,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_esp_t_fget[BCM56880_A0_DNA_6_
     bcmpkt_esp_t_spi_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_esp_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ESP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_esp_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ESP_T_FID_COUNT] = {
     bcmpkt_esp_t_next_header_set,
     bcmpkt_esp_t_pad_set,
     bcmpkt_esp_t_pad_len_set,
@@ -2357,13 +2514,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_esp_t_fset[BCM56880_A0_DNA_6_
     bcmpkt_esp_t_spi_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_esp_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ESP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_esp_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ESP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_esp_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ESP_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_esp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_esp_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ESP_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_esp_t_field_data,
 };
 
 
@@ -2398,23 +2555,23 @@ static int32_t bcmpkt_etag_t_tpid_set(uint32_t *data, int profile, uint32_t val)
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_etag_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ETAG_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_etag_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ETAG_T_FID_COUNT] = {
     bcmpkt_etag_t_tag_get,
     bcmpkt_etag_t_tpid_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_etag_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ETAG_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_etag_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ETAG_T_FID_COUNT] = {
     bcmpkt_etag_t_tag_set,
     bcmpkt_etag_t_tpid_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_etag_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ETAG_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_etag_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ETAG_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_etag_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ETAG_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_etag_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_etag_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ETAG_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_etag_t_field_data,
 };
 
 
@@ -2433,21 +2590,21 @@ static int32_t bcmpkt_ethertype_t_type_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_ethertype_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_ethertype_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
     bcmpkt_ethertype_t_type_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_ethertype_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_ethertype_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
     bcmpkt_ethertype_t_type_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_ethertype_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_ethertype_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_ethertype_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ETHERTYPE_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_ethertype_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_ethertype_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ETHERTYPE_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_ethertype_t_field_data,
 };
 
 
@@ -2512,27 +2669,27 @@ static int32_t bcmpkt_frag_t_reserved_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_frag_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_FRAG_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_frag_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_FRAG_T_FID_COUNT] = {
     bcmpkt_frag_t_frag_info_get,
     bcmpkt_frag_t_id_get,
     bcmpkt_frag_t_next_header_get,
     bcmpkt_frag_t_reserved_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_frag_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_FRAG_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_frag_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_FRAG_T_FID_COUNT] = {
     bcmpkt_frag_t_frag_info_set,
     bcmpkt_frag_t_id_set,
     bcmpkt_frag_t_next_header_set,
     bcmpkt_frag_t_reserved_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_frag_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_FRAG_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_frag_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_FRAG_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_frag_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_FRAG_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_frag_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_frag_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_FRAG_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_frag_t_field_data,
 };
 
 
@@ -2716,52 +2873,52 @@ static int32_t bcmpkt_generic_loopback_t_reserved_1_set(uint32_t *data, int prof
     return ret;
 }
 
-static int32_t bcmpkt_generic_loopback_t_reserved_2_get(uint32_t *data, int profile, uint32_t *val) {
+static int32_t bcmpkt_generic_loopback_t_source_system_port_get(uint32_t *data, int profile, uint32_t *val) {
     int32_t ret = SHR_E_NONE;
 
-    *val = WORD_FIELD_GET(data[3], 0, 16);
+    *val = WORD_FIELD_GET(data[2], 16, 16);
 
     return ret;
 }
 
-static int32_t bcmpkt_generic_loopback_t_reserved_2_set(uint32_t *data, int profile, uint32_t val) {
+static int32_t bcmpkt_generic_loopback_t_source_system_port_set(uint32_t *data, int profile, uint32_t val) {
     int32_t ret = SHR_E_NONE;
 
-    WORD_FIELD_SET(data[3], 0, 16, val);
+    WORD_FIELD_SET(data[2], 16, 16, val);
     return ret;
 }
 
-static int32_t bcmpkt_generic_loopback_t_source_system_port_get(uint32_t *data, int profile, uint32_t *val) {
+static int32_t bcmpkt_generic_loopback_t_start_byte_get(uint32_t *data, int profile, uint32_t *val) {
     int32_t ret = SHR_E_NONE;
 
-    *val = WORD_FIELD_GET(data[2], 16, 16);
+    *val = WORD_FIELD_GET(data[0], 24, 8);
 
     return ret;
 }
 
-static int32_t bcmpkt_generic_loopback_t_source_system_port_set(uint32_t *data, int profile, uint32_t val) {
+static int32_t bcmpkt_generic_loopback_t_start_byte_set(uint32_t *data, int profile, uint32_t val) {
     int32_t ret = SHR_E_NONE;
 
-    WORD_FIELD_SET(data[2], 16, 16, val);
+    WORD_FIELD_SET(data[0], 24, 8, val);
     return ret;
 }
 
-static int32_t bcmpkt_generic_loopback_t_start_byte_get(uint32_t *data, int profile, uint32_t *val) {
+static int32_t bcmpkt_generic_loopback_t_svp_get(uint32_t *data, int profile, uint32_t *val) {
     int32_t ret = SHR_E_NONE;
 
-    *val = WORD_FIELD_GET(data[0], 24, 8);
+    *val = WORD_FIELD_GET(data[3], 0, 16);
 
     return ret;
 }
 
-static int32_t bcmpkt_generic_loopback_t_start_byte_set(uint32_t *data, int profile, uint32_t val) {
+static int32_t bcmpkt_generic_loopback_t_svp_set(uint32_t *data, int profile, uint32_t val) {
     int32_t ret = SHR_E_NONE;
 
-    WORD_FIELD_SET(data[0], 24, 8, val);
+    WORD_FIELD_SET(data[3], 0, 16, val);
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_generic_loopback_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_generic_loopback_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
     bcmpkt_generic_loopback_t_destination_obj_get,
     bcmpkt_generic_loopback_t_destination_type_get,
     bcmpkt_generic_loopback_t_entropy_obj_get,
@@ -2774,12 +2931,12 @@ bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_generic_loopback_t_fget[BCM56
     bcmpkt_generic_loopback_t_processing_ctrl_1_get,
     bcmpkt_generic_loopback_t_qos_obj_get,
     bcmpkt_generic_loopback_t_reserved_1_get,
-    bcmpkt_generic_loopback_t_reserved_2_get,
     bcmpkt_generic_loopback_t_source_system_port_get,
     bcmpkt_generic_loopback_t_start_byte_get,
+    bcmpkt_generic_loopback_t_svp_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_generic_loopback_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_generic_loopback_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
     bcmpkt_generic_loopback_t_destination_obj_set,
     bcmpkt_generic_loopback_t_destination_type_set,
     bcmpkt_generic_loopback_t_entropy_obj_set,
@@ -2792,18 +2949,18 @@ bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_generic_loopback_t_fset[BCM56
     bcmpkt_generic_loopback_t_processing_ctrl_1_set,
     bcmpkt_generic_loopback_t_qos_obj_set,
     bcmpkt_generic_loopback_t_reserved_1_set,
-    bcmpkt_generic_loopback_t_reserved_2_set,
     bcmpkt_generic_loopback_t_source_system_port_set,
     bcmpkt_generic_loopback_t_start_byte_set,
+    bcmpkt_generic_loopback_t_svp_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_generic_loopback_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_generic_loopback_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_generic_loopback_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_generic_loopback_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_generic_loopback_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_generic_loopback_t_field_data,
 };
 
 
@@ -2882,7 +3039,7 @@ static int32_t bcmpkt_gpe_t_vni_set(uint32_t *data, int profile, uint32_t val) {
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_gpe_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GPE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_gpe_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GPE_T_FID_COUNT] = {
     bcmpkt_gpe_t_flags_get,
     bcmpkt_gpe_t_next_protocol_get,
     bcmpkt_gpe_t_reserved0_get,
@@ -2890,7 +3047,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_gpe_t_fget[BCM56880_A0_DNA_6_
     bcmpkt_gpe_t_vni_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_gpe_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GPE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_gpe_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GPE_T_FID_COUNT] = {
     bcmpkt_gpe_t_flags_set,
     bcmpkt_gpe_t_next_protocol_set,
     bcmpkt_gpe_t_reserved0_set,
@@ -2898,13 +3055,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_gpe_t_fset[BCM56880_A0_DNA_6_
     bcmpkt_gpe_t_vni_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_gpe_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GPE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_gpe_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GPE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_gpe_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GPE_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_gpe_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_gpe_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GPE_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_gpe_t_field_data,
 };
 
 
@@ -2938,23 +3095,23 @@ static int32_t bcmpkt_gre_chksum_t_offset_set(uint32_t *data, int profile, uint3
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_gre_chksum_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_CHKSUM_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_gre_chksum_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT] = {
     bcmpkt_gre_chksum_t_checksum_get,
     bcmpkt_gre_chksum_t_offset_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_gre_chksum_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_CHKSUM_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_gre_chksum_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT] = {
     bcmpkt_gre_chksum_t_checksum_set,
     bcmpkt_gre_chksum_t_offset_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_gre_chksum_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_CHKSUM_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_gre_chksum_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_CHKSUM_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_gre_chksum_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_CHKSUM_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_gre_chksum_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_gre_chksum_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_gre_chksum_t_field_data,
 };
 
 
@@ -2974,21 +3131,21 @@ static int32_t bcmpkt_gre_key_t_key_set(uint32_t *data, int profile, uint32_t va
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_gre_key_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_KEY_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_gre_key_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_KEY_T_FID_COUNT] = {
     bcmpkt_gre_key_t_key_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_gre_key_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_KEY_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_gre_key_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_KEY_T_FID_COUNT] = {
     bcmpkt_gre_key_t_key_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_gre_key_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_KEY_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_gre_key_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_KEY_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_gre_key_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_KEY_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_gre_key_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_gre_key_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_KEY_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_gre_key_t_field_data,
 };
 
 
@@ -3008,21 +3165,21 @@ static int32_t bcmpkt_gre_rout_t_routing_set(uint32_t *data, int profile, uint32
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_gre_rout_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_ROUT_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_gre_rout_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_ROUT_T_FID_COUNT] = {
     bcmpkt_gre_rout_t_routing_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_gre_rout_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_ROUT_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_gre_rout_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_ROUT_T_FID_COUNT] = {
     bcmpkt_gre_rout_t_routing_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_gre_rout_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_ROUT_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_gre_rout_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_ROUT_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_gre_rout_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_ROUT_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_gre_rout_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_gre_rout_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_ROUT_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_gre_rout_t_field_data,
 };
 
 
@@ -3042,21 +3199,21 @@ static int32_t bcmpkt_gre_seq_t_sequence_set(uint32_t *data, int profile, uint32
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_gre_seq_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_SEQ_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_gre_seq_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_SEQ_T_FID_COUNT] = {
     bcmpkt_gre_seq_t_sequence_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_gre_seq_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_SEQ_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_gre_seq_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_SEQ_T_FID_COUNT] = {
     bcmpkt_gre_seq_t_sequence_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_gre_seq_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_SEQ_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_gre_seq_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_SEQ_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_gre_seq_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_SEQ_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_gre_seq_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_gre_seq_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_SEQ_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_gre_seq_t_field_data,
 };
 
 
@@ -3120,27 +3277,27 @@ static int32_t bcmpkt_gre_t_version_set(uint32_t *data, int profile, uint32_t va
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_gre_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_gre_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_T_FID_COUNT] = {
     bcmpkt_gre_t_c_r_k_s_get,
     bcmpkt_gre_t_protocol_get,
     bcmpkt_gre_t_reserved_get,
     bcmpkt_gre_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_gre_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_gre_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_T_FID_COUNT] = {
     bcmpkt_gre_t_c_r_k_s_set,
     bcmpkt_gre_t_protocol_set,
     bcmpkt_gre_t_reserved_set,
     bcmpkt_gre_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_gre_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_gre_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_gre_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_GRE_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_gre_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_gre_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_GRE_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_gre_t_field_data,
 };
 
 
@@ -3339,7 +3496,7 @@ static int32_t bcmpkt_hg3_base_t_version_set(uint32_t *data, int profile, uint32
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_hg3_base_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_hg3_base_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_FID_COUNT] = {
     bcmpkt_hg3_base_t_cn_get,
     bcmpkt_hg3_base_t_cng_get,
     bcmpkt_hg3_base_t_entropy_get,
@@ -3355,7 +3512,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_hg3_base_t_fget[BCM56880_A0_D
     bcmpkt_hg3_base_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_hg3_base_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_hg3_base_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_FID_COUNT] = {
     bcmpkt_hg3_base_t_cn_set,
     bcmpkt_hg3_base_t_cng_set,
     bcmpkt_hg3_base_t_entropy_set,
@@ -3371,13 +3528,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_hg3_base_t_fset[BCM56880_A0_D
     bcmpkt_hg3_base_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_hg3_base_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_hg3_base_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_hg3_base_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_BASE_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_hg3_base_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_hg3_base_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_hg3_base_t_field_data,
 };
 
 
@@ -3471,7 +3628,7 @@ static int32_t bcmpkt_hg3_extension_0_t_svp_set(uint32_t *data, int profile, uin
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_hg3_extension_0_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_hg3_extension_0_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT] = {
     bcmpkt_hg3_extension_0_t_class_id_lsb_get,
     bcmpkt_hg3_extension_0_t_class_id_msb_get,
     bcmpkt_hg3_extension_0_t_dvp_or_l3_iif_get,
@@ -3480,7 +3637,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_hg3_extension_0_t_fget[BCM568
     bcmpkt_hg3_extension_0_t_svp_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_hg3_extension_0_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_hg3_extension_0_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT] = {
     bcmpkt_hg3_extension_0_t_class_id_lsb_set,
     bcmpkt_hg3_extension_0_t_class_id_msb_set,
     bcmpkt_hg3_extension_0_t_dvp_or_l3_iif_set,
@@ -3489,13 +3646,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_hg3_extension_0_t_fset[BCM568
     bcmpkt_hg3_extension_0_t_svp_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_hg3_extension_0_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_EXTENSION_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_hg3_extension_0_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_hg3_extension_0_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_hg3_extension_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_hg3_extension_0_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_hg3_extension_0_t_field_data,
 };
 
 
@@ -3545,25 +3702,25 @@ static int32_t bcmpkt_hop_by_hop_t_option_set(uint32_t *data, int profile, uint3
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_hop_by_hop_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HOP_BY_HOP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_hop_by_hop_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT] = {
     bcmpkt_hop_by_hop_t_hdr_ext_len_get,
     bcmpkt_hop_by_hop_t_next_header_get,
     bcmpkt_hop_by_hop_t_option_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_hop_by_hop_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HOP_BY_HOP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_hop_by_hop_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT] = {
     bcmpkt_hop_by_hop_t_hdr_ext_len_set,
     bcmpkt_hop_by_hop_t_next_header_set,
     bcmpkt_hop_by_hop_t_option_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_hop_by_hop_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HOP_BY_HOP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_hop_by_hop_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HOP_BY_HOP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_hop_by_hop_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_HOP_BY_HOP_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_hop_by_hop_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_hop_by_hop_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_hop_by_hop_t_field_data,
 };
 
 
@@ -3612,25 +3769,25 @@ static int32_t bcmpkt_icmp_t_icmp_type_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_icmp_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ICMP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_icmp_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ICMP_T_FID_COUNT] = {
     bcmpkt_icmp_t_checksum_get,
     bcmpkt_icmp_t_code_get,
     bcmpkt_icmp_t_icmp_type_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_icmp_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ICMP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_icmp_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ICMP_T_FID_COUNT] = {
     bcmpkt_icmp_t_checksum_set,
     bcmpkt_icmp_t_code_set,
     bcmpkt_icmp_t_icmp_type_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_icmp_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_icmp_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_icmp_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ICMP_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_icmp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_icmp_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ICMP_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_icmp_t_field_data,
 };
 
 
@@ -3664,23 +3821,23 @@ static int32_t bcmpkt_ifa_flex_md_0_a_t_lns_device_id_set(uint32_t *data, int pr
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_0_a_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_0_a_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_0_a_t_fwd_hdr_ttl_get,
     bcmpkt_ifa_flex_md_0_a_t_lns_device_id_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_0_a_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_0_a_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_0_a_t_fwd_hdr_ttl_set,
     bcmpkt_ifa_flex_md_0_a_t_lns_device_id_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_0_a_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_0_A_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_0_a_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_0_A_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_0_a_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_0_a_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_0_a_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_0_a_t_field_data,
 };
 
 
@@ -3744,27 +3901,27 @@ static int32_t bcmpkt_ifa_flex_md_0_b_t_rx_timestamp_sec_set(uint32_t *data, int
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_0_b_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_0_b_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_0_b_t_cn_get,
     bcmpkt_ifa_flex_md_0_b_t_port_speed_get,
     bcmpkt_ifa_flex_md_0_b_t_queue_id_get,
     bcmpkt_ifa_flex_md_0_b_t_rx_timestamp_sec_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_0_b_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_0_b_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_0_b_t_cn_set,
     bcmpkt_ifa_flex_md_0_b_t_port_speed_set,
     bcmpkt_ifa_flex_md_0_b_t_queue_id_set,
     bcmpkt_ifa_flex_md_0_b_t_rx_timestamp_sec_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_0_b_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_0_B_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_0_b_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_0_B_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_0_b_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_0_b_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_0_b_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_0_b_t_field_data,
 };
 
 
@@ -3814,25 +3971,25 @@ static int32_t bcmpkt_ifa_flex_md_1_t_rx_timestamp_nanosec_set(uint32_t *data, i
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_1_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_1_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_1_t_egress_port_id_get,
     bcmpkt_ifa_flex_md_1_t_ingress_port_id_get,
     bcmpkt_ifa_flex_md_1_t_rx_timestamp_nanosec_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_1_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_1_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_1_t_egress_port_id_set,
     bcmpkt_ifa_flex_md_1_t_ingress_port_id_set,
     bcmpkt_ifa_flex_md_1_t_rx_timestamp_nanosec_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_1_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_1_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_1_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_1_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_1_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_1_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_1_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_1_t_field_data,
 };
 
 
@@ -3868,23 +4025,23 @@ static int32_t bcmpkt_ifa_flex_md_2_t_tx_queue_byte_count_set(uint32_t *data, in
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_2_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_2_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_2_t_residence_time_nanosec_get,
     bcmpkt_ifa_flex_md_2_t_tx_queue_byte_count_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_2_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_2_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_2_t_residence_time_nanosec_set,
     bcmpkt_ifa_flex_md_2_t_tx_queue_byte_count_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_2_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_2_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_2_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_2_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_2_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_2_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_2_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_2_t_field_data,
 };
 
 
@@ -3920,23 +4077,23 @@ static int32_t bcmpkt_ifa_flex_md_3_t_mmu_stat_1_set(uint32_t *data, int profile
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_3_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_3_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_3_t_mmu_stat_0_get,
     bcmpkt_ifa_flex_md_3_t_mmu_stat_1_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_3_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_3_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_3_t_mmu_stat_0_set,
     bcmpkt_ifa_flex_md_3_t_mmu_stat_1_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_3_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_3_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_3_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_3_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_3_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_3_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_3_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_3_t_field_data,
 };
 
 
@@ -4015,7 +4172,7 @@ static int32_t bcmpkt_ifa_header_t_ver_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_ifa_header_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_HEADER_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_ifa_header_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_HEADER_T_FID_COUNT] = {
     bcmpkt_ifa_header_t_flags_get,
     bcmpkt_ifa_header_t_gns_get,
     bcmpkt_ifa_header_t_max_length_get,
@@ -4023,7 +4180,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_ifa_header_t_fget[BCM56880_A0
     bcmpkt_ifa_header_t_ver_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_ifa_header_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_HEADER_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_ifa_header_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_HEADER_T_FID_COUNT] = {
     bcmpkt_ifa_header_t_flags_set,
     bcmpkt_ifa_header_t_gns_set,
     bcmpkt_ifa_header_t_max_length_set,
@@ -4031,13 +4188,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_ifa_header_t_fset[BCM56880_A0
     bcmpkt_ifa_header_t_ver_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_ifa_header_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_HEADER_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_ifa_header_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_HEADER_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_ifa_header_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_HEADER_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_ifa_header_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_ifa_header_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_HEADER_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_ifa_header_t_field_data,
 };
 
 
@@ -4086,25 +4243,25 @@ static int32_t bcmpkt_ifa_md_base_t_request_vector_set(uint32_t *data, int profi
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_ifa_md_base_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_MD_BASE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_ifa_md_base_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_MD_BASE_T_FID_COUNT] = {
     bcmpkt_ifa_md_base_t_action_vector_get,
     bcmpkt_ifa_md_base_t_hop_limit_current_length_get,
     bcmpkt_ifa_md_base_t_request_vector_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_ifa_md_base_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_MD_BASE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_ifa_md_base_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_MD_BASE_T_FID_COUNT] = {
     bcmpkt_ifa_md_base_t_action_vector_set,
     bcmpkt_ifa_md_base_t_hop_limit_current_length_set,
     bcmpkt_ifa_md_base_t_request_vector_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_ifa_md_base_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_MD_BASE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_ifa_md_base_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_MD_BASE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_ifa_md_base_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_MD_BASE_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_ifa_md_base_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_ifa_md_base_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_MD_BASE_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_ifa_md_base_t_field_data,
 };
 
 
@@ -4169,27 +4326,27 @@ static int32_t bcmpkt_ifa_metadata_t_request_vector_set(uint32_t *data, int prof
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_ifa_metadata_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_METADATA_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_ifa_metadata_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_T_FID_COUNT] = {
     bcmpkt_ifa_metadata_t_action_vector_get,
     bcmpkt_ifa_metadata_t_hop_limit_current_length_get,
     bcmpkt_ifa_metadata_t_metadata_get,
     bcmpkt_ifa_metadata_t_request_vector_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_ifa_metadata_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_METADATA_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_ifa_metadata_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_T_FID_COUNT] = {
     bcmpkt_ifa_metadata_t_action_vector_set,
     bcmpkt_ifa_metadata_t_hop_limit_current_length_set,
     bcmpkt_ifa_metadata_t_metadata_set,
     bcmpkt_ifa_metadata_t_request_vector_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_ifa_metadata_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_METADATA_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_ifa_metadata_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_ifa_metadata_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IFA_METADATA_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_ifa_metadata_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_ifa_metadata_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_ifa_metadata_t_field_data,
 };
 
 
@@ -4254,27 +4411,27 @@ static int32_t bcmpkt_igmp_t_max_resp_time_set(uint32_t *data, int profile, uint
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_igmp_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IGMP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_igmp_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IGMP_T_FID_COUNT] = {
     bcmpkt_igmp_t_checksum_get,
     bcmpkt_igmp_t_group_address_get,
     bcmpkt_igmp_t_igmp_type_get,
     bcmpkt_igmp_t_max_resp_time_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_igmp_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IGMP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_igmp_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IGMP_T_FID_COUNT] = {
     bcmpkt_igmp_t_checksum_set,
     bcmpkt_igmp_t_group_address_set,
     bcmpkt_igmp_t_igmp_type_set,
     bcmpkt_igmp_t_max_resp_time_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_igmp_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IGMP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_igmp_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IGMP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_igmp_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IGMP_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_igmp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_igmp_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IGMP_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_igmp_t_field_data,
 };
 
 
@@ -4356,7 +4513,7 @@ static int32_t bcmpkt_ipfix_t_version_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_ipfix_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPFIX_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_ipfix_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPFIX_T_FID_COUNT] = {
     bcmpkt_ipfix_t_export_time_get,
     bcmpkt_ipfix_t_length_get,
     bcmpkt_ipfix_t_obs_domain_id_get,
@@ -4364,7 +4521,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_ipfix_t_fget[BCM56880_A0_DNA_
     bcmpkt_ipfix_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_ipfix_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPFIX_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_ipfix_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPFIX_T_FID_COUNT] = {
     bcmpkt_ipfix_t_export_time_set,
     bcmpkt_ipfix_t_length_set,
     bcmpkt_ipfix_t_obs_domain_id_set,
@@ -4372,13 +4529,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_ipfix_t_fset[BCM56880_A0_DNA_
     bcmpkt_ipfix_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_ipfix_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_ipfix_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_ipfix_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPFIX_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_ipfix_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_ipfix_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPFIX_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_ipfix_t_field_data,
 };
 
 
@@ -4550,7 +4707,7 @@ static int32_t bcmpkt_ipv4_t_version_hdr_len_set(uint32_t *data, int profile, ui
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_ipv4_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV4_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_ipv4_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_FID_COUNT] = {
     bcmpkt_ipv4_t_da_get,
     bcmpkt_ipv4_t_flags_frag_offset_get,
     bcmpkt_ipv4_t_hdr_checksum_get,
@@ -4564,7 +4721,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_ipv4_t_fget[BCM56880_A0_DNA_6
     bcmpkt_ipv4_t_version_hdr_len_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_ipv4_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV4_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_ipv4_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_FID_COUNT] = {
     bcmpkt_ipv4_t_da_set,
     bcmpkt_ipv4_t_flags_frag_offset_set,
     bcmpkt_ipv4_t_hdr_checksum_set,
@@ -4578,13 +4735,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_ipv4_t_fset[BCM56880_A0_DNA_6
     bcmpkt_ipv4_t_version_hdr_len_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_ipv4_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_ipv4_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_ipv4_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV4_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_ipv4_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_ipv4_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_ipv4_t_field_data,
 };
 
 
@@ -4710,7 +4867,7 @@ static int32_t bcmpkt_ipv6_t_version_set(uint32_t *data, int profile, uint32_t v
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_ipv6_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV6_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_ipv6_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_FID_COUNT] = {
     bcmpkt_ipv6_t_da_get,
     bcmpkt_ipv6_t_flow_label_get,
     bcmpkt_ipv6_t_hop_limit_get,
@@ -4721,7 +4878,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_ipv6_t_fget[BCM56880_A0_DNA_6
     bcmpkt_ipv6_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_ipv6_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV6_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_ipv6_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_FID_COUNT] = {
     bcmpkt_ipv6_t_da_set,
     bcmpkt_ipv6_t_flow_label_set,
     bcmpkt_ipv6_t_hop_limit_set,
@@ -4732,13 +4889,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_ipv6_t_fset[BCM56880_A0_DNA_6
     bcmpkt_ipv6_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_ipv6_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_ipv6_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_ipv6_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_IPV6_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_ipv6_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_ipv6_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_ipv6_t_field_data,
 };
 
 
@@ -4774,23 +4931,23 @@ static int32_t bcmpkt_l2_t_macsa_set(uint32_t *data, int profile, uint32_t val)
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_l2_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_L2_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_l2_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_L2_T_FID_COUNT] = {
     bcmpkt_l2_t_macda_get,
     bcmpkt_l2_t_macsa_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_l2_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_L2_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_l2_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_L2_T_FID_COUNT] = {
     bcmpkt_l2_t_macda_set,
     bcmpkt_l2_t_macsa_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_l2_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_L2_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_l2_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_L2_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_l2_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_L2_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_l2_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_l2_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_L2_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_l2_t_field_data,
 };
 
 
@@ -4810,21 +4967,21 @@ static int32_t bcmpkt_mirror_erspan_sn_t_seq_num_set(uint32_t *data, int profile
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_mirror_erspan_sn_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_mirror_erspan_sn_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
     bcmpkt_mirror_erspan_sn_t_seq_num_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_mirror_erspan_sn_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_mirror_erspan_sn_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
     bcmpkt_mirror_erspan_sn_t_seq_num_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_mirror_erspan_sn_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_mirror_erspan_sn_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_mirror_erspan_sn_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_mirror_erspan_sn_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_mirror_erspan_sn_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_mirror_erspan_sn_t_field_data,
 };
 
 
@@ -4844,21 +5001,21 @@ static int32_t bcmpkt_mirror_transport_t_data_set(uint32_t *data, int profile, u
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_mirror_transport_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_mirror_transport_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
     bcmpkt_mirror_transport_t_data_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_mirror_transport_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_mirror_transport_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
     bcmpkt_mirror_transport_t_data_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_mirror_transport_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_mirror_transport_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_mirror_transport_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_mirror_transport_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_mirror_transport_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_mirror_transport_t_field_data,
 };
 
 
@@ -4922,27 +5079,27 @@ static int32_t bcmpkt_mpls_ach_t_version_set(uint32_t *data, int profile, uint32
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_mpls_ach_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_ACH_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_mpls_ach_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_ACH_T_FID_COUNT] = {
     bcmpkt_mpls_ach_t_channel_type_get,
     bcmpkt_mpls_ach_t_cw_type_get,
     bcmpkt_mpls_ach_t_reserved_get,
     bcmpkt_mpls_ach_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_mpls_ach_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_ACH_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_mpls_ach_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_ACH_T_FID_COUNT] = {
     bcmpkt_mpls_ach_t_channel_type_set,
     bcmpkt_mpls_ach_t_cw_type_set,
     bcmpkt_mpls_ach_t_reserved_set,
     bcmpkt_mpls_ach_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_mpls_ach_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_ACH_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_mpls_ach_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_ACH_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_mpls_ach_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_ACH_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_mpls_ach_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_mpls_ach_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_ACH_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_mpls_ach_t_field_data,
 };
 
 
@@ -4962,21 +5119,21 @@ static int32_t bcmpkt_mpls_bv_t_value_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_mpls_bv_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_BV_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_mpls_bv_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_BV_T_FID_COUNT] = {
     bcmpkt_mpls_bv_t_value_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_mpls_bv_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_BV_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_mpls_bv_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_BV_T_FID_COUNT] = {
     bcmpkt_mpls_bv_t_value_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_mpls_bv_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_BV_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_mpls_bv_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_BV_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_mpls_bv_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_BV_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_mpls_bv_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_mpls_bv_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_BV_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_mpls_bv_t_field_data,
 };
 
 
@@ -5025,25 +5182,25 @@ static int32_t bcmpkt_mpls_cw_t_seq_number_set(uint32_t *data, int profile, uint
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_mpls_cw_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_CW_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_mpls_cw_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_CW_T_FID_COUNT] = {
     bcmpkt_mpls_cw_t_cw_type_get,
     bcmpkt_mpls_cw_t_reserved_get,
     bcmpkt_mpls_cw_t_seq_number_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_mpls_cw_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_CW_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_mpls_cw_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_CW_T_FID_COUNT] = {
     bcmpkt_mpls_cw_t_cw_type_set,
     bcmpkt_mpls_cw_t_reserved_set,
     bcmpkt_mpls_cw_t_seq_number_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_mpls_cw_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_CW_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_mpls_cw_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_CW_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_mpls_cw_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_CW_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_mpls_cw_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_mpls_cw_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_CW_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_mpls_cw_t_field_data,
 };
 
 
@@ -5107,27 +5264,27 @@ static int32_t bcmpkt_mpls_t_ttl_set(uint32_t *data, int profile, uint32_t val)
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_mpls_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_mpls_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_T_FID_COUNT] = {
     bcmpkt_mpls_t_bos_get,
     bcmpkt_mpls_t_exp_get,
     bcmpkt_mpls_t_label_get,
     bcmpkt_mpls_t_ttl_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_mpls_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_mpls_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_T_FID_COUNT] = {
     bcmpkt_mpls_t_bos_set,
     bcmpkt_mpls_t_exp_set,
     bcmpkt_mpls_t_label_set,
     bcmpkt_mpls_t_ttl_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_mpls_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_mpls_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_mpls_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_MPLS_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_mpls_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_mpls_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_mpls_t_field_data,
 };
 
 
@@ -5344,7 +5501,7 @@ static int32_t bcmpkt_p_1588_t_version_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_p_1588_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_P_1588_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_p_1588_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_FID_COUNT] = {
     bcmpkt_p_1588_t_cntrl_get,
     bcmpkt_p_1588_t_correction_get,
     bcmpkt_p_1588_t_domain_nb_get,
@@ -5361,7 +5518,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_p_1588_t_fget[BCM56880_A0_DNA
     bcmpkt_p_1588_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_p_1588_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_P_1588_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_p_1588_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_FID_COUNT] = {
     bcmpkt_p_1588_t_cntrl_set,
     bcmpkt_p_1588_t_correction_set,
     bcmpkt_p_1588_t_domain_nb_set,
@@ -5378,13 +5535,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_p_1588_t_fset[BCM56880_A0_DNA
     bcmpkt_p_1588_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_p_1588_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_P_1588_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_p_1588_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_p_1588_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_P_1588_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_p_1588_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_p_1588_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_p_1588_t_field_data,
 };
 
 
@@ -5448,27 +5605,27 @@ static int32_t bcmpkt_pim_t_hdr_bytes_6_7_set(uint32_t *data, int profile, uint3
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_pim_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PIM_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_pim_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PIM_T_FID_COUNT] = {
     bcmpkt_pim_t_hdr_bytes_0_1_get,
     bcmpkt_pim_t_hdr_bytes_2_3_get,
     bcmpkt_pim_t_hdr_bytes_4_5_get,
     bcmpkt_pim_t_hdr_bytes_6_7_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_pim_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PIM_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_pim_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PIM_T_FID_COUNT] = {
     bcmpkt_pim_t_hdr_bytes_0_1_set,
     bcmpkt_pim_t_hdr_bytes_2_3_set,
     bcmpkt_pim_t_hdr_bytes_4_5_set,
     bcmpkt_pim_t_hdr_bytes_6_7_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_pim_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PIM_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_pim_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PIM_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_pim_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PIM_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_pim_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_pim_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PIM_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_pim_t_field_data,
 };
 
 
@@ -5518,25 +5675,25 @@ static int32_t bcmpkt_prog_ext_hdr_t_option_set(uint32_t *data, int profile, uin
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_prog_ext_hdr_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PROG_EXT_HDR_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_prog_ext_hdr_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT] = {
     bcmpkt_prog_ext_hdr_t_hdr_ext_len_get,
     bcmpkt_prog_ext_hdr_t_next_header_get,
     bcmpkt_prog_ext_hdr_t_option_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_prog_ext_hdr_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PROG_EXT_HDR_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_prog_ext_hdr_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT] = {
     bcmpkt_prog_ext_hdr_t_hdr_ext_len_set,
     bcmpkt_prog_ext_hdr_t_next_header_set,
     bcmpkt_prog_ext_hdr_t_option_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_prog_ext_hdr_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PROG_EXT_HDR_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_prog_ext_hdr_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PROG_EXT_HDR_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_prog_ext_hdr_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PROG_EXT_HDR_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_prog_ext_hdr_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_prog_ext_hdr_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_prog_ext_hdr_t_field_data,
 };
 
 
@@ -5632,7 +5789,7 @@ static int32_t bcmpkt_psamp_0_t_template_id_set(uint32_t *data, int profile, uin
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_psamp_0_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_psamp_0_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T_FID_COUNT] = {
     bcmpkt_psamp_0_t_flowset_get,
     bcmpkt_psamp_0_t_length_get,
     bcmpkt_psamp_0_t_next_hop_index_get,
@@ -5641,7 +5798,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_psamp_0_t_fget[BCM56880_A0_DN
     bcmpkt_psamp_0_t_template_id_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_psamp_0_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_psamp_0_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T_FID_COUNT] = {
     bcmpkt_psamp_0_t_flowset_set,
     bcmpkt_psamp_0_t_length_set,
     bcmpkt_psamp_0_t_next_hop_index_set,
@@ -5650,13 +5807,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_psamp_0_t_fset[BCM56880_A0_DN
     bcmpkt_psamp_0_t_template_id_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_psamp_0_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_psamp_0_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_psamp_0_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_0_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_psamp_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_psamp_0_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_psamp_0_t_field_data,
 };
 
 
@@ -5765,7 +5922,7 @@ static int32_t bcmpkt_psamp_1_t_variable_flag_set(uint32_t *data, int profile, u
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_psamp_1_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_1_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_psamp_1_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_FID_COUNT] = {
     bcmpkt_psamp_1_t_dlb_id_get,
     bcmpkt_psamp_1_t_egress_port_get,
     bcmpkt_psamp_1_t_epoch_get,
@@ -5775,7 +5932,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_psamp_1_t_fget[BCM56880_A0_DN
     bcmpkt_psamp_1_t_variable_flag_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_psamp_1_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_1_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_psamp_1_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_FID_COUNT] = {
     bcmpkt_psamp_1_t_dlb_id_set,
     bcmpkt_psamp_1_t_egress_port_set,
     bcmpkt_psamp_1_t_epoch_set,
@@ -5785,13 +5942,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_psamp_1_t_fset[BCM56880_A0_DN
     bcmpkt_psamp_1_t_variable_flag_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_psamp_1_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_1_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_psamp_1_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_psamp_1_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_1_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_psamp_1_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_psamp_1_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_psamp_1_t_field_data,
 };
 
 
@@ -5903,7 +6060,7 @@ static int32_t bcmpkt_psamp_mirror_on_drop_0_t_template_id_set(uint32_t *data, i
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_psamp_mirror_on_drop_0_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_psamp_mirror_on_drop_0_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_0_t_egress_mod_port_get,
     bcmpkt_psamp_mirror_on_drop_0_t_ingress_port_get,
     bcmpkt_psamp_mirror_on_drop_0_t_length_get,
@@ -5913,7 +6070,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_psamp_mirror_on_drop_0_t_fget
     bcmpkt_psamp_mirror_on_drop_0_t_template_id_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_psamp_mirror_on_drop_0_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_psamp_mirror_on_drop_0_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_0_t_egress_mod_port_set,
     bcmpkt_psamp_mirror_on_drop_0_t_ingress_port_set,
     bcmpkt_psamp_mirror_on_drop_0_t_length_set,
@@ -5923,13 +6080,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_psamp_mirror_on_drop_0_t_fset
     bcmpkt_psamp_mirror_on_drop_0_t_template_id_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_psamp_mirror_on_drop_0_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_psamp_mirror_on_drop_0_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_psamp_mirror_on_drop_0_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_psamp_mirror_on_drop_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_psamp_mirror_on_drop_0_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_psamp_mirror_on_drop_0_t_field_data,
 };
 
 
@@ -6038,7 +6195,7 @@ static int32_t bcmpkt_psamp_mirror_on_drop_3_t_var_len_indicator_set(uint32_t *d
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_psamp_mirror_on_drop_3_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_psamp_mirror_on_drop_3_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_3_t_drop_reason_get,
     bcmpkt_psamp_mirror_on_drop_3_t_mod_state_get,
     bcmpkt_psamp_mirror_on_drop_3_t_reserved_0_get,
@@ -6048,7 +6205,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_psamp_mirror_on_drop_3_t_fget
     bcmpkt_psamp_mirror_on_drop_3_t_var_len_indicator_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_psamp_mirror_on_drop_3_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_psamp_mirror_on_drop_3_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_3_t_drop_reason_set,
     bcmpkt_psamp_mirror_on_drop_3_t_mod_state_set,
     bcmpkt_psamp_mirror_on_drop_3_t_reserved_0_set,
@@ -6058,13 +6215,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_psamp_mirror_on_drop_3_t_fset
     bcmpkt_psamp_mirror_on_drop_3_t_var_len_indicator_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_psamp_mirror_on_drop_3_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_psamp_mirror_on_drop_3_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_psamp_mirror_on_drop_3_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_psamp_mirror_on_drop_3_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_psamp_mirror_on_drop_3_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_psamp_mirror_on_drop_3_t_field_data,
 };
 
 
@@ -6207,7 +6364,7 @@ static int32_t bcmpkt_rarp_t_target_ip_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_rarp_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RARP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_rarp_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_FID_COUNT] = {
     bcmpkt_rarp_t_hardware_len_get,
     bcmpkt_rarp_t_hardware_type_get,
     bcmpkt_rarp_t_operation_get,
@@ -6219,7 +6376,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_rarp_t_fget[BCM56880_A0_DNA_6
     bcmpkt_rarp_t_target_ip_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_rarp_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RARP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_rarp_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_FID_COUNT] = {
     bcmpkt_rarp_t_hardware_len_set,
     bcmpkt_rarp_t_hardware_type_set,
     bcmpkt_rarp_t_operation_set,
@@ -6231,13 +6388,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_rarp_t_fset[BCM56880_A0_DNA_6
     bcmpkt_rarp_t_target_ip_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_rarp_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_rarp_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_rarp_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RARP_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_rarp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_rarp_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_rarp_t_field_data,
 };
 
 
@@ -6317,7 +6474,7 @@ static int32_t bcmpkt_routing_t_segments_left_set(uint32_t *data, int profile, u
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_routing_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ROUTING_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_routing_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ROUTING_T_FID_COUNT] = {
     bcmpkt_routing_t_data_get,
     bcmpkt_routing_t_hdr_ext_len_get,
     bcmpkt_routing_t_next_header_get,
@@ -6325,7 +6482,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_routing_t_fget[BCM56880_A0_DN
     bcmpkt_routing_t_segments_left_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_routing_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ROUTING_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_routing_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ROUTING_T_FID_COUNT] = {
     bcmpkt_routing_t_data_set,
     bcmpkt_routing_t_hdr_ext_len_set,
     bcmpkt_routing_t_next_header_set,
@@ -6333,13 +6490,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_routing_t_fset[BCM56880_A0_DN
     bcmpkt_routing_t_segments_left_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_routing_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ROUTING_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_routing_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ROUTING_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_routing_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_ROUTING_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_routing_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_routing_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_ROUTING_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_routing_t_field_data,
 };
 
 
@@ -6373,23 +6530,23 @@ static int32_t bcmpkt_rspan_t_tpid_set(uint32_t *data, int profile, uint32_t val
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_rspan_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RSPAN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_rspan_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RSPAN_T_FID_COUNT] = {
     bcmpkt_rspan_t_tag_get,
     bcmpkt_rspan_t_tpid_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_rspan_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RSPAN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_rspan_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RSPAN_T_FID_COUNT] = {
     bcmpkt_rspan_t_tag_set,
     bcmpkt_rspan_t_tpid_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_rspan_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RSPAN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_rspan_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RSPAN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_rspan_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_RSPAN_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_rspan_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_rspan_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_RSPAN_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_rspan_t_field_data,
 };
 
 
@@ -6439,25 +6596,25 @@ static int32_t bcmpkt_sflow_shim_0_t_version_set(uint32_t *data, int profile, ui
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_sflow_shim_0_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_sflow_shim_0_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT] = {
     bcmpkt_sflow_shim_0_t_sys_destination_get,
     bcmpkt_sflow_shim_0_t_sys_source_get,
     bcmpkt_sflow_shim_0_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_sflow_shim_0_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_sflow_shim_0_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT] = {
     bcmpkt_sflow_shim_0_t_sys_destination_set,
     bcmpkt_sflow_shim_0_t_sys_source_set,
     bcmpkt_sflow_shim_0_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_sflow_shim_0_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_sflow_shim_0_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_sflow_shim_0_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_sflow_shim_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_sflow_shim_0_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_sflow_shim_0_t_field_data,
 };
 
 
@@ -6581,7 +6738,7 @@ static int32_t bcmpkt_sflow_shim_1_t_sys_opcode_set(uint32_t *data, int profile,
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_sflow_shim_1_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_sflow_shim_1_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT] = {
     bcmpkt_sflow_shim_1_t_flag_dest_sample_get,
     bcmpkt_sflow_shim_1_t_flag_discarded_get,
     bcmpkt_sflow_shim_1_t_flag_flex_sample_get,
@@ -6592,7 +6749,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_sflow_shim_1_t_fget[BCM56880_
     bcmpkt_sflow_shim_1_t_sys_opcode_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_sflow_shim_1_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_sflow_shim_1_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT] = {
     bcmpkt_sflow_shim_1_t_flag_dest_sample_set,
     bcmpkt_sflow_shim_1_t_flag_discarded_set,
     bcmpkt_sflow_shim_1_t_flag_flex_sample_set,
@@ -6603,13 +6760,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_sflow_shim_1_t_fset[BCM56880_
     bcmpkt_sflow_shim_1_t_sys_opcode_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_sflow_shim_1_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_sflow_shim_1_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_sflow_shim_1_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_sflow_shim_1_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_sflow_shim_1_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_sflow_shim_1_t_field_data,
 };
 
 
@@ -6644,23 +6801,23 @@ static int32_t bcmpkt_sflow_shim_2_t_user_meta_data_set(uint32_t *data, int prof
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_sflow_shim_2_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_sflow_shim_2_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT] = {
     bcmpkt_sflow_shim_2_t_sequence_num_get,
     bcmpkt_sflow_shim_2_t_user_meta_data_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_sflow_shim_2_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_sflow_shim_2_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT] = {
     bcmpkt_sflow_shim_2_t_sequence_num_set,
     bcmpkt_sflow_shim_2_t_user_meta_data_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_sflow_shim_2_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_2_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_sflow_shim_2_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_2_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_sflow_shim_2_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_sflow_shim_2_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_sflow_shim_2_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_sflow_shim_2_t_field_data,
 };
 
 
@@ -6695,23 +6852,23 @@ static int32_t bcmpkt_snap_llc_t_snap_llc_set(uint32_t *data, int profile, uint3
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_snap_llc_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SNAP_LLC_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_snap_llc_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SNAP_LLC_T_FID_COUNT] = {
     bcmpkt_snap_llc_t_length_get,
     bcmpkt_snap_llc_t_snap_llc_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_snap_llc_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SNAP_LLC_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_snap_llc_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SNAP_LLC_T_FID_COUNT] = {
     bcmpkt_snap_llc_t_length_set,
     bcmpkt_snap_llc_t_snap_llc_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_snap_llc_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SNAP_LLC_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_snap_llc_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SNAP_LLC_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_snap_llc_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_SNAP_LLC_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_snap_llc_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_snap_llc_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_SNAP_LLC_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_snap_llc_t_field_data,
 };
 
 
@@ -6745,23 +6902,23 @@ static int32_t bcmpkt_tcp_first_4bytes_t_src_port_set(uint32_t *data, int profil
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_tcp_first_4bytes_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_tcp_first_4bytes_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_first_4bytes_t_dst_port_get,
     bcmpkt_tcp_first_4bytes_t_src_port_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_tcp_first_4bytes_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_tcp_first_4bytes_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_first_4bytes_t_dst_port_set,
     bcmpkt_tcp_first_4bytes_t_src_port_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_tcp_first_4bytes_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_tcp_first_4bytes_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_tcp_first_4bytes_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_tcp_first_4bytes_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_tcp_first_4bytes_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_tcp_first_4bytes_t_field_data,
 };
 
 
@@ -6857,7 +7014,7 @@ static int32_t bcmpkt_tcp_last_16bytes_t_win_size_set(uint32_t *data, int profil
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_tcp_last_16bytes_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_tcp_last_16bytes_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_last_16bytes_t_ack_num_get,
     bcmpkt_tcp_last_16bytes_t_checksum_get,
     bcmpkt_tcp_last_16bytes_t_hdr_len_and_flags_get,
@@ -6866,7 +7023,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_tcp_last_16bytes_t_fget[BCM56
     bcmpkt_tcp_last_16bytes_t_win_size_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_tcp_last_16bytes_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_tcp_last_16bytes_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_last_16bytes_t_ack_num_set,
     bcmpkt_tcp_last_16bytes_t_checksum_set,
     bcmpkt_tcp_last_16bytes_t_hdr_len_and_flags_set,
@@ -6875,13 +7032,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_tcp_last_16bytes_t_fset[BCM56
     bcmpkt_tcp_last_16bytes_t_win_size_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_tcp_last_16bytes_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_tcp_last_16bytes_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_tcp_last_16bytes_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_tcp_last_16bytes_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_tcp_last_16bytes_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_tcp_last_16bytes_t_field_data,
 };
 
 
@@ -6945,27 +7102,27 @@ static int32_t bcmpkt_udp_t_udp_length_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_udp_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UDP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_udp_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UDP_T_FID_COUNT] = {
     bcmpkt_udp_t_checksum_get,
     bcmpkt_udp_t_dst_port_get,
     bcmpkt_udp_t_src_port_get,
     bcmpkt_udp_t_udp_length_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_udp_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UDP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_udp_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UDP_T_FID_COUNT] = {
     bcmpkt_udp_t_checksum_set,
     bcmpkt_udp_t_dst_port_set,
     bcmpkt_udp_t_src_port_set,
     bcmpkt_udp_t_udp_length_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_udp_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_udp_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_udp_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UDP_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_udp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_udp_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UDP_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_udp_t_field_data,
 };
 
 
@@ -7001,23 +7158,23 @@ static int32_t bcmpkt_unknown_l3_t_next_16bytes_of_l3_payload_set(uint32_t *data
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_unknown_l3_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_unknown_l3_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
     bcmpkt_unknown_l3_t_first_16bytes_of_l3_payload_get,
     bcmpkt_unknown_l3_t_next_16bytes_of_l3_payload_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_unknown_l3_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_unknown_l3_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
     bcmpkt_unknown_l3_t_first_16bytes_of_l3_payload_set,
     bcmpkt_unknown_l3_t_next_16bytes_of_l3_payload_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_unknown_l3_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_unknown_l3_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_unknown_l3_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L3_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_unknown_l3_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_unknown_l3_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_unknown_l3_t_field_data,
 };
 
 
@@ -7037,21 +7194,21 @@ static int32_t bcmpkt_unknown_l4_t_first_4bytes_of_l4_payload_set(uint32_t *data
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_unknown_l4_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_unknown_l4_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
     bcmpkt_unknown_l4_t_first_4bytes_of_l4_payload_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_unknown_l4_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_unknown_l4_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
     bcmpkt_unknown_l4_t_first_4bytes_of_l4_payload_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_unknown_l4_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_unknown_l4_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_unknown_l4_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L4_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_unknown_l4_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_unknown_l4_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_unknown_l4_t_field_data,
 };
 
 
@@ -7101,25 +7258,25 @@ static int32_t bcmpkt_unknown_l5_t_l5_bytes_4_7_set(uint32_t *data, int profile,
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_unknown_l5_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_unknown_l5_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
     bcmpkt_unknown_l5_t_l5_bytes_0_1_get,
     bcmpkt_unknown_l5_t_l5_bytes_2_3_get,
     bcmpkt_unknown_l5_t_l5_bytes_4_7_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_unknown_l5_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_unknown_l5_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
     bcmpkt_unknown_l5_t_l5_bytes_0_1_set,
     bcmpkt_unknown_l5_t_l5_bytes_2_3_set,
     bcmpkt_unknown_l5_t_l5_bytes_4_7_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_unknown_l5_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_unknown_l5_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_unknown_l5_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_UNKNOWN_L5_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_unknown_l5_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_unknown_l5_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_unknown_l5_t_field_data,
 };
 
 
@@ -7183,27 +7340,27 @@ static int32_t bcmpkt_vlan_t_vid_set(uint32_t *data, int profile, uint32_t val)
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_vlan_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_vlan_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VLAN_T_FID_COUNT] = {
     bcmpkt_vlan_t_cfi_get,
     bcmpkt_vlan_t_pcp_get,
     bcmpkt_vlan_t_tpid_get,
     bcmpkt_vlan_t_vid_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_vlan_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_vlan_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VLAN_T_FID_COUNT] = {
     bcmpkt_vlan_t_cfi_set,
     bcmpkt_vlan_t_pcp_set,
     bcmpkt_vlan_t_tpid_set,
     bcmpkt_vlan_t_vid_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_vlan_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_vlan_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_vlan_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VLAN_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_vlan_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_vlan_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VLAN_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_vlan_t_field_data,
 };
 
 
@@ -7238,23 +7395,23 @@ static int32_t bcmpkt_vntag_t_tpid_set(uint32_t *data, int profile, uint32_t val
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_vntag_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VNTAG_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_vntag_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VNTAG_T_FID_COUNT] = {
     bcmpkt_vntag_t_tag_get,
     bcmpkt_vntag_t_tpid_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_vntag_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VNTAG_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_vntag_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VNTAG_T_FID_COUNT] = {
     bcmpkt_vntag_t_tag_set,
     bcmpkt_vntag_t_tpid_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_vntag_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VNTAG_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_vntag_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VNTAG_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_vntag_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VNTAG_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_vntag_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_vntag_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VNTAG_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_vntag_t_field_data,
 };
 
 
@@ -7304,25 +7461,25 @@ static int32_t bcmpkt_vxlan_t_vn_id_set(uint32_t *data, int profile, uint32_t va
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_vxlan_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VXLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_vxlan_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VXLAN_T_FID_COUNT] = {
     bcmpkt_vxlan_t_flags_reserved_1_get,
     bcmpkt_vxlan_t_reserved2_get,
     bcmpkt_vxlan_t_vn_id_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_vxlan_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VXLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_vxlan_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VXLAN_T_FID_COUNT] = {
     bcmpkt_vxlan_t_flags_reserved_1_set,
     bcmpkt_vxlan_t_reserved2_set,
     bcmpkt_vxlan_t_vn_id_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_vxlan_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_vxlan_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_vxlan_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_VXLAN_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_vxlan_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_vxlan_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_VXLAN_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_vxlan_t_field_data,
 };
 
 
@@ -7434,7 +7591,7 @@ static int32_t bcmpkt_wesp_t_wesp_iv_set(uint32_t *data, int profile, uint32_t v
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_wesp_t_fget[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_WESP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_31_6_0_wesp_t_fget[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_FID_COUNT] = {
     bcmpkt_wesp_t_flags_get,
     bcmpkt_wesp_t_header_len_get,
     bcmpkt_wesp_t_next_header_get,
@@ -7444,7 +7601,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_dna_6_5_30_1_1_wesp_t_fget[BCM56880_A0_DNA_6
     bcmpkt_wesp_t_wesp_iv_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_wesp_t_fset[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_WESP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_31_6_0_wesp_t_fset[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_FID_COUNT] = {
     bcmpkt_wesp_t_flags_set,
     bcmpkt_wesp_t_header_len_set,
     bcmpkt_wesp_t_next_header_set,
@@ -7454,520 +7611,520 @@ bcmpkt_flex_field_set_f bcm56880_a0_dna_6_5_30_1_1_wesp_t_fset[BCM56880_A0_DNA_6
     bcmpkt_wesp_t_wesp_iv_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_30_1_1_wesp_t_field_data[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_WESP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_dna_6_5_31_6_0_wesp_t_field_data[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_30_1_1_wesp_t_field_info = {
-    .num_fields = BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_WESP_T_FID_COUNT,
-    .info = bcm56880_a0_dna_6_5_30_1_1_wesp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_dna_6_5_31_6_0_wesp_t_field_info = {
+    .num_fields = BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_FID_COUNT,
+    .info = bcm56880_a0_dna_6_5_31_6_0_wesp_t_field_data,
 };
 
-static bcmpkt_flex_pmd_info_t bcm56880_a0_dna_6_5_30_1_1_flexhdr_info_list[BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_FLEXHDR_COUNT] = {
+static bcmpkt_flex_pmd_info_t bcm56880_a0_dna_6_5_31_6_0_flexhdr_info_list[BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_FLEXHDR_COUNT] = {
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_arp_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_arp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_arp_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_arp_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_arp_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_arp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_authen_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_authen_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_authen_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_authen_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_authen_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_authen_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_bfd_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_bfd_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_bfd_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_bfd_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_bfd_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_bfd_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_cntag_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_cntag_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_cntag_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_cntag_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_cntag_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_cntag_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_cpu_composites_0_ifa_l2_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_cpu_composites_0_ifa_l2_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_cpu_composites_0_ifa_l2_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_cpu_composites_0_ifa_l2_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_cpu_composites_0_ifa_l2_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_cpu_composites_0_ifa_l2_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_cpu_composites_0_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_cpu_composites_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_cpu_composites_0_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_cpu_composites_0_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_cpu_composites_0_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_cpu_composites_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_cpu_composites_1_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_cpu_composites_1_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_cpu_composites_1_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_cpu_composites_1_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_cpu_composites_1_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_cpu_composites_1_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_dest_option_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_dest_option_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_dest_option_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_dest_option_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_dest_option_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_dest_option_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_erspan3_fixed_hdr_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_erspan3_fixed_hdr_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_erspan3_fixed_hdr_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_erspan3_fixed_hdr_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_erspan3_fixed_hdr_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_erspan3_fixed_hdr_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_erspan3_subhdr_5_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_erspan3_subhdr_5_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_erspan3_subhdr_5_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_erspan3_subhdr_5_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_erspan3_subhdr_5_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_erspan3_subhdr_5_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_esp_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_esp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_esp_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_esp_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_esp_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_esp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_etag_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_etag_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_etag_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_etag_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_etag_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_etag_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_ethertype_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_ethertype_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_ethertype_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_ethertype_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_ethertype_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_ethertype_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_frag_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_frag_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_frag_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_frag_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_frag_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_frag_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_generic_loopback_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_generic_loopback_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_generic_loopback_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_generic_loopback_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_generic_loopback_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_generic_loopback_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_gpe_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_gpe_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_gpe_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_gpe_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_gpe_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_gpe_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_gre_chksum_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_gre_chksum_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_gre_chksum_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_gre_chksum_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_gre_chksum_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_gre_chksum_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_gre_key_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_gre_key_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_gre_key_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_gre_key_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_gre_key_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_gre_key_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_gre_rout_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_gre_rout_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_gre_rout_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_gre_rout_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_gre_rout_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_gre_rout_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_gre_seq_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_gre_seq_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_gre_seq_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_gre_seq_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_gre_seq_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_gre_seq_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_gre_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_gre_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_gre_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_gre_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_gre_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_gre_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_hg3_base_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_hg3_base_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_hg3_base_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_hg3_base_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_hg3_base_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_hg3_base_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_hg3_extension_0_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_hg3_extension_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_hg3_extension_0_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_hg3_extension_0_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_hg3_extension_0_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_hg3_extension_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_hop_by_hop_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_hop_by_hop_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_hop_by_hop_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_hop_by_hop_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_hop_by_hop_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_hop_by_hop_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_icmp_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_icmp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_icmp_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_icmp_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_icmp_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_icmp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_0_a_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_0_a_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_0_a_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_0_a_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_0_a_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_0_a_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_0_b_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_0_b_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_0_b_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_0_b_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_0_b_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_0_b_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_1_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_1_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_1_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_1_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_1_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_1_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_2_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_2_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_2_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_2_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_2_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_2_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_3_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_3_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_3_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_ifa_flex_md_3_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_3_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_ifa_flex_md_3_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_ifa_header_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_ifa_header_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_ifa_header_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_ifa_header_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_ifa_header_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_ifa_header_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_ifa_md_base_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_ifa_md_base_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_ifa_md_base_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_ifa_md_base_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_ifa_md_base_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_ifa_md_base_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_ifa_metadata_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_ifa_metadata_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_ifa_metadata_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_ifa_metadata_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_ifa_metadata_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_ifa_metadata_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_igmp_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_igmp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_igmp_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_igmp_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_igmp_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_igmp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_ipfix_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_ipfix_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_ipfix_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_ipfix_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_ipfix_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_ipfix_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_ipv4_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_ipv4_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_ipv4_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_ipv4_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_ipv4_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_ipv4_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_ipv6_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_ipv6_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_ipv6_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_ipv6_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_ipv6_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_ipv6_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_l2_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_l2_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_l2_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_l2_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_l2_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_l2_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_mirror_erspan_sn_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_mirror_erspan_sn_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_mirror_erspan_sn_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_mirror_erspan_sn_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_mirror_erspan_sn_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_mirror_erspan_sn_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_mirror_transport_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_mirror_transport_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_mirror_transport_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_mirror_transport_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_mirror_transport_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_mirror_transport_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_mpls_ach_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_mpls_ach_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_mpls_ach_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_mpls_ach_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_mpls_ach_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_mpls_ach_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_mpls_bv_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_mpls_bv_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_mpls_bv_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_mpls_bv_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_mpls_bv_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_mpls_bv_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_mpls_cw_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_mpls_cw_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_mpls_cw_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_mpls_cw_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_mpls_cw_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_mpls_cw_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_mpls_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_mpls_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_mpls_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_mpls_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_mpls_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_mpls_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_p_1588_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_p_1588_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_p_1588_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_p_1588_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_p_1588_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_p_1588_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_pim_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_pim_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_pim_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_pim_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_pim_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_pim_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_prog_ext_hdr_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_prog_ext_hdr_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_prog_ext_hdr_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_prog_ext_hdr_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_prog_ext_hdr_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_prog_ext_hdr_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_psamp_0_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_psamp_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_psamp_0_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_psamp_0_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_psamp_0_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_psamp_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_psamp_1_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_psamp_1_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_psamp_1_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_psamp_1_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_psamp_1_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_psamp_1_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_psamp_mirror_on_drop_0_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_psamp_mirror_on_drop_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_psamp_mirror_on_drop_0_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_psamp_mirror_on_drop_0_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_psamp_mirror_on_drop_0_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_psamp_mirror_on_drop_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_psamp_mirror_on_drop_3_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_psamp_mirror_on_drop_3_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_psamp_mirror_on_drop_3_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_psamp_mirror_on_drop_3_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_psamp_mirror_on_drop_3_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_psamp_mirror_on_drop_3_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_rarp_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_rarp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_rarp_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_rarp_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_rarp_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_rarp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_routing_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_routing_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_routing_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_routing_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_routing_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_routing_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_rspan_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_rspan_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_rspan_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_rspan_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_rspan_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_rspan_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_sflow_shim_0_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_sflow_shim_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_sflow_shim_0_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_sflow_shim_0_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_sflow_shim_0_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_sflow_shim_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_sflow_shim_1_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_sflow_shim_1_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_sflow_shim_1_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_sflow_shim_1_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_sflow_shim_1_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_sflow_shim_1_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_sflow_shim_2_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_sflow_shim_2_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_sflow_shim_2_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_sflow_shim_2_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_sflow_shim_2_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_sflow_shim_2_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_snap_llc_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_snap_llc_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_snap_llc_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_snap_llc_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_snap_llc_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_snap_llc_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_tcp_first_4bytes_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_tcp_first_4bytes_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_tcp_first_4bytes_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_tcp_first_4bytes_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_tcp_first_4bytes_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_tcp_first_4bytes_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_tcp_last_16bytes_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_tcp_last_16bytes_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_tcp_last_16bytes_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_tcp_last_16bytes_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_tcp_last_16bytes_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_tcp_last_16bytes_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_udp_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_udp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_udp_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_udp_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_udp_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_udp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_unknown_l3_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_unknown_l3_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_unknown_l3_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_unknown_l3_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_unknown_l3_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_unknown_l3_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_unknown_l4_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_unknown_l4_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_unknown_l4_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_unknown_l4_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_unknown_l4_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_unknown_l4_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_unknown_l5_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_unknown_l5_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_unknown_l5_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_unknown_l5_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_unknown_l5_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_unknown_l5_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_vlan_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_vlan_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_vlan_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_vlan_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_vlan_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_vlan_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_vntag_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_vntag_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_vntag_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_vntag_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_vntag_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_vntag_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_vxlan_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_vxlan_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_vxlan_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_vxlan_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_vxlan_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_vxlan_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_wesp_t_field_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_wesp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_dna_6_5_30_1_1_wesp_t_fget,
-        .flex_fset = bcm56880_a0_dna_6_5_30_1_1_wesp_t_fset,
+        .flex_fget = bcm56880_a0_dna_6_5_31_6_0_wesp_t_fget,
+        .flex_fset = bcm56880_a0_dna_6_5_31_6_0_wesp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_dna_6_5_30_1_1_rxpmd_flex_field_info,
-        .reasons_info = &bcm56880_a0_dna_6_5_30_1_1_rxpmd_flex_reasons_info,
+        .field_info = &bcm56880_a0_dna_6_5_31_6_0_rxpmd_flex_field_info,
+        .reasons_info = &bcm56880_a0_dna_6_5_31_6_0_rxpmd_flex_reasons_info,
         .flex_common_fget = bcm56880_a0_rxpmd_flex_fget,
         .flex_common_fset = bcm56880_a0_rxpmd_flex_fset,
     },
 };
 
-static shr_enum_map_t bcm56880_a0_dna_6_5_30_1_1_flexhdr_id_map[] = {
-    BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_FLEXHDR_NAME_MAP_INIT
+static shr_enum_map_t bcm56880_a0_dna_6_5_31_6_0_flexhdr_id_map[] = {
+    BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_FLEXHDR_NAME_MAP_INIT
 };
 
-shr_enum_map_t * bcm56880_a0_dna_6_5_30_1_1_flexhdr_map_get(void)
+shr_enum_map_t * bcm56880_a0_dna_6_5_31_6_0_flexhdr_map_get(void)
 {
-    return bcm56880_a0_dna_6_5_30_1_1_flexhdr_id_map;
+    return bcm56880_a0_dna_6_5_31_6_0_flexhdr_id_map;
 }
 
-bcmpkt_flex_pmd_info_t * bcm56880_a0_dna_6_5_30_1_1_flex_pmd_info_get(uint32_t hid)
+bcmpkt_flex_pmd_info_t * bcm56880_a0_dna_6_5_31_6_0_flex_pmd_info_get(uint32_t hid)
 {
-    if (hid >= BCM56880_A0_DNA_6_5_30_1_1_BCMPKT_FLEXHDR_COUNT) {
+    if (hid >= BCM56880_A0_DNA_6_5_31_6_0_BCMPKT_FLEXHDR_COUNT) {
         return NULL;
     }
 
-    return &bcm56880_a0_dna_6_5_30_1_1_flexhdr_info_list[hid];
+    return &bcm56880_a0_dna_6_5_31_6_0_flexhdr_info_list[hid];
 }
 
-int bcm56880_a0_dna_6_5_30_1_1_flexhdr_variant_support_map[BCMPKT_PMD_COUNT] = {
+int bcm56880_a0_dna_6_5_31_6_0_flexhdr_variant_support_map[BCMPKT_PMD_COUNT] = {
     14,
     21,
     22,
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_bcmpkt_rxpmd_match_id.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_bcmpkt_rxpmd_match_id.c
similarity index 83%
rename from platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_bcmpkt_rxpmd_match_id.c
rename to platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_bcmpkt_rxpmd_match_id.c
index 35f0100826ab..46f17d882e64 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_bcmpkt_rxpmd_match_id.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_bcmpkt_rxpmd_match_id.c
@@ -2,8 +2,8 @@
  *
  * DO NOT EDIT THIS FILE!
  * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) bcm56880_a0_hna_6_5_30_3_0_sf_match_id_info.yml
- * for device bcm56880_a0 and variant hna_6_5_30_3_0.
+ * from the NPL output file(s) bcm56880_a0_hna_6_5_31_3_0_sf_match_id_info.yml
+ * for device bcm56880_a0 and variant hna_6_5_31_3_0.
  * Edits to this file will be lost when it is regenerated.
  *
  * $Id: $
@@ -29,13 +29,13 @@
 
 
 #include <bcmpkt/bcmpkt_rxpmd_match_id.h>
-#include <bcmpkt/xfcr/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_bcmpkt_rxpmd_match_id_defs.h>
+#include <bcmpkt/xfcr/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_bcmpkt_rxpmd_match_id_defs.h>
 
 
 static bcmpkt_rxpmd_match_id_db_t
-bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_COUNT] = {
+bcm56880_a0_hna_6_5_31_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_COUNT] = {
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ETAG */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ETAG */
         .name         = "EGRESS_PKT_FWD_L2_HDR_ETAG",
         .match        = 0x20,
         .match_mask   = 0x30,
@@ -49,7 +49,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG */
         .name         = "EGRESS_PKT_FWD_L2_HDR_ITAG",
         .match        = 0x8,
         .match_mask   = 0x8,
@@ -63,7 +63,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2 */
         .name         = "EGRESS_PKT_FWD_L2_HDR_L2",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -77,7 +77,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE */
         .name         = "EGRESS_PKT_FWD_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3f,
@@ -91,7 +91,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG */
         .name         = "EGRESS_PKT_FWD_L2_HDR_OTAG",
         .match        = 0x4,
         .match_mask   = 0x4,
@@ -105,7 +105,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC */
         .name         = "EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC",
         .match        = 0x2,
         .match_mask   = 0x2,
@@ -119,7 +119,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_VNTAG */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_VNTAG */
         .name         = "EGRESS_PKT_FWD_L2_HDR_VNTAG",
         .match        = 0x10,
         .match_mask   = 0x30,
@@ -133,7 +133,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ARP",
         .match        = 0x1800,
         .match_mask   = 0x3830,
@@ -147,7 +147,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1",
         .match        = 0x80,
         .match_mask   = 0x1c2,
@@ -161,7 +161,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2",
         .match        = 0x408,
         .match_mask   = 0x64c,
@@ -175,7 +175,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_BFD",
         .match        = 0x3800,
         .match_mask   = 0x3800,
@@ -189,7 +189,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT",
         .match        = 0x200,
         .match_mask   = 0x642,
@@ -203,7 +203,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -217,7 +217,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1",
         .match        = 0x100,
         .match_mask   = 0x1c0,
@@ -231,7 +231,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2",
         .match        = 0x600,
         .match_mask   = 0x640,
@@ -245,7 +245,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GPE",
         .match        = 0x1830,
         .match_mask   = 0x3870,
@@ -259,7 +259,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE",
         .match        = 0x2,
         .match_mask   = 0x42,
@@ -273,7 +273,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM",
         .match        = 0x202,
         .match_mask   = 0x642,
@@ -287,7 +287,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY",
         .match        = 0x1000,
         .match_mask   = 0x3800,
@@ -301,7 +301,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT",
         .match        = 0x82,
         .match_mask   = 0x1c2,
@@ -315,7 +315,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ",
         .match        = 0x12,
         .match_mask   = 0x72,
@@ -329,7 +329,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ICMP",
         .match        = 0x2000,
         .match_mask   = 0x3830,
@@ -343,7 +343,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA",
         .match        = 0x180,
         .match_mask   = 0x1c0,
@@ -357,7 +357,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IGMP",
         .match        = 0x404,
         .match_mask   = 0x64c,
@@ -371,7 +371,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IPV4",
         .match        = 0x4,
         .match_mask   = 0x4c,
@@ -385,7 +385,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IPV6",
         .match        = 0x8,
         .match_mask   = 0x4c,
@@ -399,7 +399,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS0",
         .match        = 0x40,
         .match_mask   = 0x40,
@@ -413,7 +413,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS1",
         .match        = 0x42,
         .match_mask   = 0x42,
@@ -427,7 +427,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS2",
         .match        = 0x44,
         .match_mask   = 0x44,
@@ -441,7 +441,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS3",
         .match        = 0x48,
         .match_mask   = 0x48,
@@ -455,7 +455,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS4",
         .match        = 0x50,
         .match_mask   = 0x50,
@@ -469,7 +469,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS5",
         .match        = 0x60,
         .match_mask   = 0x60,
@@ -483,7 +483,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS6",
         .match        = 0xc0,
         .match_mask   = 0xc0,
@@ -497,7 +497,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH",
         .match        = 0x140,
         .match_mask   = 0x140,
@@ -511,7 +511,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW",
         .match        = 0x240,
         .match_mask   = 0x240,
@@ -525,7 +525,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3fff,
@@ -539,7 +539,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_P_1588",
         .match        = 0x3000,
         .match_mask   = 0x3800,
@@ -553,7 +553,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_RARP",
         .match        = 0x800,
         .match_mask   = 0x3830,
@@ -567,7 +567,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x20,
         .match_mask   = 0x70,
@@ -581,7 +581,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x820,
         .match_mask   = 0x3870,
@@ -595,7 +595,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UDP",
         .match        = 0x30,
         .match_mask   = 0x70,
@@ -609,7 +609,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3",
         .match        = 0x10,
         .match_mask   = 0x72,
@@ -623,7 +623,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x2800,
         .match_mask   = 0x3800,
@@ -637,7 +637,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x2030,
         .match_mask   = 0x3870,
@@ -651,7 +651,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_VXLAN",
         .match        = 0x830,
         .match_mask   = 0x3870,
@@ -665,7 +665,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK */
         .name         = "EGRESS_PKT_SYS_HDR_LOOPBACK",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -679,7 +679,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE */
         .name         = "EGRESS_PKT_SYS_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x1,
@@ -693,7 +693,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ETAG */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ETAG */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_ETAG",
         .match        = 0x20,
         .match_mask   = 0x30,
@@ -707,7 +707,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_ITAG",
         .match        = 0x8,
         .match_mask   = 0x8,
@@ -721,7 +721,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2 */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_L2",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -735,7 +735,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3f,
@@ -749,7 +749,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_OTAG",
         .match        = 0x4,
         .match_mask   = 0x4,
@@ -763,7 +763,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC",
         .match        = 0x2,
         .match_mask   = 0x2,
@@ -777,7 +777,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_VNTAG */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_VNTAG */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_VNTAG",
         .match        = 0x10,
         .match_mask   = 0x30,
@@ -791,7 +791,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP",
         .match        = 0x1800,
         .match_mask   = 0x3830,
@@ -805,7 +805,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1",
         .match        = 0x80,
         .match_mask   = 0x1c2,
@@ -819,7 +819,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2",
         .match        = 0x408,
         .match_mask   = 0x64c,
@@ -833,7 +833,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD",
         .match        = 0x3800,
         .match_mask   = 0x3800,
@@ -847,7 +847,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT",
         .match        = 0x200,
         .match_mask   = 0x642,
@@ -861,7 +861,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -875,7 +875,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1",
         .match        = 0x100,
         .match_mask   = 0x1c0,
@@ -889,7 +889,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2",
         .match        = 0x600,
         .match_mask   = 0x640,
@@ -903,7 +903,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE",
         .match        = 0x1830,
         .match_mask   = 0x3870,
@@ -917,7 +917,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE",
         .match        = 0x2,
         .match_mask   = 0x42,
@@ -931,7 +931,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM",
         .match        = 0x202,
         .match_mask   = 0x642,
@@ -945,7 +945,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY",
         .match        = 0x1000,
         .match_mask   = 0x3800,
@@ -959,7 +959,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT",
         .match        = 0x82,
         .match_mask   = 0x1c2,
@@ -973,7 +973,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ",
         .match        = 0x12,
         .match_mask   = 0x72,
@@ -987,7 +987,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP",
         .match        = 0x2000,
         .match_mask   = 0x3830,
@@ -1001,7 +1001,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA",
         .match        = 0x180,
         .match_mask   = 0x1c0,
@@ -1015,7 +1015,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP",
         .match        = 0x404,
         .match_mask   = 0x64c,
@@ -1029,7 +1029,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4",
         .match        = 0x4,
         .match_mask   = 0x4c,
@@ -1043,7 +1043,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6",
         .match        = 0x8,
         .match_mask   = 0x4c,
@@ -1057,7 +1057,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0",
         .match        = 0x40,
         .match_mask   = 0x40,
@@ -1071,7 +1071,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1",
         .match        = 0x42,
         .match_mask   = 0x42,
@@ -1085,7 +1085,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2",
         .match        = 0x44,
         .match_mask   = 0x44,
@@ -1099,7 +1099,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3",
         .match        = 0x48,
         .match_mask   = 0x48,
@@ -1113,7 +1113,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4",
         .match        = 0x50,
         .match_mask   = 0x50,
@@ -1127,7 +1127,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5",
         .match        = 0x60,
         .match_mask   = 0x60,
@@ -1141,7 +1141,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6",
         .match        = 0xc0,
         .match_mask   = 0xc0,
@@ -1155,7 +1155,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH",
         .match        = 0x140,
         .match_mask   = 0x140,
@@ -1169,7 +1169,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW",
         .match        = 0x240,
         .match_mask   = 0x240,
@@ -1183,7 +1183,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3fff,
@@ -1197,7 +1197,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588",
         .match        = 0x3000,
         .match_mask   = 0x3800,
@@ -1211,7 +1211,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP",
         .match        = 0x800,
         .match_mask   = 0x3830,
@@ -1225,7 +1225,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x20,
         .match_mask   = 0x70,
@@ -1239,7 +1239,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x820,
         .match_mask   = 0x3870,
@@ -1253,7 +1253,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP",
         .match        = 0x30,
         .match_mask   = 0x70,
@@ -1267,7 +1267,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3",
         .match        = 0x10,
         .match_mask   = 0x72,
@@ -1281,7 +1281,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x2800,
         .match_mask   = 0x3800,
@@ -1295,7 +1295,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x2030,
         .match_mask   = 0x3870,
@@ -1309,7 +1309,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN",
         .match        = 0x830,
         .match_mask   = 0x3870,
@@ -1323,7 +1323,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ETAG */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ETAG */
         .name         = "INGRESS_PKT_INNER_L2_HDR_ETAG",
         .match        = 0x20,
         .match_mask   = 0x30,
@@ -1337,7 +1337,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG */
         .name         = "INGRESS_PKT_INNER_L2_HDR_ITAG",
         .match        = 0x8,
         .match_mask   = 0x8,
@@ -1351,7 +1351,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2 */
         .name         = "INGRESS_PKT_INNER_L2_HDR_L2",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -1365,7 +1365,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE */
         .name         = "INGRESS_PKT_INNER_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3f,
@@ -1379,7 +1379,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG */
         .name         = "INGRESS_PKT_INNER_L2_HDR_OTAG",
         .match        = 0x4,
         .match_mask   = 0x4,
@@ -1393,7 +1393,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC */
         .name         = "INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC",
         .match        = 0x2,
         .match_mask   = 0x2,
@@ -1407,7 +1407,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_VNTAG */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_VNTAG */
         .name         = "INGRESS_PKT_INNER_L2_HDR_VNTAG",
         .match        = 0x10,
         .match_mask   = 0x30,
@@ -1421,7 +1421,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ARP",
         .match        = 0x1800,
         .match_mask   = 0x3830,
@@ -1435,7 +1435,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1",
         .match        = 0x80,
         .match_mask   = 0x1c2,
@@ -1449,7 +1449,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2",
         .match        = 0x408,
         .match_mask   = 0x64c,
@@ -1463,7 +1463,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_BFD",
         .match        = 0x3800,
         .match_mask   = 0x3800,
@@ -1477,7 +1477,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT",
         .match        = 0x200,
         .match_mask   = 0x642,
@@ -1491,7 +1491,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -1505,7 +1505,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1",
         .match        = 0x100,
         .match_mask   = 0x1c0,
@@ -1519,7 +1519,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2",
         .match        = 0x600,
         .match_mask   = 0x640,
@@ -1533,7 +1533,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ICMP",
         .match        = 0x2000,
         .match_mask   = 0x3830,
@@ -1547,7 +1547,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA",
         .match        = 0x180,
         .match_mask   = 0x1c0,
@@ -1561,7 +1561,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_IGMP",
         .match        = 0x404,
         .match_mask   = 0x64c,
@@ -1575,7 +1575,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_IPV4",
         .match        = 0x4,
         .match_mask   = 0x4c,
@@ -1589,7 +1589,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_IPV6",
         .match        = 0x8,
         .match_mask   = 0x4c,
@@ -1603,7 +1603,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3fff,
@@ -1617,7 +1617,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_P_1588",
         .match        = 0x3000,
         .match_mask   = 0x3800,
@@ -1631,7 +1631,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_RARP",
         .match        = 0x800,
         .match_mask   = 0x3830,
@@ -1645,7 +1645,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x20,
         .match_mask   = 0x70,
@@ -1659,7 +1659,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x820,
         .match_mask   = 0x3870,
@@ -1673,7 +1673,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UDP",
         .match        = 0x30,
         .match_mask   = 0x70,
@@ -1687,7 +1687,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3",
         .match        = 0x10,
         .match_mask   = 0x72,
@@ -1701,7 +1701,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x2800,
         .match_mask   = 0x3800,
@@ -1715,7 +1715,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x2030,
         .match_mask   = 0x3870,
@@ -1729,7 +1729,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ETAG */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ETAG */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_ETAG",
         .match        = 0x20,
         .match_mask   = 0x30,
@@ -1743,7 +1743,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_ITAG",
         .match        = 0x8,
         .match_mask   = 0x8,
@@ -1757,7 +1757,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2 */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_L2",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -1771,7 +1771,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3f,
@@ -1785,7 +1785,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_OTAG",
         .match        = 0x4,
         .match_mask   = 0x4,
@@ -1799,7 +1799,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC",
         .match        = 0x2,
         .match_mask   = 0x2,
@@ -1813,7 +1813,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_VNTAG */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_VNTAG */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_VNTAG",
         .match        = 0x10,
         .match_mask   = 0x30,
@@ -1827,7 +1827,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ARP",
         .match        = 0x1800,
         .match_mask   = 0x3830,
@@ -1841,7 +1841,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1",
         .match        = 0x80,
         .match_mask   = 0x1c2,
@@ -1855,7 +1855,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2",
         .match        = 0x408,
         .match_mask   = 0x64c,
@@ -1869,7 +1869,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_BFD",
         .match        = 0x3800,
         .match_mask   = 0x3800,
@@ -1883,7 +1883,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT",
         .match        = 0x200,
         .match_mask   = 0x642,
@@ -1897,7 +1897,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -1911,7 +1911,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1",
         .match        = 0x100,
         .match_mask   = 0x1c0,
@@ -1925,7 +1925,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2",
         .match        = 0x600,
         .match_mask   = 0x640,
@@ -1939,7 +1939,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GPE",
         .match        = 0x1830,
         .match_mask   = 0x3870,
@@ -1953,7 +1953,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE",
         .match        = 0x2,
         .match_mask   = 0x42,
@@ -1967,7 +1967,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM",
         .match        = 0x202,
         .match_mask   = 0x642,
@@ -1981,7 +1981,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY",
         .match        = 0x1000,
         .match_mask   = 0x3800,
@@ -1995,7 +1995,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT",
         .match        = 0x82,
         .match_mask   = 0x1c2,
@@ -2009,7 +2009,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ",
         .match        = 0x12,
         .match_mask   = 0x72,
@@ -2023,7 +2023,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ICMP",
         .match        = 0x2000,
         .match_mask   = 0x3830,
@@ -2037,7 +2037,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA",
         .match        = 0x180,
         .match_mask   = 0x1c0,
@@ -2051,7 +2051,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IGMP",
         .match        = 0x404,
         .match_mask   = 0x64c,
@@ -2065,7 +2065,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IPV4",
         .match        = 0x4,
         .match_mask   = 0x4c,
@@ -2079,7 +2079,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IPV6",
         .match        = 0x8,
         .match_mask   = 0x4c,
@@ -2093,7 +2093,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0",
         .match        = 0x40,
         .match_mask   = 0x40,
@@ -2107,7 +2107,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1",
         .match        = 0x42,
         .match_mask   = 0x42,
@@ -2121,7 +2121,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2",
         .match        = 0x44,
         .match_mask   = 0x44,
@@ -2135,7 +2135,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3",
         .match        = 0x48,
         .match_mask   = 0x48,
@@ -2149,7 +2149,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4",
         .match        = 0x50,
         .match_mask   = 0x50,
@@ -2163,7 +2163,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5",
         .match        = 0x60,
         .match_mask   = 0x60,
@@ -2177,7 +2177,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6",
         .match        = 0xc0,
         .match_mask   = 0xc0,
@@ -2191,7 +2191,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH",
         .match        = 0x140,
         .match_mask   = 0x140,
@@ -2205,7 +2205,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW",
         .match        = 0x240,
         .match_mask   = 0x240,
@@ -2219,7 +2219,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3fff,
@@ -2233,7 +2233,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_P_1588",
         .match        = 0x3000,
         .match_mask   = 0x3800,
@@ -2247,7 +2247,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_RARP",
         .match        = 0x800,
         .match_mask   = 0x3830,
@@ -2261,7 +2261,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x20,
         .match_mask   = 0x70,
@@ -2275,7 +2275,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x820,
         .match_mask   = 0x3870,
@@ -2289,7 +2289,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UDP",
         .match        = 0x30,
         .match_mask   = 0x70,
@@ -2303,7 +2303,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3",
         .match        = 0x10,
         .match_mask   = 0x72,
@@ -2317,7 +2317,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x2800,
         .match_mask   = 0x3800,
@@ -2331,7 +2331,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x2030,
         .match_mask   = 0x3870,
@@ -2345,7 +2345,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN",
         .match        = 0x830,
         .match_mask   = 0x3870,
@@ -2359,7 +2359,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK */
         .name         = "INGRESS_PKT_SYS_HDR_LOOPBACK",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -2373,7 +2373,7 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE */
+        /* BCM56880_A0_HNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE */
         .name         = "INGRESS_PKT_SYS_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x1,
@@ -2388,23 +2388,23 @@ bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db[BCM56880_A0_HNA_6_5_30_3_0_RXPMD_MA
     },
 };
 
-static bcmpkt_rxpmd_match_id_db_info_t bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db_info = {
+static bcmpkt_rxpmd_match_id_db_info_t bcm56880_a0_hna_6_5_31_3_0_rxpmd_match_id_db_info = {
     .num_entries = 168,
-    .db = bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db
+    .db = bcm56880_a0_hna_6_5_31_3_0_rxpmd_match_id_db
 };
-bcmpkt_rxpmd_match_id_db_info_t * bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db_info_get(void) {
-    return &bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_db_info;
+bcmpkt_rxpmd_match_id_db_info_t * bcm56880_a0_hna_6_5_31_3_0_rxpmd_match_id_db_info_get(void) {
+    return &bcm56880_a0_hna_6_5_31_3_0_rxpmd_match_id_db_info;
 }
 
-static shr_enum_map_t bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_map[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT
+static shr_enum_map_t bcm56880_a0_hna_6_5_31_3_0_rxpmd_match_id_map[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_rxpmd_match_id_map_info_t bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_map_info = {
+static bcmpkt_rxpmd_match_id_map_info_t bcm56880_a0_hna_6_5_31_3_0_rxpmd_match_id_map_info = {
     .num_entries = 168,
-    .map = bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_map
+    .map = bcm56880_a0_hna_6_5_31_3_0_rxpmd_match_id_map
 };
 
-bcmpkt_rxpmd_match_id_map_info_t * bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_map_info_get(void) {
-    return &bcm56880_a0_hna_6_5_30_3_0_rxpmd_match_id_map_info;
+bcmpkt_rxpmd_match_id_map_info_t * bcm56880_a0_hna_6_5_31_3_0_rxpmd_match_id_map_info_get(void) {
+    return &bcm56880_a0_hna_6_5_31_3_0_rxpmd_match_id_map_info;
 }
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_pkt_flexhdr.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_pkt_flexhdr.c
similarity index 73%
rename from platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_pkt_flexhdr.c
rename to platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_pkt_flexhdr.c
index 808a69c2b681..ee9d6caf69e8 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_pkt_flexhdr.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_pkt_flexhdr.c
@@ -3,7 +3,7 @@
  * DO NOT EDIT THIS FILE!
  * This file is auto-generated by xfc_map_parser
  * from the NPL output file(s) map.yml
- * for device bcm56880_a0 and variant hna_6_5_30_3_0.
+ * for device bcm56880_a0 and variant hna_6_5_31_3_0.
  * Edits to this file will be lost when it is regenerated.
  *
  * $Id: $
@@ -31,298 +31,298 @@
 #include <shr/shr_error.h>
 #include <bcmpkt/bcmpkt_flexhdr.h>
 #include <bcmpkt/chip/bcm56880_a0/bcmpkt_bcm56880_a0_rxpmd.h>
-#include <bcmpkt/xfcr/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_bcmpkt_flexhdr.h>
-#include <bcmpkt/xfcr/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_bcmpkt_flexhdr_data.h>
-#include <bcmpkt/xfcr/bcm56880_a0/hna_6_5_30_3_0/bcm56880_a0_hna_6_5_30_3_0_bcmpkt_rxpmd_flex_data.h>
+#include <bcmpkt/xfcr/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_bcmpkt_flexhdr.h>
+#include <bcmpkt/xfcr/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_bcmpkt_flexhdr_data.h>
+#include <bcmpkt/xfcr/bcm56880_a0/hna_6_5_31_3_0/bcm56880_a0_hna_6_5_31_3_0_bcmpkt_rxpmd_flex_data.h>
 
 #define MASK(_bn) (((uint32_t)0x1<<(_bn))-1)
 #define WORD_FIELD_GET(_d,_s,_l) (((_d) >> (_s)) & MASK(_l))
 #define WORD_FIELD_SET(_d,_s,_l,_v) (_d)=(((_d) & ~(MASK(_l) << (_s))) | (((_v) & MASK(_l)) << (_s)))
 #define WORD_FIELD_MASK(_d,_s,_l) (_d)=((_d) | (MASK(_l) << (_s)))
 
-static void bcm56880_a0_hna_6_5_30_3_0_rxpmd_flex_reason_decode(uint32_t *data, bcmpkt_bitmap_t *reasons)
+static void bcm56880_a0_hna_6_5_31_3_0_rxpmd_flex_reason_decode(uint32_t *data, bcmpkt_bitmap_t *reasons)
 {
     uint32_t *reason = data + 0;
 
     if (reason[12] & (0x1 << 0)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU);
     }
     if (reason[12] & (0x1 << 1)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS);
     }
     if (reason[12] & (0x1 << 2)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE);
     }
     if (reason[12] & (0x1 << 3)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_RESERVED_TRACE_BIT);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_RESERVED_TRACE_BIT);
     }
     if (reason[12] & (0x1 << 4)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD);
     }
     if (reason[12] & (0x1 << 5)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED);
     }
     if (reason[12] & (0x1 << 6)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT);
     }
     if (reason[12] & (0x1 << 7)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD);
     }
     if (reason[12] & (0x1 << 8)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD);
     }
     if (reason[12] & (0x1 << 9)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS);
     }
     if (reason[12] & (0x1 << 10)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP);
     }
     if (reason[12] & (0x1 << 11)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS);
     }
     if (reason[12] & (0x1 << 12)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP);
     }
     if (reason[12] & (0x1 << 13)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR);
     }
     if (reason[12] & (0x1 << 14)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR);
     }
     if (reason[12] & (0x1 << 15)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED);
     }
     if (reason[12] & (0x1 << 16)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL);
     }
     if (reason[12] & (0x1 << 17)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_VFP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_VFP);
     }
     if (reason[12] & (0x1 << 18)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP);
     }
     if (reason[12] & (0x1 << 19)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER);
     }
     if (reason[12] & (0x1 << 20)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP);
     }
     if (reason[12] & (0x1 << 21)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_SVP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_SVP);
     }
     if (reason[12] & (0x1 << 22)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT);
     }
     if (reason[12] & (0x1 << 23)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT);
     }
     if (reason[12] & (0x1 << 24)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED);
     }
     if (reason[12] & (0x1 << 25)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED);
     }
     if (reason[12] & (0x1 << 26)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP);
     }
     if (reason[12] & (0x1 << 27)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED);
     }
     if (reason[12] & (0x1 << 28)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF);
     }
     if (reason[12] & (0x1 << 29)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED);
     }
     if (reason[12] & (0x1 << 30)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED);
     }
     if (reason[12] & (0x1 << 31)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU);
     }
     if (reason[11] & (0x1 << 0)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0);
     }
     if (reason[11] & (0x1 << 1)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1);
     }
     if (reason[11] & (0x1 << 2)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2);
     }
     if (reason[11] & (0x1 << 3)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3);
     }
     if (reason[11] & (0x1 << 4)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4);
     }
     if (reason[11] & (0x1 << 5)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5);
     }
     if (reason[11] & (0x1 << 6)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6);
     }
     if (reason[11] & (0x1 << 7)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7);
     }
     if (reason[11] & (0x1 << 8)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE);
     }
     if (reason[11] & (0x1 << 15)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP);
     }
 }
 
-static void bcm56880_a0_hna_6_5_30_3_0_rxpmd_flex_reason_encode(bcmpkt_bitmap_t *reasons, uint32_t *data)
+static void bcm56880_a0_hna_6_5_31_3_0_rxpmd_flex_reason_encode(bcmpkt_bitmap_t *reasons, uint32_t *data)
 {
     uint32_t *reason = data + 0;
 
     reason[12] = 0;
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU)) {
         reason[12] |= (0x1 << 0);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS)) {
         reason[12] |= (0x1 << 1);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE)) {
         reason[12] |= (0x1 << 2);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_RESERVED_TRACE_BIT)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_RESERVED_TRACE_BIT)) {
         reason[12] |= (0x1 << 3);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD)) {
         reason[12] |= (0x1 << 4);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED)) {
         reason[12] |= (0x1 << 5);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT)) {
         reason[12] |= (0x1 << 6);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD)) {
         reason[12] |= (0x1 << 7);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD)) {
         reason[12] |= (0x1 << 8);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS)) {
         reason[12] |= (0x1 << 9);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP)) {
         reason[12] |= (0x1 << 10);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS)) {
         reason[12] |= (0x1 << 11);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP)) {
         reason[12] |= (0x1 << 12);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR)) {
         reason[12] |= (0x1 << 13);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR)) {
         reason[12] |= (0x1 << 14);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED)) {
         reason[12] |= (0x1 << 15);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL)) {
         reason[12] |= (0x1 << 16);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_VFP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_VFP)) {
         reason[12] |= (0x1 << 17);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP)) {
         reason[12] |= (0x1 << 18);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER)) {
         reason[12] |= (0x1 << 19);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP)) {
         reason[12] |= (0x1 << 20);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_SVP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_SVP)) {
         reason[12] |= (0x1 << 21);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT)) {
         reason[12] |= (0x1 << 22);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT)) {
         reason[12] |= (0x1 << 23);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED)) {
         reason[12] |= (0x1 << 24);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED)) {
         reason[12] |= (0x1 << 25);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP)) {
         reason[12] |= (0x1 << 26);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED)) {
         reason[12] |= (0x1 << 27);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF)) {
         reason[12] |= (0x1 << 28);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED)) {
         reason[12] |= (0x1 << 29);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED)) {
         reason[12] |= (0x1 << 30);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU)) {
         reason[12] |= (0x1 << 31);
     }
     reason[11] = 0;
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0)) {
         reason[11] |= (0x1 << 0);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1)) {
         reason[11] |= (0x1 << 1);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2)) {
         reason[11] |= (0x1 << 2);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3)) {
         reason[11] |= (0x1 << 3);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4)) {
         reason[11] |= (0x1 << 4);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5)) {
         reason[11] |= (0x1 << 5);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6)) {
         reason[11] |= (0x1 << 6);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7)) {
         reason[11] |= (0x1 << 7);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE)) {
         reason[11] |= (0x1 << 8);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP)) {
         reason[11] |= (0x1 << 15);
     }
 }
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_rxpmd_flex_field_data[] = {
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_rxpmd_flex_field_data[] = {
     {
         .name = "DLB_ECMP_DESTINATION_15_0",
-        .fid = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_DLB_ECMP_DESTINATION_15_0,
+        .fid = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_DLB_ECMP_DESTINATION_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { -1, -1 }, /* Profile 2. */
             { -1, -1 }, /* Profile 3. */
             { 240, 255 }, /* Profile 4. */
-            { 240, 255 }, /* Profile 5. */
+            { 224, 239 }, /* Profile 5. */
         },
         .profile_cnt = 6,
     },
     {
         .name = "DROP_CODE_15_0",
-        .fid = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0,
+        .fid = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -335,7 +335,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_rxpmd_flex_field_
     },
     {
         .name = "DVP_15_0",
-        .fid = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_DVP_15_0,
+        .fid = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_DVP_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -348,31 +348,31 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_rxpmd_flex_field_
     },
     {
         .name = "EFFECTIVE_TTL_7_0",
-        .fid = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_7_0,
+        .fid = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_7_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 176, 183 }, /* Profile 2. */
-            { 176, 183 }, /* Profile 3. */
-            { 176, 183 }, /* Profile 4. */
-            { 176, 183 }, /* Profile 5. */
+            { 160, 167 }, /* Profile 2. */
+            { 144, 151 }, /* Profile 3. */
+            { 160, 167 }, /* Profile 4. */
+            { 144, 151 }, /* Profile 5. */
         },
         .profile_cnt = 6,
     },
     {
         .name = "EM_FT_OPAQUE_OBJ_OR_IFP_OPAQUE_OBJ_15_0",
-        .fid = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_EM_FT_OPAQUE_OBJ_OR_IFP_OPAQUE_OBJ_15_0,
+        .fid = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EM_FT_OPAQUE_OBJ_OR_IFP_OPAQUE_OBJ_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 240, 255 }, /* Profile 2. */
-            { 240, 255 }, /* Profile 3. */
+            { 224, 239 }, /* Profile 3. */
         },
         .profile_cnt = 4,
     },
     {
         .name = "ENTROPY_LABEL_HIGH_3_0",
-        .fid = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_HIGH_3_0,
+        .fid = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_HIGH_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -385,20 +385,20 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_rxpmd_flex_field_
     },
     {
         .name = "ENTROPY_LABEL_LOW_15_0",
-        .fid = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0,
+        .fid = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 192, 207 }, /* Profile 2. */
-            { 192, 207 }, /* Profile 3. */
-            { 192, 207 }, /* Profile 4. */
-            { 192, 207 }, /* Profile 5. */
+            { 176, 191 }, /* Profile 2. */
+            { 160, 175 }, /* Profile 3. */
+            { 176, 191 }, /* Profile 4. */
+            { 160, 175 }, /* Profile 5. */
         },
         .profile_cnt = 6,
     },
     {
         .name = "EVENT_TRACE_VECTOR_31_0",
-        .fid = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_0,
+        .fid = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -411,7 +411,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_rxpmd_flex_field_
     },
     {
         .name = "EVENT_TRACE_VECTOR_47_32",
-        .fid = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32,
+        .fid = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -424,20 +424,20 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_rxpmd_flex_field_
     },
     {
         .name = "I2E_CLASS_ID_15_0",
-        .fid = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0,
+        .fid = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 288, 303 }, /* Profile 2. */
-            { 288, 303 }, /* Profile 3. */
+            { 272, 287 }, /* Profile 3. */
             { 288, 303 }, /* Profile 4. */
-            { 288, 303 }, /* Profile 5. */
+            { 272, 287 }, /* Profile 5. */
         },
         .profile_cnt = 6,
     },
     {
         .name = "IFP_IOAM_GBP_ACTION_3_0",
-        .fid = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_IFP_IOAM_GBP_ACTION_3_0,
+        .fid = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_IFP_IOAM_GBP_ACTION_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -450,7 +450,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_rxpmd_flex_field_
     },
     {
         .name = "IFP_TS_CONTROL_ACTION_3_0",
-        .fid = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_IFP_TS_CONTROL_ACTION_3_0,
+        .fid = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_IFP_TS_CONTROL_ACTION_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -463,7 +463,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_rxpmd_flex_field_
     },
     {
         .name = "ING_PORT_GROUP_ID_3_0_3_0",
-        .fid = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_ING_PORT_GROUP_ID_3_0_3_0,
+        .fid = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_ING_PORT_GROUP_ID_3_0_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -476,7 +476,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_rxpmd_flex_field_
     },
     {
         .name = "ING_PORT_GROUP_ID_7_4_3_0",
-        .fid = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_ING_PORT_GROUP_ID_7_4_3_0,
+        .fid = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_ING_PORT_GROUP_ID_7_4_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -489,7 +489,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_rxpmd_flex_field_
     },
     {
         .name = "ING_TIMESTAMP_31_0",
-        .fid = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_0,
+        .fid = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -502,33 +502,33 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_rxpmd_flex_field_
     },
     {
         .name = "INGRESS_PP_PORT_ITAG_PRESERVE_15_0",
-        .fid = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_INGRESS_PP_PORT_ITAG_PRESERVE_15_0,
+        .fid = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_INGRESS_PP_PORT_ITAG_PRESERVE_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 320, 335 }, /* Profile 2. */
-            { 320, 335 }, /* Profile 3. */
+            { 304, 319 }, /* Profile 3. */
             { 320, 335 }, /* Profile 4. */
-            { 320, 335 }, /* Profile 5. */
+            { 304, 319 }, /* Profile 5. */
         },
         .profile_cnt = 6,
     },
     {
         .name = "INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0",
-        .fid = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0,
+        .fid = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 224, 239 }, /* Profile 2. */
-            { 224, 239 }, /* Profile 3. */
-            { 224, 239 }, /* Profile 4. */
-            { 224, 239 }, /* Profile 5. */
+            { 208, 223 }, /* Profile 2. */
+            { 192, 207 }, /* Profile 3. */
+            { 208, 223 }, /* Profile 4. */
+            { 192, 207 }, /* Profile 5. */
         },
         .profile_cnt = 6,
     },
     {
         .name = "INGRESS_QOS_REMARK_CTRL_3_0",
-        .fid = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0,
+        .fid = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -541,7 +541,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_rxpmd_flex_field_
     },
     {
         .name = "INT_PRI_3_0",
-        .fid = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_INT_PRI_3_0,
+        .fid = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_INT_PRI_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -554,7 +554,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_rxpmd_flex_field_
     },
     {
         .name = "L2_IIF_10_0",
-        .fid = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_L2_IIF_10_0,
+        .fid = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_L2_IIF_10_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -566,72 +566,72 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_rxpmd_flex_field_
     },
     {
         .name = "L2_OIF_10_0",
-        .fid = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_L2_OIF_10_0,
+        .fid = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_L2_OIF_10_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { -1, -1 }, /* Profile 2. */
-            { 128, 138 }, /* Profile 3. */
+            { 320, 330 }, /* Profile 3. */
             { -1, -1 }, /* Profile 4. */
-            { 128, 138 }, /* Profile 5. */
+            { 320, 330 }, /* Profile 5. */
         },
         .profile_cnt = 6,
     },
     {
         .name = "L3_IIF_13_0",
-        .fid = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_L3_IIF_13_0,
+        .fid = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_L3_IIF_13_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 160, 173 }, /* Profile 2. */
-            { 160, 173 }, /* Profile 3. */
-            { 160, 173 }, /* Profile 4. */
-            { 160, 173 }, /* Profile 5. */
+            { 144, 157 }, /* Profile 2. */
+            { 128, 141 }, /* Profile 3. */
+            { 144, 157 }, /* Profile 4. */
+            { 128, 141 }, /* Profile 5. */
         },
         .profile_cnt = 6,
     },
     {
         .name = "L3_OIF_1_13_0",
-        .fid = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0,
+        .fid = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 128, 141 }, /* Profile 2. */
-            { 112, 125 }, /* Profile 3. */
-            { 128, 141 }, /* Profile 4. */
-            { 112, 125 }, /* Profile 5. */
+            { 336, 349 }, /* Profile 2. */
+            { 336, 349 }, /* Profile 3. */
+            { 336, 349 }, /* Profile 4. */
+            { 336, 349 }, /* Profile 5. */
         },
         .profile_cnt = 6,
     },
     {
         .name = "NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0",
-        .fid = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0,
+        .fid = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 336, 351 }, /* Profile 2. */
-            { 336, 351 }, /* Profile 3. */
-            { 336, 351 }, /* Profile 4. */
-            { 336, 351 }, /* Profile 5. */
+            { 128, 143 }, /* Profile 2. */
+            { 112, 127 }, /* Profile 3. */
+            { 128, 143 }, /* Profile 4. */
+            { 112, 127 }, /* Profile 5. */
         },
         .profile_cnt = 6,
     },
     {
         .name = "NHOP_INDEX_1_15_0",
-        .fid = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_15_0,
+        .fid = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 208, 223 }, /* Profile 2. */
-            { 208, 223 }, /* Profile 3. */
-            { 208, 223 }, /* Profile 4. */
-            { 208, 223 }, /* Profile 5. */
+            { 192, 207 }, /* Profile 2. */
+            { 176, 191 }, /* Profile 3. */
+            { 192, 207 }, /* Profile 4. */
+            { 176, 191 }, /* Profile 5. */
         },
         .profile_cnt = 6,
     },
     {
         .name = "PARSER_VHLEN_0_15_0",
-        .fid = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0,
+        .fid = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -644,7 +644,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_rxpmd_flex_field_
     },
     {
         .name = "PKT_MISC_CTRL_0_3_0",
-        .fid = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0,
+        .fid = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -657,20 +657,20 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_rxpmd_flex_field_
     },
     {
         .name = "SVP_15_0",
-        .fid = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_SVP_15_0,
+        .fid = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_SVP_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 304, 319 }, /* Profile 2. */
-            { 304, 319 }, /* Profile 3. */
+            { 288, 303 }, /* Profile 3. */
             { 304, 319 }, /* Profile 4. */
-            { 304, 319 }, /* Profile 5. */
+            { 288, 303 }, /* Profile 5. */
         },
         .profile_cnt = 6,
     },
     {
         .name = "SVP_NETWORK_GROUP_BITMAP_3_0",
-        .fid = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0,
+        .fid = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -683,20 +683,20 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_rxpmd_flex_field_
     },
     {
         .name = "SYSTEM_DESTINATION_15_0",
-        .fid = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0,
+        .fid = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 272, 287 }, /* Profile 2. */
-            { 272, 287 }, /* Profile 3. */
+            { 256, 271 }, /* Profile 3. */
             { 272, 287 }, /* Profile 4. */
-            { 272, 287 }, /* Profile 5. */
+            { 256, 271 }, /* Profile 5. */
         },
         .profile_cnt = 6,
     },
     {
         .name = "SYSTEM_OPCODE_3_0",
-        .fid = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0,
+        .fid = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -709,20 +709,20 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_rxpmd_flex_field_
     },
     {
         .name = "SYSTEM_SOURCE_15_0",
-        .fid = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_SYSTEM_SOURCE_15_0,
+        .fid = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_SYSTEM_SOURCE_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 256, 271 }, /* Profile 2. */
-            { 256, 271 }, /* Profile 3. */
+            { 240, 255 }, /* Profile 3. */
             { 256, 271 }, /* Profile 4. */
-            { 256, 271 }, /* Profile 5. */
+            { 240, 255 }, /* Profile 5. */
         },
         .profile_cnt = 6,
     },
     {
         .name = "TIMESTAMP_CTRL_3_0",
-        .fid = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_TIMESTAMP_CTRL_3_0,
+        .fid = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_TIMESTAMP_CTRL_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -735,7 +735,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_rxpmd_flex_field_
     },
     {
         .name = "TUNNEL_PROCESSING_RESULTS_1_3_0",
-        .fid = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0,
+        .fid = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -748,31 +748,35 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_rxpmd_flex_field_
     },
     {
         .name = "VFI_15_0",
-        .fid = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_VFI_15_0,
+        .fid = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_VFI_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 144, 159 }, /* Profile 2. */
-            { 144, 159 }, /* Profile 3. */
-            { 144, 159 }, /* Profile 4. */
-            { 144, 159 }, /* Profile 5. */
+            { 224, 239 }, /* Profile 2. */
+            { 208, 223 }, /* Profile 3. */
+            { 224, 239 }, /* Profile 4. */
+            { 208, 223 }, /* Profile 5. */
         },
         .profile_cnt = 6,
     },
-};static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_rxpmd_flex_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_rxpmd_flex_field_data,
+};
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_rxpmd_flex_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_rxpmd_flex_field_data,
+    .profile_bmp_cnt = 1,
+    .profile_bmp[0] = 0x3c,
+
 };
 
-static shr_enum_map_t bcm56880_a0_hna_6_5_30_3_0_rxpmd_flex_reason_names[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT
+static shr_enum_map_t bcm56880_a0_hna_6_5_31_3_0_rxpmd_flex_reason_names[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_reasons_info_t bcm56880_a0_hna_6_5_30_3_0_rxpmd_flex_reasons_info = {
-    .num_reasons = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RXPMD_FLEX_REASON_COUNT,
-    .reason_names = bcm56880_a0_hna_6_5_30_3_0_rxpmd_flex_reason_names,
-    .reason_encode = bcm56880_a0_hna_6_5_30_3_0_rxpmd_flex_reason_encode,
-    .reason_decode = bcm56880_a0_hna_6_5_30_3_0_rxpmd_flex_reason_decode,
+static bcmpkt_flex_reasons_info_t bcm56880_a0_hna_6_5_31_3_0_rxpmd_flex_reasons_info = {
+    .num_reasons = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_COUNT,
+    .reason_names = bcm56880_a0_hna_6_5_31_3_0_rxpmd_flex_reason_names,
+    .reason_encode = bcm56880_a0_hna_6_5_31_3_0_rxpmd_flex_reason_encode,
+    .reason_decode = bcm56880_a0_hna_6_5_31_3_0_rxpmd_flex_reason_decode,
 };
 
 
@@ -915,7 +919,7 @@ static int32_t bcmpkt_arp_t_target_ip_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_arp_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ARP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_arp_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_FID_COUNT] = {
     bcmpkt_arp_t_hardware_len_get,
     bcmpkt_arp_t_hardware_type_get,
     bcmpkt_arp_t_operation_get,
@@ -927,7 +931,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_arp_t_fget[BCM56880_A0_HNA_6_
     bcmpkt_arp_t_target_ip_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_arp_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ARP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_arp_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_FID_COUNT] = {
     bcmpkt_arp_t_hardware_len_set,
     bcmpkt_arp_t_hardware_type_set,
     bcmpkt_arp_t_operation_set,
@@ -939,13 +943,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_arp_t_fset[BCM56880_A0_HNA_6_
     bcmpkt_arp_t_target_ip_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_arp_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_arp_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_arp_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ARP_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_arp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_arp_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ARP_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_arp_t_field_data,
 };
 
 
@@ -1042,7 +1046,7 @@ static int32_t bcmpkt_authen_t_spi_set(uint32_t *data, int profile, uint32_t val
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_authen_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_AUTHEN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_authen_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T_FID_COUNT] = {
     bcmpkt_authen_t_data_get,
     bcmpkt_authen_t_next_header_get,
     bcmpkt_authen_t_payload_len_get,
@@ -1051,7 +1055,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_authen_t_fget[BCM56880_A0_HNA
     bcmpkt_authen_t_spi_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_authen_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_AUTHEN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_authen_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T_FID_COUNT] = {
     bcmpkt_authen_t_data_set,
     bcmpkt_authen_t_next_header_set,
     bcmpkt_authen_t_payload_len_set,
@@ -1060,13 +1064,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_authen_t_fset[BCM56880_A0_HNA
     bcmpkt_authen_t_spi_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_authen_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_AUTHEN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_authen_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_authen_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_AUTHEN_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_authen_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_authen_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_AUTHEN_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_authen_t_field_data,
 };
 
 
@@ -1315,7 +1319,7 @@ static int32_t bcmpkt_bfd_t_version_set(uint32_t *data, int profile, uint32_t va
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_bfd_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_bfd_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_FID_COUNT] = {
     bcmpkt_bfd_t_ap_get,
     bcmpkt_bfd_t_bfd_length_get,
     bcmpkt_bfd_t_cpi_get,
@@ -1334,7 +1338,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_bfd_t_fget[BCM56880_A0_HNA_6_
     bcmpkt_bfd_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_bfd_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_bfd_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_FID_COUNT] = {
     bcmpkt_bfd_t_ap_set,
     bcmpkt_bfd_t_bfd_length_set,
     bcmpkt_bfd_t_cpi_set,
@@ -1353,13 +1357,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_bfd_t_fset[BCM56880_A0_HNA_6_
     bcmpkt_bfd_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_bfd_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_bfd_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_bfd_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_BFD_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_bfd_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_bfd_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_BFD_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_bfd_t_field_data,
 };
 
 
@@ -1393,23 +1397,23 @@ static int32_t bcmpkt_cntag_t_tpid_set(uint32_t *data, int profile, uint32_t val
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_cntag_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CNTAG_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_cntag_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CNTAG_T_FID_COUNT] = {
     bcmpkt_cntag_t_rpid_get,
     bcmpkt_cntag_t_tpid_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_cntag_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CNTAG_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_cntag_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CNTAG_T_FID_COUNT] = {
     bcmpkt_cntag_t_rpid_set,
     bcmpkt_cntag_t_tpid_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_cntag_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CNTAG_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_cntag_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CNTAG_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_cntag_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CNTAG_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_cntag_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_cntag_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CNTAG_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_cntag_t_field_data,
 };
 
 
@@ -1525,7 +1529,7 @@ static int32_t bcmpkt_cpu_composites_0_t_dma_cont6_set(uint32_t *data, int profi
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_cpu_composites_0_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_cpu_composites_0_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
     bcmpkt_cpu_composites_0_t_dma_cont0_get,
     bcmpkt_cpu_composites_0_t_dma_cont1_get,
     bcmpkt_cpu_composites_0_t_dma_cont2_get,
@@ -1535,7 +1539,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_cpu_composites_0_t_fget[BCM56
     bcmpkt_cpu_composites_0_t_dma_cont6_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_cpu_composites_0_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_cpu_composites_0_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
     bcmpkt_cpu_composites_0_t_dma_cont0_set,
     bcmpkt_cpu_composites_0_t_dma_cont1_set,
     bcmpkt_cpu_composites_0_t_dma_cont2_set,
@@ -1545,13 +1549,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_cpu_composites_0_t_fset[BCM56
     bcmpkt_cpu_composites_0_t_dma_cont6_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_cpu_composites_0_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_cpu_composites_0_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_cpu_composites_0_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_cpu_composites_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_cpu_composites_0_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_cpu_composites_0_t_field_data,
 };
 
 
@@ -1731,7 +1735,7 @@ static int32_t bcmpkt_cpu_composites_1_t_dma_cont9_set(uint32_t *data, int profi
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_cpu_composites_1_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_cpu_composites_1_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
     bcmpkt_cpu_composites_1_t_dma_cont10_get,
     bcmpkt_cpu_composites_1_t_dma_cont11_get,
     bcmpkt_cpu_composites_1_t_dma_cont12_get,
@@ -1745,7 +1749,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_cpu_composites_1_t_fget[BCM56
     bcmpkt_cpu_composites_1_t_dma_cont9_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_cpu_composites_1_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_cpu_composites_1_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
     bcmpkt_cpu_composites_1_t_dma_cont10_set,
     bcmpkt_cpu_composites_1_t_dma_cont11_set,
     bcmpkt_cpu_composites_1_t_dma_cont12_set,
@@ -1759,13 +1763,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_cpu_composites_1_t_fset[BCM56
     bcmpkt_cpu_composites_1_t_dma_cont9_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_cpu_composites_1_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_cpu_composites_1_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_cpu_composites_1_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_cpu_composites_1_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_cpu_composites_1_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_cpu_composites_1_t_field_data,
 };
 
 
@@ -1815,25 +1819,25 @@ static int32_t bcmpkt_dest_option_t_option_set(uint32_t *data, int profile, uint
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_dest_option_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_DEST_OPTION_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_dest_option_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_DEST_OPTION_T_FID_COUNT] = {
     bcmpkt_dest_option_t_hdr_ext_len_get,
     bcmpkt_dest_option_t_next_header_get,
     bcmpkt_dest_option_t_option_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_dest_option_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_DEST_OPTION_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_dest_option_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_DEST_OPTION_T_FID_COUNT] = {
     bcmpkt_dest_option_t_hdr_ext_len_set,
     bcmpkt_dest_option_t_next_header_set,
     bcmpkt_dest_option_t_option_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_dest_option_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_DEST_OPTION_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_dest_option_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_DEST_OPTION_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_dest_option_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_DEST_OPTION_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_dest_option_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_dest_option_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_DEST_OPTION_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_dest_option_t_field_data,
 };
 
 
@@ -1973,7 +1977,7 @@ static int32_t bcmpkt_erspan3_fixed_hdr_t_vlan_set(uint32_t *data, int profile,
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_erspan3_fixed_hdr_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_erspan3_fixed_hdr_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
     bcmpkt_erspan3_fixed_hdr_t_bso_get,
     bcmpkt_erspan3_fixed_hdr_t_cos_get,
     bcmpkt_erspan3_fixed_hdr_t_gbp_sid_get,
@@ -1985,7 +1989,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_erspan3_fixed_hdr_t_fget[BCM5
     bcmpkt_erspan3_fixed_hdr_t_vlan_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_erspan3_fixed_hdr_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_erspan3_fixed_hdr_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
     bcmpkt_erspan3_fixed_hdr_t_bso_set,
     bcmpkt_erspan3_fixed_hdr_t_cos_set,
     bcmpkt_erspan3_fixed_hdr_t_gbp_sid_set,
@@ -1997,13 +2001,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_erspan3_fixed_hdr_t_fset[BCM5
     bcmpkt_erspan3_fixed_hdr_t_vlan_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_erspan3_fixed_hdr_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_erspan3_fixed_hdr_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_erspan3_fixed_hdr_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_erspan3_fixed_hdr_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_erspan3_fixed_hdr_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_erspan3_fixed_hdr_t_field_data,
 };
 
 
@@ -2068,27 +2072,27 @@ static int32_t bcmpkt_erspan3_subhdr_5_t_timestamp_set(uint32_t *data, int profi
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_erspan3_subhdr_5_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_erspan3_subhdr_5_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
     bcmpkt_erspan3_subhdr_5_t_platform_id_get,
     bcmpkt_erspan3_subhdr_5_t_port_id_get,
     bcmpkt_erspan3_subhdr_5_t_switch_id_get,
     bcmpkt_erspan3_subhdr_5_t_timestamp_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_erspan3_subhdr_5_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_erspan3_subhdr_5_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
     bcmpkt_erspan3_subhdr_5_t_platform_id_set,
     bcmpkt_erspan3_subhdr_5_t_port_id_set,
     bcmpkt_erspan3_subhdr_5_t_switch_id_set,
     bcmpkt_erspan3_subhdr_5_t_timestamp_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_erspan3_subhdr_5_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_erspan3_subhdr_5_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_erspan3_subhdr_5_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_erspan3_subhdr_5_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_erspan3_subhdr_5_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_erspan3_subhdr_5_t_field_data,
 };
 
 
@@ -2169,7 +2173,7 @@ static int32_t bcmpkt_esp_t_spi_set(uint32_t *data, int profile, uint32_t val) {
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_esp_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ESP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_esp_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ESP_T_FID_COUNT] = {
     bcmpkt_esp_t_next_header_get,
     bcmpkt_esp_t_pad_get,
     bcmpkt_esp_t_pad_len_get,
@@ -2177,7 +2181,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_esp_t_fget[BCM56880_A0_HNA_6_
     bcmpkt_esp_t_spi_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_esp_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ESP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_esp_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ESP_T_FID_COUNT] = {
     bcmpkt_esp_t_next_header_set,
     bcmpkt_esp_t_pad_set,
     bcmpkt_esp_t_pad_len_set,
@@ -2185,13 +2189,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_esp_t_fset[BCM56880_A0_HNA_6_
     bcmpkt_esp_t_spi_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_esp_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ESP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_esp_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ESP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_esp_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ESP_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_esp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_esp_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ESP_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_esp_t_field_data,
 };
 
 
@@ -2226,23 +2230,23 @@ static int32_t bcmpkt_etag_t_tpid_set(uint32_t *data, int profile, uint32_t val)
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_etag_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ETAG_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_etag_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ETAG_T_FID_COUNT] = {
     bcmpkt_etag_t_tag_get,
     bcmpkt_etag_t_tpid_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_etag_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ETAG_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_etag_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ETAG_T_FID_COUNT] = {
     bcmpkt_etag_t_tag_set,
     bcmpkt_etag_t_tpid_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_etag_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ETAG_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_etag_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ETAG_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_etag_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ETAG_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_etag_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_etag_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ETAG_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_etag_t_field_data,
 };
 
 
@@ -2261,21 +2265,21 @@ static int32_t bcmpkt_ethertype_t_type_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_ethertype_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_ethertype_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
     bcmpkt_ethertype_t_type_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_ethertype_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_ethertype_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
     bcmpkt_ethertype_t_type_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_ethertype_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_ethertype_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_ethertype_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ETHERTYPE_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_ethertype_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_ethertype_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_ethertype_t_field_data,
 };
 
 
@@ -2340,27 +2344,27 @@ static int32_t bcmpkt_frag_t_reserved_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_frag_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_FRAG_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_frag_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_FRAG_T_FID_COUNT] = {
     bcmpkt_frag_t_frag_info_get,
     bcmpkt_frag_t_id_get,
     bcmpkt_frag_t_next_header_get,
     bcmpkt_frag_t_reserved_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_frag_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_FRAG_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_frag_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_FRAG_T_FID_COUNT] = {
     bcmpkt_frag_t_frag_info_set,
     bcmpkt_frag_t_id_set,
     bcmpkt_frag_t_next_header_set,
     bcmpkt_frag_t_reserved_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_frag_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_FRAG_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_frag_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_FRAG_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_frag_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_FRAG_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_frag_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_frag_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_FRAG_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_frag_t_field_data,
 };
 
 
@@ -2589,7 +2593,7 @@ static int32_t bcmpkt_generic_loopback_t_svp_set(uint32_t *data, int profile, ui
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_generic_loopback_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_generic_loopback_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
     bcmpkt_generic_loopback_t_destination_obj_get,
     bcmpkt_generic_loopback_t_destination_type_get,
     bcmpkt_generic_loopback_t_entropy_obj_get,
@@ -2607,7 +2611,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_generic_loopback_t_fget[BCM56
     bcmpkt_generic_loopback_t_svp_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_generic_loopback_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_generic_loopback_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
     bcmpkt_generic_loopback_t_destination_obj_set,
     bcmpkt_generic_loopback_t_destination_type_set,
     bcmpkt_generic_loopback_t_entropy_obj_set,
@@ -2625,13 +2629,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_generic_loopback_t_fset[BCM56
     bcmpkt_generic_loopback_t_svp_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_generic_loopback_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_generic_loopback_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_generic_loopback_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_generic_loopback_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_generic_loopback_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_generic_loopback_t_field_data,
 };
 
 
@@ -2710,7 +2714,7 @@ static int32_t bcmpkt_gpe_t_vni_set(uint32_t *data, int profile, uint32_t val) {
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_gpe_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GPE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_gpe_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GPE_T_FID_COUNT] = {
     bcmpkt_gpe_t_flags_get,
     bcmpkt_gpe_t_next_protocol_get,
     bcmpkt_gpe_t_reserved0_get,
@@ -2718,7 +2722,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_gpe_t_fget[BCM56880_A0_HNA_6_
     bcmpkt_gpe_t_vni_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_gpe_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GPE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_gpe_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GPE_T_FID_COUNT] = {
     bcmpkt_gpe_t_flags_set,
     bcmpkt_gpe_t_next_protocol_set,
     bcmpkt_gpe_t_reserved0_set,
@@ -2726,13 +2730,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_gpe_t_fset[BCM56880_A0_HNA_6_
     bcmpkt_gpe_t_vni_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_gpe_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GPE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_gpe_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GPE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_gpe_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GPE_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_gpe_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_gpe_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GPE_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_gpe_t_field_data,
 };
 
 
@@ -2766,23 +2770,23 @@ static int32_t bcmpkt_gre_chksum_t_offset_set(uint32_t *data, int profile, uint3
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_gre_chksum_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_gre_chksum_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT] = {
     bcmpkt_gre_chksum_t_checksum_get,
     bcmpkt_gre_chksum_t_offset_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_gre_chksum_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_gre_chksum_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT] = {
     bcmpkt_gre_chksum_t_checksum_set,
     bcmpkt_gre_chksum_t_offset_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_gre_chksum_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_CHKSUM_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_gre_chksum_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_CHKSUM_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_gre_chksum_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_gre_chksum_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_gre_chksum_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_gre_chksum_t_field_data,
 };
 
 
@@ -2802,21 +2806,21 @@ static int32_t bcmpkt_gre_key_t_key_set(uint32_t *data, int profile, uint32_t va
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_gre_key_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_KEY_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_gre_key_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_KEY_T_FID_COUNT] = {
     bcmpkt_gre_key_t_key_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_gre_key_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_KEY_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_gre_key_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_KEY_T_FID_COUNT] = {
     bcmpkt_gre_key_t_key_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_gre_key_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_KEY_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_gre_key_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_KEY_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_gre_key_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_KEY_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_gre_key_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_gre_key_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_KEY_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_gre_key_t_field_data,
 };
 
 
@@ -2836,21 +2840,21 @@ static int32_t bcmpkt_gre_rout_t_routing_set(uint32_t *data, int profile, uint32
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_gre_rout_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_ROUT_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_gre_rout_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_ROUT_T_FID_COUNT] = {
     bcmpkt_gre_rout_t_routing_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_gre_rout_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_ROUT_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_gre_rout_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_ROUT_T_FID_COUNT] = {
     bcmpkt_gre_rout_t_routing_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_gre_rout_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_ROUT_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_gre_rout_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_ROUT_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_gre_rout_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_ROUT_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_gre_rout_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_gre_rout_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_ROUT_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_gre_rout_t_field_data,
 };
 
 
@@ -2870,21 +2874,21 @@ static int32_t bcmpkt_gre_seq_t_sequence_set(uint32_t *data, int profile, uint32
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_gre_seq_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_SEQ_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_gre_seq_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_SEQ_T_FID_COUNT] = {
     bcmpkt_gre_seq_t_sequence_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_gre_seq_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_SEQ_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_gre_seq_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_SEQ_T_FID_COUNT] = {
     bcmpkt_gre_seq_t_sequence_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_gre_seq_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_SEQ_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_gre_seq_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_SEQ_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_gre_seq_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_SEQ_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_gre_seq_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_gre_seq_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_SEQ_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_gre_seq_t_field_data,
 };
 
 
@@ -2948,27 +2952,27 @@ static int32_t bcmpkt_gre_t_version_set(uint32_t *data, int profile, uint32_t va
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_gre_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_gre_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_T_FID_COUNT] = {
     bcmpkt_gre_t_c_r_k_s_get,
     bcmpkt_gre_t_protocol_get,
     bcmpkt_gre_t_reserved_get,
     bcmpkt_gre_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_gre_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_gre_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_T_FID_COUNT] = {
     bcmpkt_gre_t_c_r_k_s_set,
     bcmpkt_gre_t_protocol_set,
     bcmpkt_gre_t_reserved_set,
     bcmpkt_gre_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_gre_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_gre_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_gre_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_GRE_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_gre_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_gre_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_GRE_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_gre_t_field_data,
 };
 
 
@@ -3018,25 +3022,25 @@ static int32_t bcmpkt_hop_by_hop_t_option_set(uint32_t *data, int profile, uint3
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_hop_by_hop_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_hop_by_hop_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT] = {
     bcmpkt_hop_by_hop_t_hdr_ext_len_get,
     bcmpkt_hop_by_hop_t_next_header_get,
     bcmpkt_hop_by_hop_t_option_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_hop_by_hop_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_hop_by_hop_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT] = {
     bcmpkt_hop_by_hop_t_hdr_ext_len_set,
     bcmpkt_hop_by_hop_t_next_header_set,
     bcmpkt_hop_by_hop_t_option_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_hop_by_hop_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_HOP_BY_HOP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_hop_by_hop_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_HOP_BY_HOP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_hop_by_hop_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_hop_by_hop_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_hop_by_hop_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_hop_by_hop_t_field_data,
 };
 
 
@@ -3085,25 +3089,25 @@ static int32_t bcmpkt_icmp_t_icmp_type_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_icmp_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ICMP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_icmp_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ICMP_T_FID_COUNT] = {
     bcmpkt_icmp_t_checksum_get,
     bcmpkt_icmp_t_code_get,
     bcmpkt_icmp_t_icmp_type_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_icmp_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ICMP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_icmp_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ICMP_T_FID_COUNT] = {
     bcmpkt_icmp_t_checksum_set,
     bcmpkt_icmp_t_code_set,
     bcmpkt_icmp_t_icmp_type_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_icmp_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_icmp_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_icmp_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ICMP_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_icmp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_icmp_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ICMP_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_icmp_t_field_data,
 };
 
 
@@ -3137,23 +3141,23 @@ static int32_t bcmpkt_ifa_flex_md_0_a_t_lns_device_id_set(uint32_t *data, int pr
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_0_a_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_0_a_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_0_a_t_fwd_hdr_ttl_get,
     bcmpkt_ifa_flex_md_0_a_t_lns_device_id_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_0_a_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_0_a_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_0_a_t_fwd_hdr_ttl_set,
     bcmpkt_ifa_flex_md_0_a_t_lns_device_id_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_0_a_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_0_A_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_0_a_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_A_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_0_a_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_0_a_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_0_a_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_0_a_t_field_data,
 };
 
 
@@ -3217,27 +3221,27 @@ static int32_t bcmpkt_ifa_flex_md_0_b_t_rx_timestamp_sec_set(uint32_t *data, int
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_0_b_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_0_b_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_0_b_t_cn_get,
     bcmpkt_ifa_flex_md_0_b_t_port_speed_get,
     bcmpkt_ifa_flex_md_0_b_t_queue_id_get,
     bcmpkt_ifa_flex_md_0_b_t_rx_timestamp_sec_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_0_b_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_0_b_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_0_b_t_cn_set,
     bcmpkt_ifa_flex_md_0_b_t_port_speed_set,
     bcmpkt_ifa_flex_md_0_b_t_queue_id_set,
     bcmpkt_ifa_flex_md_0_b_t_rx_timestamp_sec_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_0_b_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_0_b_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_0_b_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_0_b_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_0_b_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_0_b_t_field_data,
 };
 
 
@@ -3287,25 +3291,25 @@ static int32_t bcmpkt_ifa_flex_md_1_t_rx_timestamp_nanosec_set(uint32_t *data, i
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_1_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_1_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_1_t_egress_port_id_get,
     bcmpkt_ifa_flex_md_1_t_ingress_port_id_get,
     bcmpkt_ifa_flex_md_1_t_rx_timestamp_nanosec_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_1_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_1_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_1_t_egress_port_id_set,
     bcmpkt_ifa_flex_md_1_t_ingress_port_id_set,
     bcmpkt_ifa_flex_md_1_t_rx_timestamp_nanosec_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_1_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_1_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_1_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_1_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_1_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_1_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_1_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_1_t_field_data,
 };
 
 
@@ -3341,23 +3345,23 @@ static int32_t bcmpkt_ifa_flex_md_2_t_tx_queue_byte_count_set(uint32_t *data, in
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_2_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_2_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_2_t_residence_time_nanosec_get,
     bcmpkt_ifa_flex_md_2_t_tx_queue_byte_count_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_2_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_2_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_2_t_residence_time_nanosec_set,
     bcmpkt_ifa_flex_md_2_t_tx_queue_byte_count_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_2_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_2_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_2_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_2_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_2_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_2_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_2_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_2_t_field_data,
 };
 
 
@@ -3393,23 +3397,23 @@ static int32_t bcmpkt_ifa_flex_md_3_t_mmu_stat_1_set(uint32_t *data, int profile
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_3_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_3_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_3_t_mmu_stat_0_get,
     bcmpkt_ifa_flex_md_3_t_mmu_stat_1_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_3_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_3_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT] = {
     bcmpkt_ifa_flex_md_3_t_mmu_stat_0_set,
     bcmpkt_ifa_flex_md_3_t_mmu_stat_1_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_3_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_3_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_3_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_3_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_3_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_3_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_3_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_3_t_field_data,
 };
 
 
@@ -3488,7 +3492,7 @@ static int32_t bcmpkt_ifa_header_t_ver_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_ifa_header_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_HEADER_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_ifa_header_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_HEADER_T_FID_COUNT] = {
     bcmpkt_ifa_header_t_flags_get,
     bcmpkt_ifa_header_t_gns_get,
     bcmpkt_ifa_header_t_max_length_get,
@@ -3496,7 +3500,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_ifa_header_t_fget[BCM56880_A0
     bcmpkt_ifa_header_t_ver_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_ifa_header_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_HEADER_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_ifa_header_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_HEADER_T_FID_COUNT] = {
     bcmpkt_ifa_header_t_flags_set,
     bcmpkt_ifa_header_t_gns_set,
     bcmpkt_ifa_header_t_max_length_set,
@@ -3504,13 +3508,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_ifa_header_t_fset[BCM56880_A0
     bcmpkt_ifa_header_t_ver_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_ifa_header_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_HEADER_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_ifa_header_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_HEADER_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_ifa_header_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_HEADER_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_ifa_header_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_ifa_header_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_HEADER_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_ifa_header_t_field_data,
 };
 
 
@@ -3559,25 +3563,25 @@ static int32_t bcmpkt_ifa_md_base_t_request_vector_set(uint32_t *data, int profi
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_ifa_md_base_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_MD_BASE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_ifa_md_base_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_MD_BASE_T_FID_COUNT] = {
     bcmpkt_ifa_md_base_t_action_vector_get,
     bcmpkt_ifa_md_base_t_hop_limit_current_length_get,
     bcmpkt_ifa_md_base_t_request_vector_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_ifa_md_base_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_MD_BASE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_ifa_md_base_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_MD_BASE_T_FID_COUNT] = {
     bcmpkt_ifa_md_base_t_action_vector_set,
     bcmpkt_ifa_md_base_t_hop_limit_current_length_set,
     bcmpkt_ifa_md_base_t_request_vector_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_ifa_md_base_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_MD_BASE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_ifa_md_base_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_MD_BASE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_ifa_md_base_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_MD_BASE_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_ifa_md_base_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_ifa_md_base_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_MD_BASE_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_ifa_md_base_t_field_data,
 };
 
 
@@ -3642,27 +3646,27 @@ static int32_t bcmpkt_ifa_metadata_t_request_vector_set(uint32_t *data, int prof
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_ifa_metadata_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_METADATA_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_ifa_metadata_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_METADATA_T_FID_COUNT] = {
     bcmpkt_ifa_metadata_t_action_vector_get,
     bcmpkt_ifa_metadata_t_hop_limit_current_length_get,
     bcmpkt_ifa_metadata_t_metadata_get,
     bcmpkt_ifa_metadata_t_request_vector_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_ifa_metadata_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_METADATA_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_ifa_metadata_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_METADATA_T_FID_COUNT] = {
     bcmpkt_ifa_metadata_t_action_vector_set,
     bcmpkt_ifa_metadata_t_hop_limit_current_length_set,
     bcmpkt_ifa_metadata_t_metadata_set,
     bcmpkt_ifa_metadata_t_request_vector_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_ifa_metadata_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_METADATA_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_ifa_metadata_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_METADATA_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_ifa_metadata_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IFA_METADATA_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_ifa_metadata_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_ifa_metadata_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IFA_METADATA_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_ifa_metadata_t_field_data,
 };
 
 
@@ -3727,27 +3731,27 @@ static int32_t bcmpkt_igmp_t_max_resp_time_set(uint32_t *data, int profile, uint
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_igmp_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IGMP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_igmp_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IGMP_T_FID_COUNT] = {
     bcmpkt_igmp_t_checksum_get,
     bcmpkt_igmp_t_group_address_get,
     bcmpkt_igmp_t_igmp_type_get,
     bcmpkt_igmp_t_max_resp_time_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_igmp_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IGMP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_igmp_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IGMP_T_FID_COUNT] = {
     bcmpkt_igmp_t_checksum_set,
     bcmpkt_igmp_t_group_address_set,
     bcmpkt_igmp_t_igmp_type_set,
     bcmpkt_igmp_t_max_resp_time_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_igmp_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IGMP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_igmp_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IGMP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_igmp_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IGMP_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_igmp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_igmp_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IGMP_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_igmp_t_field_data,
 };
 
 
@@ -3829,7 +3833,7 @@ static int32_t bcmpkt_ipfix_t_version_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_ipfix_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPFIX_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_ipfix_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPFIX_T_FID_COUNT] = {
     bcmpkt_ipfix_t_export_time_get,
     bcmpkt_ipfix_t_length_get,
     bcmpkt_ipfix_t_obs_domain_id_get,
@@ -3837,7 +3841,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_ipfix_t_fget[BCM56880_A0_HNA_
     bcmpkt_ipfix_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_ipfix_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPFIX_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_ipfix_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPFIX_T_FID_COUNT] = {
     bcmpkt_ipfix_t_export_time_set,
     bcmpkt_ipfix_t_length_set,
     bcmpkt_ipfix_t_obs_domain_id_set,
@@ -3845,13 +3849,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_ipfix_t_fset[BCM56880_A0_HNA_
     bcmpkt_ipfix_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_ipfix_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_ipfix_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_ipfix_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPFIX_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_ipfix_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_ipfix_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPFIX_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_ipfix_t_field_data,
 };
 
 
@@ -4023,7 +4027,7 @@ static int32_t bcmpkt_ipv4_t_version_hdr_len_set(uint32_t *data, int profile, ui
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_ipv4_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV4_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_ipv4_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_FID_COUNT] = {
     bcmpkt_ipv4_t_da_get,
     bcmpkt_ipv4_t_flags_frag_offset_get,
     bcmpkt_ipv4_t_hdr_checksum_get,
@@ -4037,7 +4041,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_ipv4_t_fget[BCM56880_A0_HNA_6
     bcmpkt_ipv4_t_version_hdr_len_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_ipv4_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV4_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_ipv4_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_FID_COUNT] = {
     bcmpkt_ipv4_t_da_set,
     bcmpkt_ipv4_t_flags_frag_offset_set,
     bcmpkt_ipv4_t_hdr_checksum_set,
@@ -4051,13 +4055,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_ipv4_t_fset[BCM56880_A0_HNA_6
     bcmpkt_ipv4_t_version_hdr_len_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_ipv4_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_ipv4_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_ipv4_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV4_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_ipv4_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_ipv4_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV4_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_ipv4_t_field_data,
 };
 
 
@@ -4183,7 +4187,7 @@ static int32_t bcmpkt_ipv6_t_version_set(uint32_t *data, int profile, uint32_t v
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_ipv6_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV6_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_ipv6_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_FID_COUNT] = {
     bcmpkt_ipv6_t_da_get,
     bcmpkt_ipv6_t_flow_label_get,
     bcmpkt_ipv6_t_hop_limit_get,
@@ -4194,7 +4198,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_ipv6_t_fget[BCM56880_A0_HNA_6
     bcmpkt_ipv6_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_ipv6_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV6_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_ipv6_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_FID_COUNT] = {
     bcmpkt_ipv6_t_da_set,
     bcmpkt_ipv6_t_flow_label_set,
     bcmpkt_ipv6_t_hop_limit_set,
@@ -4205,13 +4209,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_ipv6_t_fset[BCM56880_A0_HNA_6
     bcmpkt_ipv6_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_ipv6_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_ipv6_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_ipv6_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_IPV6_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_ipv6_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_ipv6_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_IPV6_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_ipv6_t_field_data,
 };
 
 
@@ -4247,23 +4251,23 @@ static int32_t bcmpkt_l2_t_macsa_set(uint32_t *data, int profile, uint32_t val)
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_l2_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_L2_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_l2_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_L2_T_FID_COUNT] = {
     bcmpkt_l2_t_macda_get,
     bcmpkt_l2_t_macsa_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_l2_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_L2_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_l2_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_L2_T_FID_COUNT] = {
     bcmpkt_l2_t_macda_set,
     bcmpkt_l2_t_macsa_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_l2_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_L2_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_l2_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_L2_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_l2_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_L2_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_l2_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_l2_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_L2_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_l2_t_field_data,
 };
 
 
@@ -4283,21 +4287,21 @@ static int32_t bcmpkt_mirror_erspan_sn_t_seq_num_set(uint32_t *data, int profile
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_mirror_erspan_sn_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_mirror_erspan_sn_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
     bcmpkt_mirror_erspan_sn_t_seq_num_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_mirror_erspan_sn_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_mirror_erspan_sn_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
     bcmpkt_mirror_erspan_sn_t_seq_num_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_mirror_erspan_sn_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_mirror_erspan_sn_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_mirror_erspan_sn_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_mirror_erspan_sn_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_mirror_erspan_sn_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_mirror_erspan_sn_t_field_data,
 };
 
 
@@ -4317,21 +4321,21 @@ static int32_t bcmpkt_mirror_transport_t_data_set(uint32_t *data, int profile, u
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_mirror_transport_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_mirror_transport_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
     bcmpkt_mirror_transport_t_data_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_mirror_transport_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_mirror_transport_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
     bcmpkt_mirror_transport_t_data_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_mirror_transport_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_mirror_transport_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_mirror_transport_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_mirror_transport_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_mirror_transport_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_mirror_transport_t_field_data,
 };
 
 
@@ -4395,27 +4399,27 @@ static int32_t bcmpkt_mpls_ach_t_version_set(uint32_t *data, int profile, uint32
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_mpls_ach_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_ACH_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_mpls_ach_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_ACH_T_FID_COUNT] = {
     bcmpkt_mpls_ach_t_channel_type_get,
     bcmpkt_mpls_ach_t_cw_type_get,
     bcmpkt_mpls_ach_t_reserved_get,
     bcmpkt_mpls_ach_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_mpls_ach_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_ACH_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_mpls_ach_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_ACH_T_FID_COUNT] = {
     bcmpkt_mpls_ach_t_channel_type_set,
     bcmpkt_mpls_ach_t_cw_type_set,
     bcmpkt_mpls_ach_t_reserved_set,
     bcmpkt_mpls_ach_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_mpls_ach_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_ACH_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_mpls_ach_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_ACH_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_mpls_ach_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_ACH_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_mpls_ach_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_mpls_ach_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_ACH_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_mpls_ach_t_field_data,
 };
 
 
@@ -4435,21 +4439,21 @@ static int32_t bcmpkt_mpls_bv_t_value_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_mpls_bv_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_BV_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_mpls_bv_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_BV_T_FID_COUNT] = {
     bcmpkt_mpls_bv_t_value_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_mpls_bv_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_BV_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_mpls_bv_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_BV_T_FID_COUNT] = {
     bcmpkt_mpls_bv_t_value_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_mpls_bv_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_BV_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_mpls_bv_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_BV_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_mpls_bv_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_BV_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_mpls_bv_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_mpls_bv_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_BV_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_mpls_bv_t_field_data,
 };
 
 
@@ -4498,25 +4502,25 @@ static int32_t bcmpkt_mpls_cw_t_seq_number_set(uint32_t *data, int profile, uint
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_mpls_cw_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_CW_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_mpls_cw_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_CW_T_FID_COUNT] = {
     bcmpkt_mpls_cw_t_cw_type_get,
     bcmpkt_mpls_cw_t_reserved_get,
     bcmpkt_mpls_cw_t_seq_number_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_mpls_cw_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_CW_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_mpls_cw_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_CW_T_FID_COUNT] = {
     bcmpkt_mpls_cw_t_cw_type_set,
     bcmpkt_mpls_cw_t_reserved_set,
     bcmpkt_mpls_cw_t_seq_number_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_mpls_cw_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_CW_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_mpls_cw_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_CW_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_mpls_cw_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_CW_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_mpls_cw_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_mpls_cw_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_CW_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_mpls_cw_t_field_data,
 };
 
 
@@ -4580,27 +4584,27 @@ static int32_t bcmpkt_mpls_t_ttl_set(uint32_t *data, int profile, uint32_t val)
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_mpls_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_mpls_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_T_FID_COUNT] = {
     bcmpkt_mpls_t_bos_get,
     bcmpkt_mpls_t_exp_get,
     bcmpkt_mpls_t_label_get,
     bcmpkt_mpls_t_ttl_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_mpls_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_mpls_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_T_FID_COUNT] = {
     bcmpkt_mpls_t_bos_set,
     bcmpkt_mpls_t_exp_set,
     bcmpkt_mpls_t_label_set,
     bcmpkt_mpls_t_ttl_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_mpls_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_mpls_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_mpls_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_MPLS_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_mpls_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_mpls_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_MPLS_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_mpls_t_field_data,
 };
 
 
@@ -4817,7 +4821,7 @@ static int32_t bcmpkt_p_1588_t_version_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_p_1588_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_P_1588_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_p_1588_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_FID_COUNT] = {
     bcmpkt_p_1588_t_cntrl_get,
     bcmpkt_p_1588_t_correction_get,
     bcmpkt_p_1588_t_domain_nb_get,
@@ -4834,7 +4838,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_p_1588_t_fget[BCM56880_A0_HNA
     bcmpkt_p_1588_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_p_1588_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_P_1588_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_p_1588_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_FID_COUNT] = {
     bcmpkt_p_1588_t_cntrl_set,
     bcmpkt_p_1588_t_correction_set,
     bcmpkt_p_1588_t_domain_nb_set,
@@ -4851,13 +4855,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_p_1588_t_fset[BCM56880_A0_HNA
     bcmpkt_p_1588_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_p_1588_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_P_1588_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_p_1588_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_p_1588_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_P_1588_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_p_1588_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_p_1588_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_P_1588_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_p_1588_t_field_data,
 };
 
 
@@ -4907,25 +4911,25 @@ static int32_t bcmpkt_prog_ext_hdr_t_option_set(uint32_t *data, int profile, uin
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_prog_ext_hdr_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_prog_ext_hdr_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT] = {
     bcmpkt_prog_ext_hdr_t_hdr_ext_len_get,
     bcmpkt_prog_ext_hdr_t_next_header_get,
     bcmpkt_prog_ext_hdr_t_option_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_prog_ext_hdr_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_prog_ext_hdr_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT] = {
     bcmpkt_prog_ext_hdr_t_hdr_ext_len_set,
     bcmpkt_prog_ext_hdr_t_next_header_set,
     bcmpkt_prog_ext_hdr_t_option_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_prog_ext_hdr_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PROG_EXT_HDR_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_prog_ext_hdr_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PROG_EXT_HDR_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_prog_ext_hdr_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_prog_ext_hdr_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_prog_ext_hdr_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_prog_ext_hdr_t_field_data,
 };
 
 
@@ -5021,7 +5025,7 @@ static int32_t bcmpkt_psamp_0_t_template_id_set(uint32_t *data, int profile, uin
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_psamp_0_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_psamp_0_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T_FID_COUNT] = {
     bcmpkt_psamp_0_t_flowset_get,
     bcmpkt_psamp_0_t_length_get,
     bcmpkt_psamp_0_t_next_hop_index_get,
@@ -5030,7 +5034,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_psamp_0_t_fget[BCM56880_A0_HN
     bcmpkt_psamp_0_t_template_id_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_psamp_0_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_psamp_0_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T_FID_COUNT] = {
     bcmpkt_psamp_0_t_flowset_set,
     bcmpkt_psamp_0_t_length_set,
     bcmpkt_psamp_0_t_next_hop_index_set,
@@ -5039,13 +5043,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_psamp_0_t_fset[BCM56880_A0_HN
     bcmpkt_psamp_0_t_template_id_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_psamp_0_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_psamp_0_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_psamp_0_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_0_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_psamp_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_psamp_0_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_0_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_psamp_0_t_field_data,
 };
 
 
@@ -5154,7 +5158,7 @@ static int32_t bcmpkt_psamp_1_t_variable_flag_set(uint32_t *data, int profile, u
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_psamp_1_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_1_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_psamp_1_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_FID_COUNT] = {
     bcmpkt_psamp_1_t_dlb_id_get,
     bcmpkt_psamp_1_t_egress_port_get,
     bcmpkt_psamp_1_t_epoch_get,
@@ -5164,7 +5168,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_psamp_1_t_fget[BCM56880_A0_HN
     bcmpkt_psamp_1_t_variable_flag_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_psamp_1_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_1_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_psamp_1_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_FID_COUNT] = {
     bcmpkt_psamp_1_t_dlb_id_set,
     bcmpkt_psamp_1_t_egress_port_set,
     bcmpkt_psamp_1_t_epoch_set,
@@ -5174,13 +5178,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_psamp_1_t_fset[BCM56880_A0_HN
     bcmpkt_psamp_1_t_variable_flag_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_psamp_1_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_1_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_psamp_1_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_psamp_1_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_1_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_psamp_1_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_psamp_1_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_1_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_psamp_1_t_field_data,
 };
 
 
@@ -5292,7 +5296,7 @@ static int32_t bcmpkt_psamp_mirror_on_drop_0_t_template_id_set(uint32_t *data, i
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_psamp_mirror_on_drop_0_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_psamp_mirror_on_drop_0_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_0_t_egress_mod_port_get,
     bcmpkt_psamp_mirror_on_drop_0_t_ingress_port_get,
     bcmpkt_psamp_mirror_on_drop_0_t_length_get,
@@ -5302,7 +5306,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_psamp_mirror_on_drop_0_t_fget
     bcmpkt_psamp_mirror_on_drop_0_t_template_id_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_psamp_mirror_on_drop_0_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_psamp_mirror_on_drop_0_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_0_t_egress_mod_port_set,
     bcmpkt_psamp_mirror_on_drop_0_t_ingress_port_set,
     bcmpkt_psamp_mirror_on_drop_0_t_length_set,
@@ -5312,13 +5316,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_psamp_mirror_on_drop_0_t_fset
     bcmpkt_psamp_mirror_on_drop_0_t_template_id_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_psamp_mirror_on_drop_0_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_psamp_mirror_on_drop_0_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_psamp_mirror_on_drop_0_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_psamp_mirror_on_drop_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_psamp_mirror_on_drop_0_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_psamp_mirror_on_drop_0_t_field_data,
 };
 
 
@@ -5427,7 +5431,7 @@ static int32_t bcmpkt_psamp_mirror_on_drop_3_t_var_len_indicator_set(uint32_t *d
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_psamp_mirror_on_drop_3_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_psamp_mirror_on_drop_3_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_3_t_drop_reason_get,
     bcmpkt_psamp_mirror_on_drop_3_t_mod_state_get,
     bcmpkt_psamp_mirror_on_drop_3_t_reserved_0_get,
@@ -5437,7 +5441,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_psamp_mirror_on_drop_3_t_fget
     bcmpkt_psamp_mirror_on_drop_3_t_var_len_indicator_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_psamp_mirror_on_drop_3_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_psamp_mirror_on_drop_3_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_3_t_drop_reason_set,
     bcmpkt_psamp_mirror_on_drop_3_t_mod_state_set,
     bcmpkt_psamp_mirror_on_drop_3_t_reserved_0_set,
@@ -5447,13 +5451,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_psamp_mirror_on_drop_3_t_fset
     bcmpkt_psamp_mirror_on_drop_3_t_var_len_indicator_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_psamp_mirror_on_drop_3_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_psamp_mirror_on_drop_3_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_psamp_mirror_on_drop_3_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_psamp_mirror_on_drop_3_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_psamp_mirror_on_drop_3_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_psamp_mirror_on_drop_3_t_field_data,
 };
 
 
@@ -5596,7 +5600,7 @@ static int32_t bcmpkt_rarp_t_target_ip_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_rarp_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RARP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_rarp_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_FID_COUNT] = {
     bcmpkt_rarp_t_hardware_len_get,
     bcmpkt_rarp_t_hardware_type_get,
     bcmpkt_rarp_t_operation_get,
@@ -5608,7 +5612,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_rarp_t_fget[BCM56880_A0_HNA_6
     bcmpkt_rarp_t_target_ip_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_rarp_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RARP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_rarp_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_FID_COUNT] = {
     bcmpkt_rarp_t_hardware_len_set,
     bcmpkt_rarp_t_hardware_type_set,
     bcmpkt_rarp_t_operation_set,
@@ -5620,13 +5624,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_rarp_t_fset[BCM56880_A0_HNA_6
     bcmpkt_rarp_t_target_ip_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_rarp_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_rarp_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_rarp_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RARP_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_rarp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_rarp_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RARP_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_rarp_t_field_data,
 };
 
 
@@ -5706,7 +5710,7 @@ static int32_t bcmpkt_routing_t_segments_left_set(uint32_t *data, int profile, u
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_routing_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ROUTING_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_routing_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ROUTING_T_FID_COUNT] = {
     bcmpkt_routing_t_data_get,
     bcmpkt_routing_t_hdr_ext_len_get,
     bcmpkt_routing_t_next_header_get,
@@ -5714,7 +5718,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_routing_t_fget[BCM56880_A0_HN
     bcmpkt_routing_t_segments_left_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_routing_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ROUTING_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_routing_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ROUTING_T_FID_COUNT] = {
     bcmpkt_routing_t_data_set,
     bcmpkt_routing_t_hdr_ext_len_set,
     bcmpkt_routing_t_next_header_set,
@@ -5722,13 +5726,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_routing_t_fset[BCM56880_A0_HN
     bcmpkt_routing_t_segments_left_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_routing_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ROUTING_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_routing_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ROUTING_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_routing_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_ROUTING_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_routing_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_routing_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_ROUTING_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_routing_t_field_data,
 };
 
 
@@ -5762,23 +5766,23 @@ static int32_t bcmpkt_rspan_t_tpid_set(uint32_t *data, int profile, uint32_t val
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_rspan_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RSPAN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_rspan_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RSPAN_T_FID_COUNT] = {
     bcmpkt_rspan_t_tag_get,
     bcmpkt_rspan_t_tpid_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_rspan_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RSPAN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_rspan_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RSPAN_T_FID_COUNT] = {
     bcmpkt_rspan_t_tag_set,
     bcmpkt_rspan_t_tpid_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_rspan_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RSPAN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_rspan_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RSPAN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_rspan_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_RSPAN_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_rspan_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_rspan_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_RSPAN_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_rspan_t_field_data,
 };
 
 
@@ -5828,25 +5832,25 @@ static int32_t bcmpkt_sflow_shim_0_t_version_set(uint32_t *data, int profile, ui
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_sflow_shim_0_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_sflow_shim_0_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT] = {
     bcmpkt_sflow_shim_0_t_sys_destination_get,
     bcmpkt_sflow_shim_0_t_sys_source_get,
     bcmpkt_sflow_shim_0_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_sflow_shim_0_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_sflow_shim_0_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT] = {
     bcmpkt_sflow_shim_0_t_sys_destination_set,
     bcmpkt_sflow_shim_0_t_sys_source_set,
     bcmpkt_sflow_shim_0_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_sflow_shim_0_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_sflow_shim_0_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_sflow_shim_0_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_sflow_shim_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_sflow_shim_0_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_sflow_shim_0_t_field_data,
 };
 
 
@@ -5970,7 +5974,7 @@ static int32_t bcmpkt_sflow_shim_1_t_sys_opcode_set(uint32_t *data, int profile,
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_sflow_shim_1_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_sflow_shim_1_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT] = {
     bcmpkt_sflow_shim_1_t_flag_dest_sample_get,
     bcmpkt_sflow_shim_1_t_flag_discarded_get,
     bcmpkt_sflow_shim_1_t_flag_flex_sample_get,
@@ -5981,7 +5985,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_sflow_shim_1_t_fget[BCM56880_
     bcmpkt_sflow_shim_1_t_sys_opcode_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_sflow_shim_1_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_sflow_shim_1_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT] = {
     bcmpkt_sflow_shim_1_t_flag_dest_sample_set,
     bcmpkt_sflow_shim_1_t_flag_discarded_set,
     bcmpkt_sflow_shim_1_t_flag_flex_sample_set,
@@ -5992,13 +5996,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_sflow_shim_1_t_fset[BCM56880_
     bcmpkt_sflow_shim_1_t_sys_opcode_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_sflow_shim_1_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_1_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_sflow_shim_1_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_sflow_shim_1_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_sflow_shim_1_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_sflow_shim_1_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_sflow_shim_1_t_field_data,
 };
 
 
@@ -6033,23 +6037,23 @@ static int32_t bcmpkt_sflow_shim_2_t_user_meta_data_set(uint32_t *data, int prof
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_sflow_shim_2_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_sflow_shim_2_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT] = {
     bcmpkt_sflow_shim_2_t_sequence_num_get,
     bcmpkt_sflow_shim_2_t_user_meta_data_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_sflow_shim_2_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_sflow_shim_2_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT] = {
     bcmpkt_sflow_shim_2_t_sequence_num_set,
     bcmpkt_sflow_shim_2_t_user_meta_data_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_sflow_shim_2_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_2_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_sflow_shim_2_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_2_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_sflow_shim_2_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_sflow_shim_2_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_sflow_shim_2_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_sflow_shim_2_t_field_data,
 };
 
 
@@ -6084,23 +6088,23 @@ static int32_t bcmpkt_snap_llc_t_snap_llc_set(uint32_t *data, int profile, uint3
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_snap_llc_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SNAP_LLC_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_snap_llc_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SNAP_LLC_T_FID_COUNT] = {
     bcmpkt_snap_llc_t_length_get,
     bcmpkt_snap_llc_t_snap_llc_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_snap_llc_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SNAP_LLC_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_snap_llc_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SNAP_LLC_T_FID_COUNT] = {
     bcmpkt_snap_llc_t_length_set,
     bcmpkt_snap_llc_t_snap_llc_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_snap_llc_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SNAP_LLC_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_snap_llc_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SNAP_LLC_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_snap_llc_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_SNAP_LLC_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_snap_llc_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_snap_llc_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_SNAP_LLC_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_snap_llc_t_field_data,
 };
 
 
@@ -6134,23 +6138,23 @@ static int32_t bcmpkt_tcp_first_4bytes_t_src_port_set(uint32_t *data, int profil
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_tcp_first_4bytes_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_tcp_first_4bytes_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_first_4bytes_t_dst_port_get,
     bcmpkt_tcp_first_4bytes_t_src_port_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_tcp_first_4bytes_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_tcp_first_4bytes_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_first_4bytes_t_dst_port_set,
     bcmpkt_tcp_first_4bytes_t_src_port_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_tcp_first_4bytes_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_tcp_first_4bytes_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_tcp_first_4bytes_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_tcp_first_4bytes_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_tcp_first_4bytes_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_tcp_first_4bytes_t_field_data,
 };
 
 
@@ -6246,7 +6250,7 @@ static int32_t bcmpkt_tcp_last_16bytes_t_win_size_set(uint32_t *data, int profil
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_tcp_last_16bytes_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_tcp_last_16bytes_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_last_16bytes_t_ack_num_get,
     bcmpkt_tcp_last_16bytes_t_checksum_get,
     bcmpkt_tcp_last_16bytes_t_hdr_len_and_flags_get,
@@ -6255,7 +6259,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_tcp_last_16bytes_t_fget[BCM56
     bcmpkt_tcp_last_16bytes_t_win_size_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_tcp_last_16bytes_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_tcp_last_16bytes_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_last_16bytes_t_ack_num_set,
     bcmpkt_tcp_last_16bytes_t_checksum_set,
     bcmpkt_tcp_last_16bytes_t_hdr_len_and_flags_set,
@@ -6264,13 +6268,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_tcp_last_16bytes_t_fset[BCM56
     bcmpkt_tcp_last_16bytes_t_win_size_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_tcp_last_16bytes_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_tcp_last_16bytes_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_tcp_last_16bytes_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_tcp_last_16bytes_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_tcp_last_16bytes_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_tcp_last_16bytes_t_field_data,
 };
 
 
@@ -6334,27 +6338,27 @@ static int32_t bcmpkt_udp_t_udp_length_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_udp_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UDP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_udp_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UDP_T_FID_COUNT] = {
     bcmpkt_udp_t_checksum_get,
     bcmpkt_udp_t_dst_port_get,
     bcmpkt_udp_t_src_port_get,
     bcmpkt_udp_t_udp_length_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_udp_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UDP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_udp_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UDP_T_FID_COUNT] = {
     bcmpkt_udp_t_checksum_set,
     bcmpkt_udp_t_dst_port_set,
     bcmpkt_udp_t_src_port_set,
     bcmpkt_udp_t_udp_length_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_udp_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_udp_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_udp_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UDP_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_udp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_udp_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UDP_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_udp_t_field_data,
 };
 
 
@@ -6390,23 +6394,23 @@ static int32_t bcmpkt_unknown_l3_t_next_16bytes_of_l3_payload_set(uint32_t *data
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_unknown_l3_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_unknown_l3_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
     bcmpkt_unknown_l3_t_first_16bytes_of_l3_payload_get,
     bcmpkt_unknown_l3_t_next_16bytes_of_l3_payload_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_unknown_l3_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_unknown_l3_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
     bcmpkt_unknown_l3_t_first_16bytes_of_l3_payload_set,
     bcmpkt_unknown_l3_t_next_16bytes_of_l3_payload_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_unknown_l3_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_unknown_l3_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_unknown_l3_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_unknown_l3_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_unknown_l3_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_unknown_l3_t_field_data,
 };
 
 
@@ -6426,21 +6430,21 @@ static int32_t bcmpkt_unknown_l4_t_first_4bytes_of_l4_payload_set(uint32_t *data
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_unknown_l4_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_unknown_l4_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
     bcmpkt_unknown_l4_t_first_4bytes_of_l4_payload_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_unknown_l4_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_unknown_l4_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
     bcmpkt_unknown_l4_t_first_4bytes_of_l4_payload_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_unknown_l4_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_unknown_l4_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_unknown_l4_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_unknown_l4_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_unknown_l4_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_unknown_l4_t_field_data,
 };
 
 
@@ -6490,25 +6494,25 @@ static int32_t bcmpkt_unknown_l5_t_l5_bytes_4_7_set(uint32_t *data, int profile,
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_unknown_l5_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_unknown_l5_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
     bcmpkt_unknown_l5_t_l5_bytes_0_1_get,
     bcmpkt_unknown_l5_t_l5_bytes_2_3_get,
     bcmpkt_unknown_l5_t_l5_bytes_4_7_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_unknown_l5_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_unknown_l5_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
     bcmpkt_unknown_l5_t_l5_bytes_0_1_set,
     bcmpkt_unknown_l5_t_l5_bytes_2_3_set,
     bcmpkt_unknown_l5_t_l5_bytes_4_7_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_unknown_l5_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_unknown_l5_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_unknown_l5_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_unknown_l5_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_unknown_l5_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_unknown_l5_t_field_data,
 };
 
 
@@ -6572,27 +6576,27 @@ static int32_t bcmpkt_vlan_t_vid_set(uint32_t *data, int profile, uint32_t val)
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_vlan_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_vlan_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VLAN_T_FID_COUNT] = {
     bcmpkt_vlan_t_cfi_get,
     bcmpkt_vlan_t_pcp_get,
     bcmpkt_vlan_t_tpid_get,
     bcmpkt_vlan_t_vid_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_vlan_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_vlan_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VLAN_T_FID_COUNT] = {
     bcmpkt_vlan_t_cfi_set,
     bcmpkt_vlan_t_pcp_set,
     bcmpkt_vlan_t_tpid_set,
     bcmpkt_vlan_t_vid_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_vlan_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_vlan_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_vlan_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VLAN_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_vlan_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_vlan_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VLAN_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_vlan_t_field_data,
 };
 
 
@@ -6627,23 +6631,23 @@ static int32_t bcmpkt_vntag_t_tpid_set(uint32_t *data, int profile, uint32_t val
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_vntag_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VNTAG_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_vntag_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VNTAG_T_FID_COUNT] = {
     bcmpkt_vntag_t_tag_get,
     bcmpkt_vntag_t_tpid_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_vntag_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VNTAG_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_vntag_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VNTAG_T_FID_COUNT] = {
     bcmpkt_vntag_t_tag_set,
     bcmpkt_vntag_t_tpid_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_vntag_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VNTAG_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_vntag_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VNTAG_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_vntag_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VNTAG_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_vntag_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_vntag_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VNTAG_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_vntag_t_field_data,
 };
 
 
@@ -6693,25 +6697,25 @@ static int32_t bcmpkt_vxlan_t_vn_id_set(uint32_t *data, int profile, uint32_t va
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_vxlan_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VXLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_vxlan_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VXLAN_T_FID_COUNT] = {
     bcmpkt_vxlan_t_flags_reserved_1_get,
     bcmpkt_vxlan_t_reserved2_get,
     bcmpkt_vxlan_t_vn_id_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_vxlan_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VXLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_vxlan_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VXLAN_T_FID_COUNT] = {
     bcmpkt_vxlan_t_flags_reserved_1_set,
     bcmpkt_vxlan_t_reserved2_set,
     bcmpkt_vxlan_t_vn_id_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_vxlan_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_vxlan_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_vxlan_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_VXLAN_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_vxlan_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_vxlan_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_VXLAN_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_vxlan_t_field_data,
 };
 
 
@@ -6823,7 +6827,7 @@ static int32_t bcmpkt_wesp_t_wesp_iv_set(uint32_t *data, int profile, uint32_t v
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_wesp_t_fget[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_WESP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_31_3_0_wesp_t_fget[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_FID_COUNT] = {
     bcmpkt_wesp_t_flags_get,
     bcmpkt_wesp_t_header_len_get,
     bcmpkt_wesp_t_next_header_get,
@@ -6833,7 +6837,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_hna_6_5_30_3_0_wesp_t_fget[BCM56880_A0_HNA_6
     bcmpkt_wesp_t_wesp_iv_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_wesp_t_fset[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_WESP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_31_3_0_wesp_t_fset[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_FID_COUNT] = {
     bcmpkt_wesp_t_flags_set,
     bcmpkt_wesp_t_header_len_set,
     bcmpkt_wesp_t_next_header_set,
@@ -6843,492 +6847,492 @@ bcmpkt_flex_field_set_f bcm56880_a0_hna_6_5_30_3_0_wesp_t_fset[BCM56880_A0_HNA_6
     bcmpkt_wesp_t_wesp_iv_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_30_3_0_wesp_t_field_data[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_WESP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_hna_6_5_31_3_0_wesp_t_field_data[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_30_3_0_wesp_t_field_info = {
-    .num_fields = BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_WESP_T_FID_COUNT,
-    .info = bcm56880_a0_hna_6_5_30_3_0_wesp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_hna_6_5_31_3_0_wesp_t_field_info = {
+    .num_fields = BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_WESP_T_FID_COUNT,
+    .info = bcm56880_a0_hna_6_5_31_3_0_wesp_t_field_data,
 };
 
-static bcmpkt_flex_pmd_info_t bcm56880_a0_hna_6_5_30_3_0_flexhdr_info_list[BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_FLEXHDR_COUNT] = {
+static bcmpkt_flex_pmd_info_t bcm56880_a0_hna_6_5_31_3_0_flexhdr_info_list[BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_FLEXHDR_COUNT] = {
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_arp_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_arp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_arp_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_arp_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_arp_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_arp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_authen_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_authen_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_authen_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_authen_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_authen_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_authen_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_bfd_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_bfd_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_bfd_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_bfd_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_bfd_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_bfd_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_cntag_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_cntag_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_cntag_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_cntag_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_cntag_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_cntag_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_cpu_composites_0_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_cpu_composites_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_cpu_composites_0_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_cpu_composites_0_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_cpu_composites_0_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_cpu_composites_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_cpu_composites_1_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_cpu_composites_1_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_cpu_composites_1_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_cpu_composites_1_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_cpu_composites_1_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_cpu_composites_1_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_dest_option_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_dest_option_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_dest_option_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_dest_option_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_dest_option_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_dest_option_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_erspan3_fixed_hdr_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_erspan3_fixed_hdr_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_erspan3_fixed_hdr_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_erspan3_fixed_hdr_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_erspan3_fixed_hdr_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_erspan3_fixed_hdr_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_erspan3_subhdr_5_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_erspan3_subhdr_5_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_erspan3_subhdr_5_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_erspan3_subhdr_5_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_erspan3_subhdr_5_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_erspan3_subhdr_5_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_esp_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_esp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_esp_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_esp_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_esp_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_esp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_etag_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_etag_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_etag_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_etag_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_etag_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_etag_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_ethertype_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_ethertype_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_ethertype_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_ethertype_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_ethertype_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_ethertype_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_frag_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_frag_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_frag_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_frag_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_frag_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_frag_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_generic_loopback_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_generic_loopback_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_generic_loopback_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_generic_loopback_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_generic_loopback_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_generic_loopback_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_gpe_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_gpe_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_gpe_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_gpe_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_gpe_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_gpe_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_gre_chksum_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_gre_chksum_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_gre_chksum_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_gre_chksum_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_gre_chksum_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_gre_chksum_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_gre_key_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_gre_key_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_gre_key_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_gre_key_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_gre_key_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_gre_key_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_gre_rout_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_gre_rout_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_gre_rout_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_gre_rout_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_gre_rout_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_gre_rout_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_gre_seq_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_gre_seq_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_gre_seq_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_gre_seq_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_gre_seq_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_gre_seq_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_gre_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_gre_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_gre_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_gre_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_gre_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_gre_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_hop_by_hop_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_hop_by_hop_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_hop_by_hop_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_hop_by_hop_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_hop_by_hop_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_hop_by_hop_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_icmp_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_icmp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_icmp_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_icmp_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_icmp_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_icmp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_0_a_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_0_a_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_0_a_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_0_a_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_0_a_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_0_a_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_0_b_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_0_b_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_0_b_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_0_b_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_0_b_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_0_b_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_1_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_1_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_1_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_1_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_1_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_1_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_2_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_2_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_2_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_2_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_2_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_2_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_3_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_3_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_3_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_ifa_flex_md_3_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_3_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_ifa_flex_md_3_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_ifa_header_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_ifa_header_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_ifa_header_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_ifa_header_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_ifa_header_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_ifa_header_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_ifa_md_base_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_ifa_md_base_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_ifa_md_base_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_ifa_md_base_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_ifa_md_base_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_ifa_md_base_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_ifa_metadata_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_ifa_metadata_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_ifa_metadata_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_ifa_metadata_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_ifa_metadata_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_ifa_metadata_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_igmp_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_igmp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_igmp_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_igmp_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_igmp_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_igmp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_ipfix_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_ipfix_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_ipfix_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_ipfix_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_ipfix_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_ipfix_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_ipv4_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_ipv4_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_ipv4_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_ipv4_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_ipv4_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_ipv4_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_ipv6_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_ipv6_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_ipv6_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_ipv6_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_ipv6_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_ipv6_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_l2_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_l2_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_l2_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_l2_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_l2_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_l2_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_mirror_erspan_sn_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_mirror_erspan_sn_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_mirror_erspan_sn_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_mirror_erspan_sn_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_mirror_erspan_sn_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_mirror_erspan_sn_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_mirror_transport_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_mirror_transport_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_mirror_transport_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_mirror_transport_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_mirror_transport_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_mirror_transport_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_mpls_ach_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_mpls_ach_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_mpls_ach_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_mpls_ach_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_mpls_ach_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_mpls_ach_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_mpls_bv_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_mpls_bv_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_mpls_bv_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_mpls_bv_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_mpls_bv_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_mpls_bv_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_mpls_cw_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_mpls_cw_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_mpls_cw_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_mpls_cw_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_mpls_cw_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_mpls_cw_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_mpls_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_mpls_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_mpls_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_mpls_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_mpls_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_mpls_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_p_1588_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_p_1588_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_p_1588_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_p_1588_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_p_1588_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_p_1588_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_prog_ext_hdr_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_prog_ext_hdr_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_prog_ext_hdr_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_prog_ext_hdr_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_prog_ext_hdr_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_prog_ext_hdr_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_psamp_0_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_psamp_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_psamp_0_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_psamp_0_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_psamp_0_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_psamp_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_psamp_1_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_psamp_1_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_psamp_1_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_psamp_1_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_psamp_1_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_psamp_1_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_psamp_mirror_on_drop_0_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_psamp_mirror_on_drop_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_psamp_mirror_on_drop_0_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_psamp_mirror_on_drop_0_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_psamp_mirror_on_drop_0_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_psamp_mirror_on_drop_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_psamp_mirror_on_drop_3_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_psamp_mirror_on_drop_3_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_psamp_mirror_on_drop_3_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_psamp_mirror_on_drop_3_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_psamp_mirror_on_drop_3_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_psamp_mirror_on_drop_3_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_rarp_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_rarp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_rarp_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_rarp_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_rarp_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_rarp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_routing_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_routing_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_routing_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_routing_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_routing_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_routing_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_rspan_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_rspan_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_rspan_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_rspan_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_rspan_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_rspan_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_sflow_shim_0_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_sflow_shim_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_sflow_shim_0_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_sflow_shim_0_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_sflow_shim_0_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_sflow_shim_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_sflow_shim_1_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_sflow_shim_1_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_sflow_shim_1_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_sflow_shim_1_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_sflow_shim_1_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_sflow_shim_1_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_sflow_shim_2_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_sflow_shim_2_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_sflow_shim_2_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_sflow_shim_2_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_sflow_shim_2_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_sflow_shim_2_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_snap_llc_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_snap_llc_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_snap_llc_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_snap_llc_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_snap_llc_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_snap_llc_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_tcp_first_4bytes_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_tcp_first_4bytes_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_tcp_first_4bytes_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_tcp_first_4bytes_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_tcp_first_4bytes_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_tcp_first_4bytes_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_tcp_last_16bytes_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_tcp_last_16bytes_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_tcp_last_16bytes_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_tcp_last_16bytes_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_tcp_last_16bytes_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_tcp_last_16bytes_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_udp_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_udp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_udp_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_udp_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_udp_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_udp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_unknown_l3_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_unknown_l3_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_unknown_l3_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_unknown_l3_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_unknown_l3_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_unknown_l3_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_unknown_l4_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_unknown_l4_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_unknown_l4_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_unknown_l4_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_unknown_l4_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_unknown_l4_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_unknown_l5_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_unknown_l5_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_unknown_l5_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_unknown_l5_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_unknown_l5_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_unknown_l5_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_vlan_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_vlan_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_vlan_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_vlan_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_vlan_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_vlan_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_vntag_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_vntag_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_vntag_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_vntag_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_vntag_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_vntag_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_vxlan_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_vxlan_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_vxlan_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_vxlan_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_vxlan_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_vxlan_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_wesp_t_field_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_wesp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_hna_6_5_30_3_0_wesp_t_fget,
-        .flex_fset = bcm56880_a0_hna_6_5_30_3_0_wesp_t_fset,
+        .flex_fget = bcm56880_a0_hna_6_5_31_3_0_wesp_t_fget,
+        .flex_fset = bcm56880_a0_hna_6_5_31_3_0_wesp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_hna_6_5_30_3_0_rxpmd_flex_field_info,
-        .reasons_info = &bcm56880_a0_hna_6_5_30_3_0_rxpmd_flex_reasons_info,
+        .field_info = &bcm56880_a0_hna_6_5_31_3_0_rxpmd_flex_field_info,
+        .reasons_info = &bcm56880_a0_hna_6_5_31_3_0_rxpmd_flex_reasons_info,
         .flex_common_fget = bcm56880_a0_rxpmd_flex_fget,
         .flex_common_fset = bcm56880_a0_rxpmd_flex_fset,
     },
 };
 
-static shr_enum_map_t bcm56880_a0_hna_6_5_30_3_0_flexhdr_id_map[] = {
-    BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_FLEXHDR_NAME_MAP_INIT
+static shr_enum_map_t bcm56880_a0_hna_6_5_31_3_0_flexhdr_id_map[] = {
+    BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_FLEXHDR_NAME_MAP_INIT
 };
 
-shr_enum_map_t * bcm56880_a0_hna_6_5_30_3_0_flexhdr_map_get(void)
+shr_enum_map_t * bcm56880_a0_hna_6_5_31_3_0_flexhdr_map_get(void)
 {
-    return bcm56880_a0_hna_6_5_30_3_0_flexhdr_id_map;
+    return bcm56880_a0_hna_6_5_31_3_0_flexhdr_id_map;
 }
 
-bcmpkt_flex_pmd_info_t * bcm56880_a0_hna_6_5_30_3_0_flex_pmd_info_get(uint32_t hid)
+bcmpkt_flex_pmd_info_t * bcm56880_a0_hna_6_5_31_3_0_flex_pmd_info_get(uint32_t hid)
 {
-    if (hid >= BCM56880_A0_HNA_6_5_30_3_0_BCMPKT_FLEXHDR_COUNT) {
+    if (hid >= BCM56880_A0_HNA_6_5_31_3_0_BCMPKT_FLEXHDR_COUNT) {
         return NULL;
     }
 
-    return &bcm56880_a0_hna_6_5_30_3_0_flexhdr_info_list[hid];
+    return &bcm56880_a0_hna_6_5_31_3_0_flexhdr_info_list[hid];
 }
 
-int bcm56880_a0_hna_6_5_30_3_0_flexhdr_variant_support_map[BCMPKT_PMD_COUNT] = {
+int bcm56880_a0_hna_6_5_31_3_0_flexhdr_variant_support_map[BCMPKT_PMD_COUNT] = {
     13,
     -1,
     -1,
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_bcmpkt_rxpmd_match_id.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_bcmpkt_rxpmd_match_id.c
similarity index 84%
rename from platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_bcmpkt_rxpmd_match_id.c
rename to platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_bcmpkt_rxpmd_match_id.c
index 204bc407c6fa..1c4de255495e 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_bcmpkt_rxpmd_match_id.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_bcmpkt_rxpmd_match_id.c
@@ -2,8 +2,8 @@
  *
  * DO NOT EDIT THIS FILE!
  * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) bcm56880_a0_nfa_6_5_30_1_1_sf_match_id_info.yml
- * for device bcm56880_a0 and variant nfa_6_5_30_1_1.
+ * from the NPL output file(s) bcm56880_a0_nfa_6_5_31_3_1_sf_match_id_info.yml
+ * for device bcm56880_a0 and variant nfa_6_5_31_3_1.
  * Edits to this file will be lost when it is regenerated.
  *
  * $Id: $
@@ -29,13 +29,13 @@
 
 
 #include <bcmpkt/bcmpkt_rxpmd_match_id.h>
-#include <bcmpkt/xfcr/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_bcmpkt_rxpmd_match_id_defs.h>
+#include <bcmpkt/xfcr/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_bcmpkt_rxpmd_match_id_defs.h>
 
 
 static bcmpkt_rxpmd_match_id_db_t
-bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_COUNT] = {
+bcm56880_a0_nfa_6_5_31_3_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_COUNT] = {
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ETAG */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ETAG */
         .name         = "EGRESS_PKT_FWD_L2_HDR_ETAG",
         .match        = 0x80,
         .match_mask   = 0xc0,
@@ -49,7 +49,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG */
         .name         = "EGRESS_PKT_FWD_L2_HDR_ITAG",
         .match        = 0x10,
         .match_mask   = 0x10,
@@ -63,7 +63,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2 */
         .name         = "EGRESS_PKT_FWD_L2_HDR_L2",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -77,7 +77,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE */
         .name         = "EGRESS_PKT_FWD_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0xff,
@@ -91,7 +91,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OPAQUETAG */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OPAQUETAG */
         .name         = "EGRESS_PKT_FWD_L2_HDR_OPAQUETAG",
         .match        = 0x20,
         .match_mask   = 0x20,
@@ -105,7 +105,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG */
         .name         = "EGRESS_PKT_FWD_L2_HDR_OTAG",
         .match        = 0x8,
         .match_mask   = 0x8,
@@ -119,7 +119,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_RSPAN */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_RSPAN */
         .name         = "EGRESS_PKT_FWD_L2_HDR_RSPAN",
         .match        = 0x4,
         .match_mask   = 0x4,
@@ -133,7 +133,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC */
         .name         = "EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC",
         .match        = 0x2,
         .match_mask   = 0x2,
@@ -147,7 +147,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_VNTAG */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_VNTAG */
         .name         = "EGRESS_PKT_FWD_L2_HDR_VNTAG",
         .match        = 0x40,
         .match_mask   = 0xc0,
@@ -161,7 +161,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ARP",
         .match        = 0x8,
         .match_mask   = 0x58,
@@ -175,7 +175,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1",
         .match        = 0x180,
         .match_mask   = 0x1c0,
@@ -189,7 +189,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2",
         .match        = 0x418,
         .match_mask   = 0x658,
@@ -203,7 +203,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_BFD",
         .match        = 0x3800,
         .match_mask   = 0x3800,
@@ -217,7 +217,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT",
         .match        = 0x200,
         .match_mask   = 0x646,
@@ -231,7 +231,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -245,7 +245,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1",
         .match        = 0x98,
         .match_mask   = 0x1d8,
@@ -259,7 +259,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2",
         .match        = 0x600,
         .match_mask   = 0x640,
@@ -273,7 +273,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GPE",
         .match        = 0x1006,
         .match_mask   = 0x3846,
@@ -287,7 +287,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE",
         .match        = 0x4,
         .match_mask   = 0x46,
@@ -301,7 +301,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM",
         .match        = 0x204,
         .match_mask   = 0x646,
@@ -315,7 +315,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY",
         .match        = 0x804,
         .match_mask   = 0x3846,
@@ -329,7 +329,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT",
         .match        = 0x100,
         .match_mask   = 0x1c0,
@@ -343,7 +343,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ",
         .match        = 0x24,
         .match_mask   = 0x66,
@@ -357,7 +357,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GTP_12BYTE */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GTP_12BYTE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GTP_12BYTE",
         .match        = 0x2800,
         .match_mask   = 0x3800,
@@ -371,7 +371,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GTP_8BYTE */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GTP_8BYTE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GTP_8BYTE",
         .match        = 0x2000,
         .match_mask   = 0x3800,
@@ -385,7 +385,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GTP_EXT_4BYTE */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GTP_EXT_4BYTE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GTP_EXT_4BYTE",
         .match        = 0x826,
         .match_mask   = 0x3866,
@@ -399,7 +399,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GTP_WITH_EXT */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GTP_WITH_EXT */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GTP_WITH_EXT",
         .match        = 0x26,
         .match_mask   = 0x66,
@@ -413,7 +413,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ICMP",
         .match        = 0x800,
         .match_mask   = 0x3826,
@@ -427,7 +427,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IGMP",
         .match        = 0x410,
         .match_mask   = 0x658,
@@ -441,7 +441,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IPV4",
         .match        = 0x10,
         .match_mask   = 0x58,
@@ -455,7 +455,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IPV6",
         .match        = 0x18,
         .match_mask   = 0x58,
@@ -469,7 +469,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS0",
         .match        = 0x40,
         .match_mask   = 0x40,
@@ -483,7 +483,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS1",
         .match        = 0x42,
         .match_mask   = 0x42,
@@ -497,7 +497,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS2",
         .match        = 0x44,
         .match_mask   = 0x44,
@@ -511,7 +511,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS3",
         .match        = 0x48,
         .match_mask   = 0x48,
@@ -525,7 +525,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS4",
         .match        = 0x50,
         .match_mask   = 0x50,
@@ -539,7 +539,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS5",
         .match        = 0x60,
         .match_mask   = 0x60,
@@ -553,7 +553,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS6",
         .match        = 0xc0,
         .match_mask   = 0xc0,
@@ -567,7 +567,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH",
         .match        = 0x140,
         .match_mask   = 0x140,
@@ -581,7 +581,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW",
         .match        = 0x240,
         .match_mask   = 0x240,
@@ -595,7 +595,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3fff,
@@ -609,7 +609,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_P_1588",
         .match        = 0x1800,
         .match_mask   = 0x3800,
@@ -623,7 +623,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_RARP",
         .match        = 0x2,
         .match_mask   = 0x46,
@@ -637,7 +637,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x20,
         .match_mask   = 0x66,
@@ -651,7 +651,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x820,
         .match_mask   = 0x3866,
@@ -665,7 +665,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UDP",
         .match        = 0x6,
         .match_mask   = 0x46,
@@ -679,7 +679,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3",
         .match        = 0x80,
         .match_mask   = 0x1d8,
@@ -693,7 +693,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x1000,
         .match_mask   = 0x3806,
@@ -707,7 +707,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x3000,
         .match_mask   = 0x3800,
@@ -721,7 +721,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_VXLAN",
         .match        = 0x806,
         .match_mask   = 0x3866,
@@ -735,7 +735,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK */
         .name         = "EGRESS_PKT_SYS_HDR_LOOPBACK",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -749,7 +749,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE */
         .name         = "EGRESS_PKT_SYS_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x1,
@@ -763,7 +763,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ETAG */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ETAG */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_ETAG",
         .match        = 0x80,
         .match_mask   = 0xc0,
@@ -777,7 +777,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_ITAG",
         .match        = 0x10,
         .match_mask   = 0x10,
@@ -791,7 +791,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2 */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_L2",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -805,7 +805,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0xff,
@@ -819,7 +819,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OPAQUETAG */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OPAQUETAG */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_OPAQUETAG",
         .match        = 0x20,
         .match_mask   = 0x20,
@@ -833,7 +833,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_OTAG",
         .match        = 0x8,
         .match_mask   = 0x8,
@@ -847,7 +847,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_RSPAN */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_RSPAN */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_RSPAN",
         .match        = 0x4,
         .match_mask   = 0x4,
@@ -861,7 +861,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC",
         .match        = 0x2,
         .match_mask   = 0x2,
@@ -875,7 +875,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_VNTAG */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_VNTAG */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_VNTAG",
         .match        = 0x40,
         .match_mask   = 0xc0,
@@ -889,7 +889,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP",
         .match        = 0x8,
         .match_mask   = 0x58,
@@ -903,7 +903,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1",
         .match        = 0x180,
         .match_mask   = 0x1c0,
@@ -917,7 +917,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2",
         .match        = 0x418,
         .match_mask   = 0x658,
@@ -931,7 +931,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD",
         .match        = 0x3800,
         .match_mask   = 0x3800,
@@ -945,7 +945,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT",
         .match        = 0x200,
         .match_mask   = 0x646,
@@ -959,7 +959,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -973,7 +973,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1",
         .match        = 0x98,
         .match_mask   = 0x1d8,
@@ -987,7 +987,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2",
         .match        = 0x600,
         .match_mask   = 0x640,
@@ -1001,7 +1001,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE",
         .match        = 0x1006,
         .match_mask   = 0x3846,
@@ -1015,7 +1015,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE",
         .match        = 0x4,
         .match_mask   = 0x46,
@@ -1029,7 +1029,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM",
         .match        = 0x204,
         .match_mask   = 0x646,
@@ -1043,7 +1043,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY",
         .match        = 0x804,
         .match_mask   = 0x3846,
@@ -1057,7 +1057,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT",
         .match        = 0x100,
         .match_mask   = 0x1c0,
@@ -1071,7 +1071,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ",
         .match        = 0x24,
         .match_mask   = 0x66,
@@ -1085,7 +1085,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GTP_12BYTE */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GTP_12BYTE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GTP_12BYTE",
         .match        = 0x2800,
         .match_mask   = 0x3800,
@@ -1099,7 +1099,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GTP_8BYTE */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GTP_8BYTE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GTP_8BYTE",
         .match        = 0x2000,
         .match_mask   = 0x3800,
@@ -1113,7 +1113,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GTP_EXT_4BYTE */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GTP_EXT_4BYTE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GTP_EXT_4BYTE",
         .match        = 0x826,
         .match_mask   = 0x3866,
@@ -1127,7 +1127,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GTP_WITH_EXT */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GTP_WITH_EXT */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GTP_WITH_EXT",
         .match        = 0x26,
         .match_mask   = 0x66,
@@ -1141,7 +1141,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP",
         .match        = 0x800,
         .match_mask   = 0x3826,
@@ -1155,7 +1155,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP",
         .match        = 0x410,
         .match_mask   = 0x658,
@@ -1169,7 +1169,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4",
         .match        = 0x10,
         .match_mask   = 0x58,
@@ -1183,7 +1183,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6",
         .match        = 0x18,
         .match_mask   = 0x58,
@@ -1197,7 +1197,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0",
         .match        = 0x40,
         .match_mask   = 0x40,
@@ -1211,7 +1211,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1",
         .match        = 0x42,
         .match_mask   = 0x42,
@@ -1225,7 +1225,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2",
         .match        = 0x44,
         .match_mask   = 0x44,
@@ -1239,7 +1239,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3",
         .match        = 0x48,
         .match_mask   = 0x48,
@@ -1253,7 +1253,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4",
         .match        = 0x50,
         .match_mask   = 0x50,
@@ -1267,7 +1267,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5",
         .match        = 0x60,
         .match_mask   = 0x60,
@@ -1281,7 +1281,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6",
         .match        = 0xc0,
         .match_mask   = 0xc0,
@@ -1295,7 +1295,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH",
         .match        = 0x140,
         .match_mask   = 0x140,
@@ -1309,7 +1309,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW",
         .match        = 0x240,
         .match_mask   = 0x240,
@@ -1323,7 +1323,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3fff,
@@ -1337,7 +1337,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588",
         .match        = 0x1800,
         .match_mask   = 0x3800,
@@ -1351,7 +1351,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP",
         .match        = 0x2,
         .match_mask   = 0x46,
@@ -1365,7 +1365,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x20,
         .match_mask   = 0x66,
@@ -1379,7 +1379,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x820,
         .match_mask   = 0x3866,
@@ -1393,7 +1393,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP",
         .match        = 0x6,
         .match_mask   = 0x46,
@@ -1407,7 +1407,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3",
         .match        = 0x80,
         .match_mask   = 0x1d8,
@@ -1421,7 +1421,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x1000,
         .match_mask   = 0x3806,
@@ -1435,7 +1435,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x3000,
         .match_mask   = 0x3800,
@@ -1449,7 +1449,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN",
         .match        = 0x806,
         .match_mask   = 0x3866,
@@ -1463,7 +1463,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ETAG */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ETAG */
         .name         = "INGRESS_PKT_INNER_L2_HDR_ETAG",
         .match        = 0x80,
         .match_mask   = 0xc0,
@@ -1477,7 +1477,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG */
         .name         = "INGRESS_PKT_INNER_L2_HDR_ITAG",
         .match        = 0x10,
         .match_mask   = 0x10,
@@ -1491,7 +1491,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2 */
         .name         = "INGRESS_PKT_INNER_L2_HDR_L2",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -1505,7 +1505,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE */
         .name         = "INGRESS_PKT_INNER_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0xff,
@@ -1519,7 +1519,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OPAQUETAG */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OPAQUETAG */
         .name         = "INGRESS_PKT_INNER_L2_HDR_OPAQUETAG",
         .match        = 0x20,
         .match_mask   = 0x20,
@@ -1533,7 +1533,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG */
         .name         = "INGRESS_PKT_INNER_L2_HDR_OTAG",
         .match        = 0x8,
         .match_mask   = 0x8,
@@ -1547,7 +1547,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_RSPAN */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_RSPAN */
         .name         = "INGRESS_PKT_INNER_L2_HDR_RSPAN",
         .match        = 0x4,
         .match_mask   = 0x4,
@@ -1561,7 +1561,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC */
         .name         = "INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC",
         .match        = 0x2,
         .match_mask   = 0x2,
@@ -1575,7 +1575,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_VNTAG */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_VNTAG */
         .name         = "INGRESS_PKT_INNER_L2_HDR_VNTAG",
         .match        = 0x40,
         .match_mask   = 0xc0,
@@ -1589,7 +1589,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ARP",
         .match        = 0x8,
         .match_mask   = 0x58,
@@ -1603,7 +1603,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1",
         .match        = 0x180,
         .match_mask   = 0x1c0,
@@ -1617,7 +1617,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2",
         .match        = 0x418,
         .match_mask   = 0x658,
@@ -1631,7 +1631,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_BFD",
         .match        = 0x3800,
         .match_mask   = 0x3800,
@@ -1645,7 +1645,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT",
         .match        = 0x200,
         .match_mask   = 0x646,
@@ -1659,7 +1659,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -1673,7 +1673,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1",
         .match        = 0x98,
         .match_mask   = 0x1d8,
@@ -1687,7 +1687,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2",
         .match        = 0x600,
         .match_mask   = 0x640,
@@ -1701,7 +1701,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ICMP",
         .match        = 0x800,
         .match_mask   = 0x3826,
@@ -1715,7 +1715,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_IGMP",
         .match        = 0x410,
         .match_mask   = 0x658,
@@ -1729,7 +1729,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_IPV4",
         .match        = 0x10,
         .match_mask   = 0x58,
@@ -1743,7 +1743,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_IPV6",
         .match        = 0x18,
         .match_mask   = 0x58,
@@ -1757,7 +1757,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3fff,
@@ -1771,7 +1771,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_P_1588",
         .match        = 0x1800,
         .match_mask   = 0x3800,
@@ -1785,7 +1785,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_RARP",
         .match        = 0x2,
         .match_mask   = 0x46,
@@ -1799,7 +1799,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x20,
         .match_mask   = 0x66,
@@ -1813,7 +1813,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x820,
         .match_mask   = 0x3866,
@@ -1827,7 +1827,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UDP",
         .match        = 0x6,
         .match_mask   = 0x46,
@@ -1841,7 +1841,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3",
         .match        = 0x80,
         .match_mask   = 0x1d8,
@@ -1855,7 +1855,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x1000,
         .match_mask   = 0x3806,
@@ -1869,7 +1869,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x3000,
         .match_mask   = 0x3800,
@@ -1883,7 +1883,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ETAG */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ETAG */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_ETAG",
         .match        = 0x80,
         .match_mask   = 0xc0,
@@ -1897,7 +1897,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_ITAG",
         .match        = 0x10,
         .match_mask   = 0x10,
@@ -1911,7 +1911,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2 */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_L2",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -1925,7 +1925,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0xff,
@@ -1939,7 +1939,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OPAQUETAG */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OPAQUETAG */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_OPAQUETAG",
         .match        = 0x20,
         .match_mask   = 0x20,
@@ -1953,7 +1953,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_OTAG",
         .match        = 0x8,
         .match_mask   = 0x8,
@@ -1967,7 +1967,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_RSPAN */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_RSPAN */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_RSPAN",
         .match        = 0x4,
         .match_mask   = 0x4,
@@ -1981,7 +1981,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC",
         .match        = 0x2,
         .match_mask   = 0x2,
@@ -1995,7 +1995,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_VNTAG */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_VNTAG */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_VNTAG",
         .match        = 0x40,
         .match_mask   = 0xc0,
@@ -2009,7 +2009,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ARP",
         .match        = 0x8,
         .match_mask   = 0x58,
@@ -2023,7 +2023,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1",
         .match        = 0x180,
         .match_mask   = 0x1c0,
@@ -2037,7 +2037,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2",
         .match        = 0x418,
         .match_mask   = 0x658,
@@ -2051,7 +2051,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_BFD",
         .match        = 0x3800,
         .match_mask   = 0x3800,
@@ -2065,7 +2065,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT",
         .match        = 0x200,
         .match_mask   = 0x646,
@@ -2079,7 +2079,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -2093,7 +2093,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1",
         .match        = 0x98,
         .match_mask   = 0x1d8,
@@ -2107,7 +2107,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2",
         .match        = 0x600,
         .match_mask   = 0x640,
@@ -2121,7 +2121,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GPE",
         .match        = 0x1006,
         .match_mask   = 0x3846,
@@ -2135,7 +2135,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE",
         .match        = 0x4,
         .match_mask   = 0x46,
@@ -2149,7 +2149,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM",
         .match        = 0x204,
         .match_mask   = 0x646,
@@ -2163,7 +2163,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY",
         .match        = 0x804,
         .match_mask   = 0x3846,
@@ -2177,7 +2177,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT",
         .match        = 0x100,
         .match_mask   = 0x1c0,
@@ -2191,7 +2191,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ",
         .match        = 0x24,
         .match_mask   = 0x66,
@@ -2205,7 +2205,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GTP_12BYTE */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GTP_12BYTE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GTP_12BYTE",
         .match        = 0x2800,
         .match_mask   = 0x3800,
@@ -2219,7 +2219,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GTP_8BYTE */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GTP_8BYTE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GTP_8BYTE",
         .match        = 0x2000,
         .match_mask   = 0x3800,
@@ -2233,7 +2233,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GTP_EXT_4BYTE */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GTP_EXT_4BYTE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GTP_EXT_4BYTE",
         .match        = 0x826,
         .match_mask   = 0x3866,
@@ -2247,7 +2247,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GTP_WITH_EXT */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GTP_WITH_EXT */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GTP_WITH_EXT",
         .match        = 0x26,
         .match_mask   = 0x66,
@@ -2261,7 +2261,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ICMP",
         .match        = 0x800,
         .match_mask   = 0x3826,
@@ -2275,7 +2275,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IGMP",
         .match        = 0x410,
         .match_mask   = 0x658,
@@ -2289,7 +2289,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IPV4",
         .match        = 0x10,
         .match_mask   = 0x58,
@@ -2303,7 +2303,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IPV6",
         .match        = 0x18,
         .match_mask   = 0x58,
@@ -2317,7 +2317,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0",
         .match        = 0x40,
         .match_mask   = 0x40,
@@ -2331,7 +2331,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1",
         .match        = 0x42,
         .match_mask   = 0x42,
@@ -2345,7 +2345,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2",
         .match        = 0x44,
         .match_mask   = 0x44,
@@ -2359,7 +2359,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3",
         .match        = 0x48,
         .match_mask   = 0x48,
@@ -2373,7 +2373,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4",
         .match        = 0x50,
         .match_mask   = 0x50,
@@ -2387,7 +2387,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5",
         .match        = 0x60,
         .match_mask   = 0x60,
@@ -2401,7 +2401,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6",
         .match        = 0xc0,
         .match_mask   = 0xc0,
@@ -2415,7 +2415,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH",
         .match        = 0x140,
         .match_mask   = 0x140,
@@ -2429,7 +2429,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW",
         .match        = 0x240,
         .match_mask   = 0x240,
@@ -2443,7 +2443,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3fff,
@@ -2457,7 +2457,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_P_1588",
         .match        = 0x1800,
         .match_mask   = 0x3800,
@@ -2471,7 +2471,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_RARP",
         .match        = 0x2,
         .match_mask   = 0x46,
@@ -2485,7 +2485,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x20,
         .match_mask   = 0x66,
@@ -2499,7 +2499,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x820,
         .match_mask   = 0x3866,
@@ -2513,7 +2513,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UDP",
         .match        = 0x6,
         .match_mask   = 0x46,
@@ -2527,7 +2527,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3",
         .match        = 0x80,
         .match_mask   = 0x1d8,
@@ -2541,7 +2541,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x1000,
         .match_mask   = 0x3806,
@@ -2555,7 +2555,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x3000,
         .match_mask   = 0x3800,
@@ -2569,7 +2569,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN",
         .match        = 0x806,
         .match_mask   = 0x3866,
@@ -2583,7 +2583,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK */
         .name         = "INGRESS_PKT_SYS_HDR_LOOPBACK",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -2597,7 +2597,7 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
 
     },
     {
-        /* BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE */
+        /* BCM56880_A0_NFA_6_5_31_3_1_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE */
         .name         = "INGRESS_PKT_SYS_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x1,
@@ -2612,23 +2612,23 @@ bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db[BCM56880_A0_NFA_6_5_30_1_1_RXPMD_MA
     },
 };
 
-static bcmpkt_rxpmd_match_id_db_info_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db_info = {
+static bcmpkt_rxpmd_match_id_db_info_t bcm56880_a0_nfa_6_5_31_3_1_rxpmd_match_id_db_info = {
     .num_entries = 184,
-    .db = bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db
+    .db = bcm56880_a0_nfa_6_5_31_3_1_rxpmd_match_id_db
 };
-bcmpkt_rxpmd_match_id_db_info_t * bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db_info_get(void) {
-    return &bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_db_info;
+bcmpkt_rxpmd_match_id_db_info_t * bcm56880_a0_nfa_6_5_31_3_1_rxpmd_match_id_db_info_get(void) {
+    return &bcm56880_a0_nfa_6_5_31_3_1_rxpmd_match_id_db_info;
 }
 
-static shr_enum_map_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_map[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT
+static shr_enum_map_t bcm56880_a0_nfa_6_5_31_3_1_rxpmd_match_id_map[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_rxpmd_match_id_map_info_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_map_info = {
+static bcmpkt_rxpmd_match_id_map_info_t bcm56880_a0_nfa_6_5_31_3_1_rxpmd_match_id_map_info = {
     .num_entries = 184,
-    .map = bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_map
+    .map = bcm56880_a0_nfa_6_5_31_3_1_rxpmd_match_id_map
 };
 
-bcmpkt_rxpmd_match_id_map_info_t * bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_map_info_get(void) {
-    return &bcm56880_a0_nfa_6_5_30_1_1_rxpmd_match_id_map_info;
+bcmpkt_rxpmd_match_id_map_info_t * bcm56880_a0_nfa_6_5_31_3_1_rxpmd_match_id_map_info_get(void) {
+    return &bcm56880_a0_nfa_6_5_31_3_1_rxpmd_match_id_map_info;
 }
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_pkt_flexhdr.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_pkt_flexhdr.c
similarity index 74%
rename from platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_pkt_flexhdr.c
rename to platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_pkt_flexhdr.c
index 712374abd773..260ad0d6a1dd 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_pkt_flexhdr.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_pkt_flexhdr.c
@@ -3,7 +3,7 @@
  * DO NOT EDIT THIS FILE!
  * This file is auto-generated by xfc_map_parser
  * from the NPL output file(s) map.yml
- * for device bcm56880_a0 and variant nfa_6_5_30_1_1.
+ * for device bcm56880_a0 and variant nfa_6_5_31_3_1.
  * Edits to this file will be lost when it is regenerated.
  *
  * $Id: $
@@ -31,309 +31,309 @@
 #include <shr/shr_error.h>
 #include <bcmpkt/bcmpkt_flexhdr.h>
 #include <bcmpkt/chip/bcm56880_a0/bcmpkt_bcm56880_a0_rxpmd.h>
-#include <bcmpkt/xfcr/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_bcmpkt_flexhdr.h>
-#include <bcmpkt/xfcr/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_bcmpkt_flexhdr_data.h>
-#include <bcmpkt/xfcr/bcm56880_a0/nfa_6_5_30_1_1/bcm56880_a0_nfa_6_5_30_1_1_bcmpkt_rxpmd_flex_data.h>
+#include <bcmpkt/xfcr/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_bcmpkt_flexhdr.h>
+#include <bcmpkt/xfcr/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_bcmpkt_flexhdr_data.h>
+#include <bcmpkt/xfcr/bcm56880_a0/nfa_6_5_31_3_1/bcm56880_a0_nfa_6_5_31_3_1_bcmpkt_rxpmd_flex_data.h>
 
 #define MASK(_bn) (((uint32_t)0x1<<(_bn))-1)
 #define WORD_FIELD_GET(_d,_s,_l) (((_d) >> (_s)) & MASK(_l))
 #define WORD_FIELD_SET(_d,_s,_l,_v) (_d)=(((_d) & ~(MASK(_l) << (_s))) | (((_v) & MASK(_l)) << (_s)))
 #define WORD_FIELD_MASK(_d,_s,_l) (_d)=((_d) | (MASK(_l) << (_s)))
 
-static void bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_reason_decode(uint32_t *data, bcmpkt_bitmap_t *reasons)
+static void bcm56880_a0_nfa_6_5_31_3_1_rxpmd_flex_reason_decode(uint32_t *data, bcmpkt_bitmap_t *reasons)
 {
     uint32_t *reason = data + 0;
 
     if (reason[12] & (0x1 << 0)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU);
     }
     if (reason[12] & (0x1 << 1)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS);
     }
     if (reason[12] & (0x1 << 2)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE);
     }
     if (reason[12] & (0x1 << 3)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_DISCARD);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_DISCARD);
     }
     if (reason[12] & (0x1 << 4)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD);
     }
     if (reason[12] & (0x1 << 5)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED);
     }
     if (reason[12] & (0x1 << 6)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT);
     }
     if (reason[12] & (0x1 << 7)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED);
     }
     if (reason[12] & (0x1 << 8)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD);
     }
     if (reason[12] & (0x1 << 9)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS);
     }
     if (reason[12] & (0x1 << 10)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP);
     }
     if (reason[12] & (0x1 << 11)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS);
     }
     if (reason[12] & (0x1 << 12)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP);
     }
     if (reason[12] & (0x1 << 13)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR);
     }
     if (reason[12] & (0x1 << 14)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR);
     }
     if (reason[12] & (0x1 << 15)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED);
     }
     if (reason[12] & (0x1 << 16)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL);
     }
     if (reason[12] & (0x1 << 17)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_VFP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_VFP);
     }
     if (reason[12] & (0x1 << 18)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_IFP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_IFP);
     }
     if (reason[12] & (0x1 << 19)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_IFP_METER);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_IFP_METER);
     }
     if (reason[12] & (0x1 << 20)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_DST_FP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_DST_FP);
     }
     if (reason[12] & (0x1 << 21)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_SVP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_SVP);
     }
     if (reason[12] & (0x1 << 22)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_EM_FT);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_EM_FT);
     }
     if (reason[12] & (0x1 << 23)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_IVXLT);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_IVXLT);
     }
     if (reason[12] & (0x1 << 24)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED);
     }
     if (reason[12] & (0x1 << 25)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED);
     }
     if (reason[12] & (0x1 << 26)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_SER_DROP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_SER_DROP);
     }
     if (reason[12] & (0x1 << 27)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED);
     }
     if (reason[12] & (0x1 << 28)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF);
     }
     if (reason[12] & (0x1 << 29)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED);
     }
     if (reason[12] & (0x1 << 30)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED);
     }
     if (reason[12] & (0x1 << 31)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU);
     }
     if (reason[11] & (0x1 << 0)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0);
     }
     if (reason[11] & (0x1 << 1)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1);
     }
     if (reason[11] & (0x1 << 2)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2);
     }
     if (reason[11] & (0x1 << 3)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3);
     }
     if (reason[11] & (0x1 << 4)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4);
     }
     if (reason[11] & (0x1 << 5)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5);
     }
     if (reason[11] & (0x1 << 6)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6);
     }
     if (reason[11] & (0x1 << 7)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7);
     }
     if (reason[11] & (0x1 << 8)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_PE_VID_FWD_MISS);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_PE_VID_FWD_MISS);
     }
     if (reason[11] & (0x1 << 9)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_PE_VID_RPF_MISS);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_PE_VID_RPF_MISS);
     }
     if (reason[11] & (0x1 << 10)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_PE_RPF);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_PE_RPF);
     }
     if (reason[11] & (0x1 << 11)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_PKT_ETAG_UNEXPECTED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_PKT_ETAG_UNEXPECTED);
     }
     if (reason[11] & (0x1 << 12)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_PKT_ETAG_EXPECTED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_PKT_ETAG_EXPECTED);
     }
     if (reason[11] & (0x1 << 15)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP);
     }
 }
 
-static void bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_reason_encode(bcmpkt_bitmap_t *reasons, uint32_t *data)
+static void bcm56880_a0_nfa_6_5_31_3_1_rxpmd_flex_reason_encode(bcmpkt_bitmap_t *reasons, uint32_t *data)
 {
     uint32_t *reason = data + 0;
 
     reason[12] = 0;
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU)) {
         reason[12] |= (0x1 << 0);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS)) {
         reason[12] |= (0x1 << 1);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE)) {
         reason[12] |= (0x1 << 2);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_DISCARD)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_DISCARD)) {
         reason[12] |= (0x1 << 3);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD)) {
         reason[12] |= (0x1 << 4);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED)) {
         reason[12] |= (0x1 << 5);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT)) {
         reason[12] |= (0x1 << 6);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED)) {
         reason[12] |= (0x1 << 7);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD)) {
         reason[12] |= (0x1 << 8);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS)) {
         reason[12] |= (0x1 << 9);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP)) {
         reason[12] |= (0x1 << 10);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS)) {
         reason[12] |= (0x1 << 11);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP)) {
         reason[12] |= (0x1 << 12);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR)) {
         reason[12] |= (0x1 << 13);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR)) {
         reason[12] |= (0x1 << 14);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED)) {
         reason[12] |= (0x1 << 15);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL)) {
         reason[12] |= (0x1 << 16);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_VFP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_VFP)) {
         reason[12] |= (0x1 << 17);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_IFP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_IFP)) {
         reason[12] |= (0x1 << 18);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_IFP_METER)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_IFP_METER)) {
         reason[12] |= (0x1 << 19);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_DST_FP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_DST_FP)) {
         reason[12] |= (0x1 << 20);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_SVP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_SVP)) {
         reason[12] |= (0x1 << 21);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_EM_FT)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_EM_FT)) {
         reason[12] |= (0x1 << 22);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_IVXLT)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_IVXLT)) {
         reason[12] |= (0x1 << 23);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED)) {
         reason[12] |= (0x1 << 24);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED)) {
         reason[12] |= (0x1 << 25);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_SER_DROP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_SER_DROP)) {
         reason[12] |= (0x1 << 26);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED)) {
         reason[12] |= (0x1 << 27);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF)) {
         reason[12] |= (0x1 << 28);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED)) {
         reason[12] |= (0x1 << 29);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED)) {
         reason[12] |= (0x1 << 30);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU)) {
         reason[12] |= (0x1 << 31);
     }
     reason[11] = 0;
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0)) {
         reason[11] |= (0x1 << 0);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1)) {
         reason[11] |= (0x1 << 1);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2)) {
         reason[11] |= (0x1 << 2);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3)) {
         reason[11] |= (0x1 << 3);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4)) {
         reason[11] |= (0x1 << 4);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5)) {
         reason[11] |= (0x1 << 5);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6)) {
         reason[11] |= (0x1 << 6);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7)) {
         reason[11] |= (0x1 << 7);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_PE_VID_FWD_MISS)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_PE_VID_FWD_MISS)) {
         reason[11] |= (0x1 << 8);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_PE_VID_RPF_MISS)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_PE_VID_RPF_MISS)) {
         reason[11] |= (0x1 << 9);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_PE_RPF)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_PE_RPF)) {
         reason[11] |= (0x1 << 10);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_PKT_ETAG_UNEXPECTED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_PKT_ETAG_UNEXPECTED)) {
         reason[11] |= (0x1 << 11);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_PKT_ETAG_EXPECTED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_PKT_ETAG_EXPECTED)) {
         reason[11] |= (0x1 << 12);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP)) {
         reason[11] |= (0x1 << 15);
     }
 }
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_data[] = {
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_rxpmd_flex_field_data[] = {
     {
         .name = "DLB_ECMP_DESTINATION_15_0",
-        .fid = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_DLB_ECMP_DESTINATION_15_0,
+        .fid = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_DLB_ECMP_DESTINATION_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -344,7 +344,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_
     },
     {
         .name = "DROP_CODE_15_0",
-        .fid = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0,
+        .fid = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -357,7 +357,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_
     },
     {
         .name = "DVP_15_0",
-        .fid = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_DVP_15_0,
+        .fid = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_DVP_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -370,7 +370,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_
     },
     {
         .name = "EFFECTIVE_TTL_7_0",
-        .fid = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_7_0,
+        .fid = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_7_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -383,7 +383,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_
     },
     {
         .name = "ENTROPY_LABEL_LOW_15_0",
-        .fid = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0,
+        .fid = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -396,7 +396,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_
     },
     {
         .name = "EVENT_TRACE_VECTOR_31_0",
-        .fid = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_0,
+        .fid = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -409,7 +409,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_
     },
     {
         .name = "EVENT_TRACE_VECTOR_47_32",
-        .fid = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32,
+        .fid = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -422,7 +422,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_
     },
     {
         .name = "I2E_CLASS_ID_15_0",
-        .fid = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0,
+        .fid = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -435,7 +435,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_
     },
     {
         .name = "IFP_TS_CONTROL_ACTION_3_0",
-        .fid = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_IFP_TS_CONTROL_ACTION_3_0,
+        .fid = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_IFP_TS_CONTROL_ACTION_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -448,7 +448,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_
     },
     {
         .name = "ING_ETAG_ACTION_3_0",
-        .fid = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_ING_ETAG_ACTION_3_0,
+        .fid = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_ING_ETAG_ACTION_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -461,7 +461,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_
     },
     {
         .name = "ING_ETAG_PCP_DEI_3_0",
-        .fid = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_ING_ETAG_PCP_DEI_3_0,
+        .fid = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_ING_ETAG_PCP_DEI_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -474,7 +474,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_
     },
     {
         .name = "ING_ETAG_VID_16_15_0",
-        .fid = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_ING_ETAG_VID_16_15_0,
+        .fid = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_ING_ETAG_VID_16_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -487,7 +487,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_
     },
     {
         .name = "ING_TIMESTAMP_31_0",
-        .fid = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_0,
+        .fid = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -500,7 +500,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_
     },
     {
         .name = "INGRESS_PP_PORT_7_0",
-        .fid = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_INGRESS_PP_PORT_7_0,
+        .fid = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_INGRESS_PP_PORT_7_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -513,7 +513,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_
     },
     {
         .name = "INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0",
-        .fid = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0,
+        .fid = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -526,7 +526,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_
     },
     {
         .name = "INGRESS_QOS_REMARK_CTRL_3_0",
-        .fid = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0,
+        .fid = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -539,7 +539,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_
     },
     {
         .name = "INT_PRI_3_0",
-        .fid = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_INT_PRI_3_0,
+        .fid = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_INT_PRI_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -552,7 +552,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_
     },
     {
         .name = "L2_IIF_10_0",
-        .fid = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_L2_IIF_10_0,
+        .fid = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_L2_IIF_10_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -564,7 +564,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_
     },
     {
         .name = "L2_OIF_10_0",
-        .fid = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_L2_OIF_10_0,
+        .fid = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_L2_OIF_10_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -577,7 +577,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_
     },
     {
         .name = "L3_IIF_13_0",
-        .fid = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_L3_IIF_13_0,
+        .fid = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_L3_IIF_13_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -590,7 +590,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_
     },
     {
         .name = "L3_OIF_1_13_0",
-        .fid = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0,
+        .fid = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -603,7 +603,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_
     },
     {
         .name = "MPLS_LABEL_DECAP_COUNT_3_0",
-        .fid = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_MPLS_LABEL_DECAP_COUNT_3_0,
+        .fid = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_MPLS_LABEL_DECAP_COUNT_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -616,7 +616,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_
     },
     {
         .name = "NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0",
-        .fid = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0,
+        .fid = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -629,7 +629,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_
     },
     {
         .name = "NHOP_INDEX_1_15_0",
-        .fid = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_15_0,
+        .fid = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -642,7 +642,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_
     },
     {
         .name = "PARSER_VHLEN_0_15_0",
-        .fid = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0,
+        .fid = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -655,7 +655,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_
     },
     {
         .name = "PKT_MISC_CTRL_0_3_0",
-        .fid = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0,
+        .fid = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -668,7 +668,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_
     },
     {
         .name = "SVP_15_0",
-        .fid = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_SVP_15_0,
+        .fid = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_SVP_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -681,7 +681,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_
     },
     {
         .name = "SVP_NETWORK_GROUP_BITMAP_3_0",
-        .fid = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0,
+        .fid = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -694,7 +694,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_
     },
     {
         .name = "SYSTEM_DESTINATION_15_0",
-        .fid = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0,
+        .fid = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -707,7 +707,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_
     },
     {
         .name = "SYSTEM_OPCODE_3_0",
-        .fid = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0,
+        .fid = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -720,7 +720,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_
     },
     {
         .name = "T_VLAN_TAG_VALUE_15_0",
-        .fid = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_T_VLAN_TAG_VALUE_15_0,
+        .fid = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_T_VLAN_TAG_VALUE_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -733,7 +733,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_
     },
     {
         .name = "TIMESTAMP_CTRL_3_0",
-        .fid = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_TIMESTAMP_CTRL_3_0,
+        .fid = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_TIMESTAMP_CTRL_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -746,7 +746,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_
     },
     {
         .name = "TUNNEL_PROCESSING_RESULTS_1_3_0",
-        .fid = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0,
+        .fid = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -759,7 +759,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_
     },
     {
         .name = "VFI_15_0",
-        .fid = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_VFI_15_0,
+        .fid = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_VFI_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -772,7 +772,7 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_
     },
     {
         .name = "VLAN_TAG_PRESERVE_CTRL_SVP_MIRROR_ENABLE_3_0",
-        .fid = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_VLAN_TAG_PRESERVE_CTRL_SVP_MIRROR_ENABLE_3_0,
+        .fid = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_VLAN_TAG_PRESERVE_CTRL_SVP_MIRROR_ENABLE_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -783,20 +783,24 @@ static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_
         },
         .profile_cnt = 6,
     },
-};static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_data,
 };
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_rxpmd_flex_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_rxpmd_flex_field_data,
+    .profile_bmp_cnt = 1,
+    .profile_bmp[0] = 0x3c,
 
-static shr_enum_map_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_reason_names[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_reasons_info_t bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_reasons_info = {
-    .num_reasons = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RXPMD_FLEX_REASON_COUNT,
-    .reason_names = bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_reason_names,
-    .reason_encode = bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_reason_encode,
-    .reason_decode = bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_reason_decode,
+static shr_enum_map_t bcm56880_a0_nfa_6_5_31_3_1_rxpmd_flex_reason_names[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT
+};
+
+static bcmpkt_flex_reasons_info_t bcm56880_a0_nfa_6_5_31_3_1_rxpmd_flex_reasons_info = {
+    .num_reasons = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RXPMD_FLEX_REASON_COUNT,
+    .reason_names = bcm56880_a0_nfa_6_5_31_3_1_rxpmd_flex_reason_names,
+    .reason_encode = bcm56880_a0_nfa_6_5_31_3_1_rxpmd_flex_reason_encode,
+    .reason_decode = bcm56880_a0_nfa_6_5_31_3_1_rxpmd_flex_reason_decode,
 };
 
 
@@ -939,7 +943,7 @@ static int32_t bcmpkt_arp_t_target_ip_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_arp_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ARP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_arp_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ARP_T_FID_COUNT] = {
     bcmpkt_arp_t_hardware_len_get,
     bcmpkt_arp_t_hardware_type_get,
     bcmpkt_arp_t_operation_get,
@@ -951,7 +955,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_arp_t_fget[BCM56880_A0_NFA_6_
     bcmpkt_arp_t_target_ip_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_arp_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ARP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_arp_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ARP_T_FID_COUNT] = {
     bcmpkt_arp_t_hardware_len_set,
     bcmpkt_arp_t_hardware_type_set,
     bcmpkt_arp_t_operation_set,
@@ -963,13 +967,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_arp_t_fset[BCM56880_A0_NFA_6_
     bcmpkt_arp_t_target_ip_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_arp_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_arp_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_arp_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ARP_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_arp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_arp_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ARP_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_arp_t_field_data,
 };
 
 
@@ -1066,7 +1070,7 @@ static int32_t bcmpkt_authen_t_spi_set(uint32_t *data, int profile, uint32_t val
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_authen_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_AUTHEN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_authen_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_AUTHEN_T_FID_COUNT] = {
     bcmpkt_authen_t_data_get,
     bcmpkt_authen_t_next_header_get,
     bcmpkt_authen_t_payload_len_get,
@@ -1075,7 +1079,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_authen_t_fget[BCM56880_A0_NFA
     bcmpkt_authen_t_spi_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_authen_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_AUTHEN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_authen_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_AUTHEN_T_FID_COUNT] = {
     bcmpkt_authen_t_data_set,
     bcmpkt_authen_t_next_header_set,
     bcmpkt_authen_t_payload_len_set,
@@ -1084,13 +1088,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_authen_t_fset[BCM56880_A0_NFA
     bcmpkt_authen_t_spi_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_authen_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_AUTHEN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_authen_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_AUTHEN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_authen_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_AUTHEN_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_authen_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_authen_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_AUTHEN_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_authen_t_field_data,
 };
 
 
@@ -1339,7 +1343,7 @@ static int32_t bcmpkt_bfd_t_version_set(uint32_t *data, int profile, uint32_t va
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_bfd_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_bfd_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_FID_COUNT] = {
     bcmpkt_bfd_t_ap_get,
     bcmpkt_bfd_t_bfd_length_get,
     bcmpkt_bfd_t_cpi_get,
@@ -1358,7 +1362,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_bfd_t_fget[BCM56880_A0_NFA_6_
     bcmpkt_bfd_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_bfd_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_bfd_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_FID_COUNT] = {
     bcmpkt_bfd_t_ap_set,
     bcmpkt_bfd_t_bfd_length_set,
     bcmpkt_bfd_t_cpi_set,
@@ -1377,13 +1381,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_bfd_t_fset[BCM56880_A0_NFA_6_
     bcmpkt_bfd_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_bfd_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_bfd_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_bfd_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_BFD_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_bfd_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_bfd_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_BFD_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_bfd_t_field_data,
 };
 
 
@@ -1499,7 +1503,7 @@ static int32_t bcmpkt_cpu_composites_0_t_dma_cont6_set(uint32_t *data, int profi
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_cpu_composites_0_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_cpu_composites_0_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
     bcmpkt_cpu_composites_0_t_dma_cont0_get,
     bcmpkt_cpu_composites_0_t_dma_cont1_get,
     bcmpkt_cpu_composites_0_t_dma_cont2_get,
@@ -1509,7 +1513,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_cpu_composites_0_t_fget[BCM56
     bcmpkt_cpu_composites_0_t_dma_cont6_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_cpu_composites_0_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_cpu_composites_0_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
     bcmpkt_cpu_composites_0_t_dma_cont0_set,
     bcmpkt_cpu_composites_0_t_dma_cont1_set,
     bcmpkt_cpu_composites_0_t_dma_cont2_set,
@@ -1519,13 +1523,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_cpu_composites_0_t_fset[BCM56
     bcmpkt_cpu_composites_0_t_dma_cont6_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_cpu_composites_0_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_cpu_composites_0_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_cpu_composites_0_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_cpu_composites_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_cpu_composites_0_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_cpu_composites_0_t_field_data,
 };
 
 
@@ -1705,7 +1709,7 @@ static int32_t bcmpkt_cpu_composites_1_t_dma_cont9_set(uint32_t *data, int profi
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_cpu_composites_1_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_cpu_composites_1_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
     bcmpkt_cpu_composites_1_t_dma_cont10_get,
     bcmpkt_cpu_composites_1_t_dma_cont11_get,
     bcmpkt_cpu_composites_1_t_dma_cont12_get,
@@ -1719,7 +1723,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_cpu_composites_1_t_fget[BCM56
     bcmpkt_cpu_composites_1_t_dma_cont9_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_cpu_composites_1_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_cpu_composites_1_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
     bcmpkt_cpu_composites_1_t_dma_cont10_set,
     bcmpkt_cpu_composites_1_t_dma_cont11_set,
     bcmpkt_cpu_composites_1_t_dma_cont12_set,
@@ -1733,13 +1737,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_cpu_composites_1_t_fset[BCM56
     bcmpkt_cpu_composites_1_t_dma_cont9_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_cpu_composites_1_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_cpu_composites_1_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_cpu_composites_1_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_cpu_composites_1_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_cpu_composites_1_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_cpu_composites_1_t_field_data,
 };
 
 
@@ -1789,25 +1793,25 @@ static int32_t bcmpkt_dest_option_t_option_set(uint32_t *data, int profile, uint
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_dest_option_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_DEST_OPTION_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_dest_option_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_DEST_OPTION_T_FID_COUNT] = {
     bcmpkt_dest_option_t_hdr_ext_len_get,
     bcmpkt_dest_option_t_next_header_get,
     bcmpkt_dest_option_t_option_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_dest_option_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_DEST_OPTION_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_dest_option_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_DEST_OPTION_T_FID_COUNT] = {
     bcmpkt_dest_option_t_hdr_ext_len_set,
     bcmpkt_dest_option_t_next_header_set,
     bcmpkt_dest_option_t_option_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_dest_option_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_DEST_OPTION_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_dest_option_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_DEST_OPTION_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_dest_option_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_DEST_OPTION_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_dest_option_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_dest_option_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_DEST_OPTION_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_dest_option_t_field_data,
 };
 
 
@@ -1947,7 +1951,7 @@ static int32_t bcmpkt_erspan3_fixed_hdr_t_vlan_set(uint32_t *data, int profile,
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_erspan3_fixed_hdr_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_erspan3_fixed_hdr_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
     bcmpkt_erspan3_fixed_hdr_t_bso_get,
     bcmpkt_erspan3_fixed_hdr_t_cos_get,
     bcmpkt_erspan3_fixed_hdr_t_gbp_sid_get,
@@ -1959,7 +1963,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_erspan3_fixed_hdr_t_fget[BCM5
     bcmpkt_erspan3_fixed_hdr_t_vlan_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_erspan3_fixed_hdr_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_erspan3_fixed_hdr_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
     bcmpkt_erspan3_fixed_hdr_t_bso_set,
     bcmpkt_erspan3_fixed_hdr_t_cos_set,
     bcmpkt_erspan3_fixed_hdr_t_gbp_sid_set,
@@ -1971,13 +1975,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_erspan3_fixed_hdr_t_fset[BCM5
     bcmpkt_erspan3_fixed_hdr_t_vlan_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_erspan3_fixed_hdr_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_erspan3_fixed_hdr_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_erspan3_fixed_hdr_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_erspan3_fixed_hdr_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_erspan3_fixed_hdr_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_erspan3_fixed_hdr_t_field_data,
 };
 
 
@@ -2042,27 +2046,27 @@ static int32_t bcmpkt_erspan3_subhdr_5_t_timestamp_set(uint32_t *data, int profi
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_erspan3_subhdr_5_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_erspan3_subhdr_5_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
     bcmpkt_erspan3_subhdr_5_t_platform_id_get,
     bcmpkt_erspan3_subhdr_5_t_port_id_get,
     bcmpkt_erspan3_subhdr_5_t_switch_id_get,
     bcmpkt_erspan3_subhdr_5_t_timestamp_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_erspan3_subhdr_5_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_erspan3_subhdr_5_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
     bcmpkt_erspan3_subhdr_5_t_platform_id_set,
     bcmpkt_erspan3_subhdr_5_t_port_id_set,
     bcmpkt_erspan3_subhdr_5_t_switch_id_set,
     bcmpkt_erspan3_subhdr_5_t_timestamp_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_erspan3_subhdr_5_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_erspan3_subhdr_5_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_erspan3_subhdr_5_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_erspan3_subhdr_5_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_erspan3_subhdr_5_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_erspan3_subhdr_5_t_field_data,
 };
 
 
@@ -2143,7 +2147,7 @@ static int32_t bcmpkt_esp_t_spi_set(uint32_t *data, int profile, uint32_t val) {
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_esp_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ESP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_esp_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ESP_T_FID_COUNT] = {
     bcmpkt_esp_t_next_header_get,
     bcmpkt_esp_t_pad_get,
     bcmpkt_esp_t_pad_len_get,
@@ -2151,7 +2155,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_esp_t_fget[BCM56880_A0_NFA_6_
     bcmpkt_esp_t_spi_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_esp_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ESP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_esp_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ESP_T_FID_COUNT] = {
     bcmpkt_esp_t_next_header_set,
     bcmpkt_esp_t_pad_set,
     bcmpkt_esp_t_pad_len_set,
@@ -2159,13 +2163,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_esp_t_fset[BCM56880_A0_NFA_6_
     bcmpkt_esp_t_spi_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_esp_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ESP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_esp_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ESP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_esp_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ESP_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_esp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_esp_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ESP_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_esp_t_field_data,
 };
 
 
@@ -2259,7 +2263,7 @@ static int32_t bcmpkt_etag_t_vid_set(uint32_t *data, int profile, uint32_t val)
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_etag_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ETAG_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_etag_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ETAG_T_FID_COUNT] = {
     bcmpkt_etag_t_pcp_dei_get,
     bcmpkt_etag_t_rsrvd0_get,
     bcmpkt_etag_t_rsrvd1_get,
@@ -2268,7 +2272,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_etag_t_fget[BCM56880_A0_NFA_6
     bcmpkt_etag_t_vid_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_etag_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ETAG_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_etag_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ETAG_T_FID_COUNT] = {
     bcmpkt_etag_t_pcp_dei_set,
     bcmpkt_etag_t_rsrvd0_set,
     bcmpkt_etag_t_rsrvd1_set,
@@ -2277,13 +2281,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_etag_t_fset[BCM56880_A0_NFA_6
     bcmpkt_etag_t_vid_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_etag_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ETAG_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_etag_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ETAG_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_etag_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ETAG_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_etag_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_etag_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ETAG_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_etag_t_field_data,
 };
 
 
@@ -2302,21 +2306,21 @@ static int32_t bcmpkt_ethertype_t_type_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_ethertype_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_ethertype_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
     bcmpkt_ethertype_t_type_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_ethertype_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_ethertype_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
     bcmpkt_ethertype_t_type_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_ethertype_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_ethertype_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_ethertype_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ETHERTYPE_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_ethertype_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_ethertype_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ETHERTYPE_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_ethertype_t_field_data,
 };
 
 
@@ -2381,27 +2385,27 @@ static int32_t bcmpkt_frag_t_reserved_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_frag_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_FRAG_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_frag_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_FRAG_T_FID_COUNT] = {
     bcmpkt_frag_t_frag_info_get,
     bcmpkt_frag_t_id_get,
     bcmpkt_frag_t_next_header_get,
     bcmpkt_frag_t_reserved_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_frag_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_FRAG_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_frag_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_FRAG_T_FID_COUNT] = {
     bcmpkt_frag_t_frag_info_set,
     bcmpkt_frag_t_id_set,
     bcmpkt_frag_t_next_header_set,
     bcmpkt_frag_t_reserved_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_frag_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_FRAG_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_frag_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_FRAG_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_frag_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_FRAG_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_frag_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_frag_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_FRAG_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_frag_t_field_data,
 };
 
 
@@ -2630,7 +2634,7 @@ static int32_t bcmpkt_generic_loopback_t_start_byte_set(uint32_t *data, int prof
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_generic_loopback_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_generic_loopback_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
     bcmpkt_generic_loopback_t_destination_obj_get,
     bcmpkt_generic_loopback_t_destination_type_get,
     bcmpkt_generic_loopback_t_entropy_obj_get,
@@ -2648,7 +2652,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_generic_loopback_t_fget[BCM56
     bcmpkt_generic_loopback_t_start_byte_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_generic_loopback_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_generic_loopback_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
     bcmpkt_generic_loopback_t_destination_obj_set,
     bcmpkt_generic_loopback_t_destination_type_set,
     bcmpkt_generic_loopback_t_entropy_obj_set,
@@ -2666,13 +2670,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_generic_loopback_t_fset[BCM56
     bcmpkt_generic_loopback_t_start_byte_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_generic_loopback_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_generic_loopback_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_generic_loopback_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_generic_loopback_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_generic_loopback_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_generic_loopback_t_field_data,
 };
 
 
@@ -2751,7 +2755,7 @@ static int32_t bcmpkt_gpe_t_vni_set(uint32_t *data, int profile, uint32_t val) {
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_gpe_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GPE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_gpe_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GPE_T_FID_COUNT] = {
     bcmpkt_gpe_t_flags_get,
     bcmpkt_gpe_t_next_protocol_get,
     bcmpkt_gpe_t_reserved0_get,
@@ -2759,7 +2763,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_gpe_t_fget[BCM56880_A0_NFA_6_
     bcmpkt_gpe_t_vni_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_gpe_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GPE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_gpe_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GPE_T_FID_COUNT] = {
     bcmpkt_gpe_t_flags_set,
     bcmpkt_gpe_t_next_protocol_set,
     bcmpkt_gpe_t_reserved0_set,
@@ -2767,13 +2771,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_gpe_t_fset[BCM56880_A0_NFA_6_
     bcmpkt_gpe_t_vni_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_gpe_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GPE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_gpe_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GPE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_gpe_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GPE_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_gpe_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_gpe_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GPE_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_gpe_t_field_data,
 };
 
 
@@ -2807,23 +2811,23 @@ static int32_t bcmpkt_gre_chksum_t_offset_set(uint32_t *data, int profile, uint3
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_gre_chksum_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_CHKSUM_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_gre_chksum_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_CHKSUM_T_FID_COUNT] = {
     bcmpkt_gre_chksum_t_checksum_get,
     bcmpkt_gre_chksum_t_offset_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_gre_chksum_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_CHKSUM_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_gre_chksum_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_CHKSUM_T_FID_COUNT] = {
     bcmpkt_gre_chksum_t_checksum_set,
     bcmpkt_gre_chksum_t_offset_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_gre_chksum_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_CHKSUM_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_gre_chksum_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_CHKSUM_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_gre_chksum_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_CHKSUM_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_gre_chksum_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_gre_chksum_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_CHKSUM_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_gre_chksum_t_field_data,
 };
 
 
@@ -2857,23 +2861,23 @@ static int32_t bcmpkt_gre_key_t_vn_id_upper_set(uint32_t *data, int profile, uin
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_gre_key_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_KEY_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_gre_key_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_KEY_T_FID_COUNT] = {
     bcmpkt_gre_key_t_vn_id_lower_entropy_get,
     bcmpkt_gre_key_t_vn_id_upper_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_gre_key_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_KEY_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_gre_key_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_KEY_T_FID_COUNT] = {
     bcmpkt_gre_key_t_vn_id_lower_entropy_set,
     bcmpkt_gre_key_t_vn_id_upper_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_gre_key_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_KEY_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_gre_key_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_KEY_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_gre_key_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_KEY_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_gre_key_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_gre_key_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_KEY_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_gre_key_t_field_data,
 };
 
 
@@ -2893,21 +2897,21 @@ static int32_t bcmpkt_gre_rout_t_routing_set(uint32_t *data, int profile, uint32
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_gre_rout_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_ROUT_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_gre_rout_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_ROUT_T_FID_COUNT] = {
     bcmpkt_gre_rout_t_routing_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_gre_rout_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_ROUT_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_gre_rout_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_ROUT_T_FID_COUNT] = {
     bcmpkt_gre_rout_t_routing_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_gre_rout_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_ROUT_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_gre_rout_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_ROUT_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_gre_rout_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_ROUT_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_gre_rout_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_gre_rout_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_ROUT_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_gre_rout_t_field_data,
 };
 
 
@@ -2927,21 +2931,21 @@ static int32_t bcmpkt_gre_seq_t_sequence_set(uint32_t *data, int profile, uint32
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_gre_seq_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_SEQ_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_gre_seq_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_SEQ_T_FID_COUNT] = {
     bcmpkt_gre_seq_t_sequence_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_gre_seq_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_SEQ_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_gre_seq_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_SEQ_T_FID_COUNT] = {
     bcmpkt_gre_seq_t_sequence_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_gre_seq_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_SEQ_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_gre_seq_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_SEQ_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_gre_seq_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_SEQ_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_gre_seq_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_gre_seq_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_SEQ_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_gre_seq_t_field_data,
 };
 
 
@@ -3005,27 +3009,27 @@ static int32_t bcmpkt_gre_t_version_set(uint32_t *data, int profile, uint32_t va
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_gre_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_gre_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_T_FID_COUNT] = {
     bcmpkt_gre_t_c_r_k_s_get,
     bcmpkt_gre_t_protocol_get,
     bcmpkt_gre_t_reserved_get,
     bcmpkt_gre_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_gre_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_gre_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_T_FID_COUNT] = {
     bcmpkt_gre_t_c_r_k_s_set,
     bcmpkt_gre_t_protocol_set,
     bcmpkt_gre_t_reserved_set,
     bcmpkt_gre_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_gre_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_gre_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_gre_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GRE_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_gre_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_gre_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GRE_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_gre_t_field_data,
 };
 
 
@@ -3077,25 +3081,25 @@ static int32_t bcmpkt_gtp_12byte_t_bytes_7_4_set(uint32_t *data, int profile, ui
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_gtp_12byte_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_12BYTE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_gtp_12byte_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_12BYTE_T_FID_COUNT] = {
     bcmpkt_gtp_12byte_t_bytes_11_8_get,
     bcmpkt_gtp_12byte_t_bytes_3_0_get,
     bcmpkt_gtp_12byte_t_bytes_7_4_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_gtp_12byte_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_12BYTE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_gtp_12byte_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_12BYTE_T_FID_COUNT] = {
     bcmpkt_gtp_12byte_t_bytes_11_8_set,
     bcmpkt_gtp_12byte_t_bytes_3_0_set,
     bcmpkt_gtp_12byte_t_bytes_7_4_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_gtp_12byte_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_12BYTE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_gtp_12byte_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_12BYTE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_gtp_12byte_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_12BYTE_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_gtp_12byte_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_gtp_12byte_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_12BYTE_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_gtp_12byte_t_field_data,
 };
 
 
@@ -3131,23 +3135,23 @@ static int32_t bcmpkt_gtp_8byte_t_bytes_7_4_set(uint32_t *data, int profile, uin
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_gtp_8byte_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_8BYTE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_gtp_8byte_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_8BYTE_T_FID_COUNT] = {
     bcmpkt_gtp_8byte_t_bytes_3_0_get,
     bcmpkt_gtp_8byte_t_bytes_7_4_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_gtp_8byte_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_8BYTE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_gtp_8byte_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_8BYTE_T_FID_COUNT] = {
     bcmpkt_gtp_8byte_t_bytes_3_0_set,
     bcmpkt_gtp_8byte_t_bytes_7_4_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_gtp_8byte_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_8BYTE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_gtp_8byte_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_8BYTE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_gtp_8byte_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_8BYTE_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_gtp_8byte_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_gtp_8byte_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_8BYTE_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_gtp_8byte_t_field_data,
 };
 
 
@@ -3167,21 +3171,21 @@ static int32_t bcmpkt_gtp_ext_4byte_t_ext_hdr_set(uint32_t *data, int profile, u
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_gtp_ext_4byte_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_EXT_4BYTE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_gtp_ext_4byte_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_EXT_4BYTE_T_FID_COUNT] = {
     bcmpkt_gtp_ext_4byte_t_ext_hdr_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_gtp_ext_4byte_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_EXT_4BYTE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_gtp_ext_4byte_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_EXT_4BYTE_T_FID_COUNT] = {
     bcmpkt_gtp_ext_4byte_t_ext_hdr_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_gtp_ext_4byte_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_EXT_4BYTE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_gtp_ext_4byte_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_EXT_4BYTE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_gtp_ext_4byte_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_EXT_4BYTE_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_gtp_ext_4byte_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_gtp_ext_4byte_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_EXT_4BYTE_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_gtp_ext_4byte_t_field_data,
 };
 
 
@@ -3233,25 +3237,25 @@ static int32_t bcmpkt_gtp_with_ext_t_bytes_7_4_set(uint32_t *data, int profile,
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_gtp_with_ext_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_WITH_EXT_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_gtp_with_ext_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_WITH_EXT_T_FID_COUNT] = {
     bcmpkt_gtp_with_ext_t_bytes_11_8_get,
     bcmpkt_gtp_with_ext_t_bytes_3_0_get,
     bcmpkt_gtp_with_ext_t_bytes_7_4_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_gtp_with_ext_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_WITH_EXT_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_gtp_with_ext_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_WITH_EXT_T_FID_COUNT] = {
     bcmpkt_gtp_with_ext_t_bytes_11_8_set,
     bcmpkt_gtp_with_ext_t_bytes_3_0_set,
     bcmpkt_gtp_with_ext_t_bytes_7_4_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_gtp_with_ext_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_WITH_EXT_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_gtp_with_ext_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_WITH_EXT_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_gtp_with_ext_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_GTP_WITH_EXT_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_gtp_with_ext_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_gtp_with_ext_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_GTP_WITH_EXT_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_gtp_with_ext_t_field_data,
 };
 
 
@@ -3301,25 +3305,25 @@ static int32_t bcmpkt_hop_by_hop_t_option_set(uint32_t *data, int profile, uint3
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_hop_by_hop_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_HOP_BY_HOP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_hop_by_hop_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_HOP_BY_HOP_T_FID_COUNT] = {
     bcmpkt_hop_by_hop_t_hdr_ext_len_get,
     bcmpkt_hop_by_hop_t_next_header_get,
     bcmpkt_hop_by_hop_t_option_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_hop_by_hop_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_HOP_BY_HOP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_hop_by_hop_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_HOP_BY_HOP_T_FID_COUNT] = {
     bcmpkt_hop_by_hop_t_hdr_ext_len_set,
     bcmpkt_hop_by_hop_t_next_header_set,
     bcmpkt_hop_by_hop_t_option_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_hop_by_hop_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_HOP_BY_HOP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_hop_by_hop_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_HOP_BY_HOP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_hop_by_hop_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_HOP_BY_HOP_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_hop_by_hop_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_hop_by_hop_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_HOP_BY_HOP_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_hop_by_hop_t_field_data,
 };
 
 
@@ -3368,25 +3372,25 @@ static int32_t bcmpkt_icmp_t_icmp_type_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_icmp_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ICMP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_icmp_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ICMP_T_FID_COUNT] = {
     bcmpkt_icmp_t_checksum_get,
     bcmpkt_icmp_t_code_get,
     bcmpkt_icmp_t_icmp_type_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_icmp_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ICMP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_icmp_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ICMP_T_FID_COUNT] = {
     bcmpkt_icmp_t_checksum_set,
     bcmpkt_icmp_t_code_set,
     bcmpkt_icmp_t_icmp_type_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_icmp_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_icmp_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_icmp_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ICMP_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_icmp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_icmp_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ICMP_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_icmp_t_field_data,
 };
 
 
@@ -3451,27 +3455,27 @@ static int32_t bcmpkt_igmp_t_max_resp_time_set(uint32_t *data, int profile, uint
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_igmp_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IGMP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_igmp_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IGMP_T_FID_COUNT] = {
     bcmpkt_igmp_t_checksum_get,
     bcmpkt_igmp_t_group_address_get,
     bcmpkt_igmp_t_igmp_type_get,
     bcmpkt_igmp_t_max_resp_time_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_igmp_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IGMP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_igmp_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IGMP_T_FID_COUNT] = {
     bcmpkt_igmp_t_checksum_set,
     bcmpkt_igmp_t_group_address_set,
     bcmpkt_igmp_t_igmp_type_set,
     bcmpkt_igmp_t_max_resp_time_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_igmp_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IGMP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_igmp_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IGMP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_igmp_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IGMP_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_igmp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_igmp_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IGMP_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_igmp_t_field_data,
 };
 
 
@@ -3553,7 +3557,7 @@ static int32_t bcmpkt_ipfix_t_version_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_ipfix_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPFIX_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_ipfix_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPFIX_T_FID_COUNT] = {
     bcmpkt_ipfix_t_export_time_get,
     bcmpkt_ipfix_t_length_get,
     bcmpkt_ipfix_t_obs_domain_id_get,
@@ -3561,7 +3565,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_ipfix_t_fget[BCM56880_A0_NFA_
     bcmpkt_ipfix_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_ipfix_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPFIX_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_ipfix_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPFIX_T_FID_COUNT] = {
     bcmpkt_ipfix_t_export_time_set,
     bcmpkt_ipfix_t_length_set,
     bcmpkt_ipfix_t_obs_domain_id_set,
@@ -3569,13 +3573,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_ipfix_t_fset[BCM56880_A0_NFA_
     bcmpkt_ipfix_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_ipfix_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_ipfix_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_ipfix_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPFIX_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_ipfix_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_ipfix_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPFIX_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_ipfix_t_field_data,
 };
 
 
@@ -3747,7 +3751,7 @@ static int32_t bcmpkt_ipv4_t_version_hdr_len_set(uint32_t *data, int profile, ui
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_ipv4_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV4_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_ipv4_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV4_T_FID_COUNT] = {
     bcmpkt_ipv4_t_da_get,
     bcmpkt_ipv4_t_flags_frag_offset_get,
     bcmpkt_ipv4_t_hdr_checksum_get,
@@ -3761,7 +3765,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_ipv4_t_fget[BCM56880_A0_NFA_6
     bcmpkt_ipv4_t_version_hdr_len_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_ipv4_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV4_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_ipv4_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV4_T_FID_COUNT] = {
     bcmpkt_ipv4_t_da_set,
     bcmpkt_ipv4_t_flags_frag_offset_set,
     bcmpkt_ipv4_t_hdr_checksum_set,
@@ -3775,13 +3779,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_ipv4_t_fset[BCM56880_A0_NFA_6
     bcmpkt_ipv4_t_version_hdr_len_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_ipv4_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_ipv4_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_ipv4_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV4_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_ipv4_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_ipv4_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV4_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_ipv4_t_field_data,
 };
 
 
@@ -3907,7 +3911,7 @@ static int32_t bcmpkt_ipv6_t_version_set(uint32_t *data, int profile, uint32_t v
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_ipv6_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV6_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_ipv6_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV6_T_FID_COUNT] = {
     bcmpkt_ipv6_t_da_get,
     bcmpkt_ipv6_t_flow_label_get,
     bcmpkt_ipv6_t_hop_limit_get,
@@ -3918,7 +3922,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_ipv6_t_fget[BCM56880_A0_NFA_6
     bcmpkt_ipv6_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_ipv6_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV6_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_ipv6_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV6_T_FID_COUNT] = {
     bcmpkt_ipv6_t_da_set,
     bcmpkt_ipv6_t_flow_label_set,
     bcmpkt_ipv6_t_hop_limit_set,
@@ -3929,13 +3933,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_ipv6_t_fset[BCM56880_A0_NFA_6
     bcmpkt_ipv6_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_ipv6_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_ipv6_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_ipv6_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_IPV6_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_ipv6_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_ipv6_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_IPV6_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_ipv6_t_field_data,
 };
 
 
@@ -3971,23 +3975,23 @@ static int32_t bcmpkt_l2_t_macsa_set(uint32_t *data, int profile, uint32_t val)
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_l2_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_L2_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_l2_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_L2_T_FID_COUNT] = {
     bcmpkt_l2_t_macda_get,
     bcmpkt_l2_t_macsa_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_l2_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_L2_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_l2_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_L2_T_FID_COUNT] = {
     bcmpkt_l2_t_macda_set,
     bcmpkt_l2_t_macsa_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_l2_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_L2_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_l2_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_L2_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_l2_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_L2_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_l2_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_l2_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_L2_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_l2_t_field_data,
 };
 
 
@@ -4007,21 +4011,21 @@ static int32_t bcmpkt_mirror_erspan_sn_t_seq_num_set(uint32_t *data, int profile
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_mirror_erspan_sn_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_mirror_erspan_sn_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
     bcmpkt_mirror_erspan_sn_t_seq_num_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_mirror_erspan_sn_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_mirror_erspan_sn_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
     bcmpkt_mirror_erspan_sn_t_seq_num_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_mirror_erspan_sn_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_mirror_erspan_sn_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_mirror_erspan_sn_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_mirror_erspan_sn_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_mirror_erspan_sn_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_mirror_erspan_sn_t_field_data,
 };
 
 
@@ -4041,21 +4045,21 @@ static int32_t bcmpkt_mirror_transport_t_data_set(uint32_t *data, int profile, u
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_mirror_transport_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_mirror_transport_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
     bcmpkt_mirror_transport_t_data_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_mirror_transport_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_mirror_transport_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
     bcmpkt_mirror_transport_t_data_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_mirror_transport_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_mirror_transport_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_mirror_transport_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_mirror_transport_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_mirror_transport_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_mirror_transport_t_field_data,
 };
 
 
@@ -4119,27 +4123,27 @@ static int32_t bcmpkt_mpls_ach_t_version_set(uint32_t *data, int profile, uint32
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_mpls_ach_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_ACH_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_mpls_ach_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_ACH_T_FID_COUNT] = {
     bcmpkt_mpls_ach_t_channel_type_get,
     bcmpkt_mpls_ach_t_cw_type_get,
     bcmpkt_mpls_ach_t_reserved_get,
     bcmpkt_mpls_ach_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_mpls_ach_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_ACH_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_mpls_ach_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_ACH_T_FID_COUNT] = {
     bcmpkt_mpls_ach_t_channel_type_set,
     bcmpkt_mpls_ach_t_cw_type_set,
     bcmpkt_mpls_ach_t_reserved_set,
     bcmpkt_mpls_ach_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_mpls_ach_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_ACH_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_mpls_ach_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_ACH_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_mpls_ach_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_ACH_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_mpls_ach_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_mpls_ach_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_ACH_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_mpls_ach_t_field_data,
 };
 
 
@@ -4159,21 +4163,21 @@ static int32_t bcmpkt_mpls_bv_t_value_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_mpls_bv_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_BV_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_mpls_bv_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_BV_T_FID_COUNT] = {
     bcmpkt_mpls_bv_t_value_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_mpls_bv_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_BV_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_mpls_bv_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_BV_T_FID_COUNT] = {
     bcmpkt_mpls_bv_t_value_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_mpls_bv_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_BV_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_mpls_bv_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_BV_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_mpls_bv_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_BV_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_mpls_bv_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_mpls_bv_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_BV_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_mpls_bv_t_field_data,
 };
 
 
@@ -4222,25 +4226,25 @@ static int32_t bcmpkt_mpls_cw_t_seq_number_set(uint32_t *data, int profile, uint
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_mpls_cw_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_CW_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_mpls_cw_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_CW_T_FID_COUNT] = {
     bcmpkt_mpls_cw_t_cw_type_get,
     bcmpkt_mpls_cw_t_reserved_get,
     bcmpkt_mpls_cw_t_seq_number_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_mpls_cw_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_CW_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_mpls_cw_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_CW_T_FID_COUNT] = {
     bcmpkt_mpls_cw_t_cw_type_set,
     bcmpkt_mpls_cw_t_reserved_set,
     bcmpkt_mpls_cw_t_seq_number_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_mpls_cw_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_CW_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_mpls_cw_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_CW_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_mpls_cw_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_CW_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_mpls_cw_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_mpls_cw_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_CW_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_mpls_cw_t_field_data,
 };
 
 
@@ -4304,27 +4308,27 @@ static int32_t bcmpkt_mpls_t_ttl_set(uint32_t *data, int profile, uint32_t val)
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_mpls_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_mpls_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_T_FID_COUNT] = {
     bcmpkt_mpls_t_bos_get,
     bcmpkt_mpls_t_exp_get,
     bcmpkt_mpls_t_label_get,
     bcmpkt_mpls_t_ttl_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_mpls_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_mpls_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_T_FID_COUNT] = {
     bcmpkt_mpls_t_bos_set,
     bcmpkt_mpls_t_exp_set,
     bcmpkt_mpls_t_label_set,
     bcmpkt_mpls_t_ttl_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_mpls_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_mpls_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_mpls_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_MPLS_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_mpls_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_mpls_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_MPLS_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_mpls_t_field_data,
 };
 
 
@@ -4358,23 +4362,23 @@ static int32_t bcmpkt_opaquetag_t_vlan_tag_set(uint32_t *data, int profile, uint
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_opaquetag_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_OPAQUETAG_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_opaquetag_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_OPAQUETAG_T_FID_COUNT] = {
     bcmpkt_opaquetag_t_tpid_get,
     bcmpkt_opaquetag_t_vlan_tag_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_opaquetag_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_OPAQUETAG_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_opaquetag_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_OPAQUETAG_T_FID_COUNT] = {
     bcmpkt_opaquetag_t_tpid_set,
     bcmpkt_opaquetag_t_vlan_tag_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_opaquetag_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_OPAQUETAG_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_opaquetag_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_OPAQUETAG_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_opaquetag_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_OPAQUETAG_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_opaquetag_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_opaquetag_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_OPAQUETAG_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_opaquetag_t_field_data,
 };
 
 
@@ -4591,7 +4595,7 @@ static int32_t bcmpkt_p_1588_t_version_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_p_1588_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_P_1588_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_p_1588_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_P_1588_T_FID_COUNT] = {
     bcmpkt_p_1588_t_cntrl_get,
     bcmpkt_p_1588_t_correction_get,
     bcmpkt_p_1588_t_domain_nb_get,
@@ -4608,7 +4612,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_p_1588_t_fget[BCM56880_A0_NFA
     bcmpkt_p_1588_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_p_1588_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_P_1588_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_p_1588_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_P_1588_T_FID_COUNT] = {
     bcmpkt_p_1588_t_cntrl_set,
     bcmpkt_p_1588_t_correction_set,
     bcmpkt_p_1588_t_domain_nb_set,
@@ -4625,13 +4629,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_p_1588_t_fset[BCM56880_A0_NFA
     bcmpkt_p_1588_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_p_1588_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_P_1588_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_p_1588_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_P_1588_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_p_1588_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_P_1588_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_p_1588_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_p_1588_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_P_1588_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_p_1588_t_field_data,
 };
 
 
@@ -4681,25 +4685,25 @@ static int32_t bcmpkt_prog_ext_hdr_t_option_set(uint32_t *data, int profile, uin
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_prog_ext_hdr_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PROG_EXT_HDR_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_prog_ext_hdr_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PROG_EXT_HDR_T_FID_COUNT] = {
     bcmpkt_prog_ext_hdr_t_hdr_ext_len_get,
     bcmpkt_prog_ext_hdr_t_next_header_get,
     bcmpkt_prog_ext_hdr_t_option_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_prog_ext_hdr_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PROG_EXT_HDR_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_prog_ext_hdr_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PROG_EXT_HDR_T_FID_COUNT] = {
     bcmpkt_prog_ext_hdr_t_hdr_ext_len_set,
     bcmpkt_prog_ext_hdr_t_next_header_set,
     bcmpkt_prog_ext_hdr_t_option_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_prog_ext_hdr_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PROG_EXT_HDR_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_prog_ext_hdr_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PROG_EXT_HDR_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_prog_ext_hdr_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PROG_EXT_HDR_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_prog_ext_hdr_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_prog_ext_hdr_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PROG_EXT_HDR_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_prog_ext_hdr_t_field_data,
 };
 
 
@@ -4795,7 +4799,7 @@ static int32_t bcmpkt_psamp_0_t_template_id_set(uint32_t *data, int profile, uin
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_psamp_0_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_psamp_0_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_0_T_FID_COUNT] = {
     bcmpkt_psamp_0_t_flowset_get,
     bcmpkt_psamp_0_t_length_get,
     bcmpkt_psamp_0_t_next_hop_index_get,
@@ -4804,7 +4808,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_psamp_0_t_fget[BCM56880_A0_NF
     bcmpkt_psamp_0_t_template_id_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_psamp_0_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_psamp_0_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_0_T_FID_COUNT] = {
     bcmpkt_psamp_0_t_flowset_set,
     bcmpkt_psamp_0_t_length_set,
     bcmpkt_psamp_0_t_next_hop_index_set,
@@ -4813,13 +4817,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_psamp_0_t_fset[BCM56880_A0_NF
     bcmpkt_psamp_0_t_template_id_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_psamp_0_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_psamp_0_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_psamp_0_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_0_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_psamp_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_psamp_0_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_0_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_psamp_0_t_field_data,
 };
 
 
@@ -4928,7 +4932,7 @@ static int32_t bcmpkt_psamp_1_t_variable_flag_set(uint32_t *data, int profile, u
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_psamp_1_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_1_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_psamp_1_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_1_T_FID_COUNT] = {
     bcmpkt_psamp_1_t_dlb_id_get,
     bcmpkt_psamp_1_t_egress_port_get,
     bcmpkt_psamp_1_t_epoch_get,
@@ -4938,7 +4942,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_psamp_1_t_fget[BCM56880_A0_NF
     bcmpkt_psamp_1_t_variable_flag_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_psamp_1_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_1_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_psamp_1_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_1_T_FID_COUNT] = {
     bcmpkt_psamp_1_t_dlb_id_set,
     bcmpkt_psamp_1_t_egress_port_set,
     bcmpkt_psamp_1_t_epoch_set,
@@ -4948,13 +4952,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_psamp_1_t_fset[BCM56880_A0_NF
     bcmpkt_psamp_1_t_variable_flag_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_psamp_1_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_1_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_psamp_1_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_1_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_psamp_1_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_1_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_psamp_1_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_psamp_1_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_1_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_psamp_1_t_field_data,
 };
 
 
@@ -5066,7 +5070,7 @@ static int32_t bcmpkt_psamp_mirror_on_drop_0_t_template_id_set(uint32_t *data, i
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_psamp_mirror_on_drop_0_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_psamp_mirror_on_drop_0_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_0_t_egress_mod_port_get,
     bcmpkt_psamp_mirror_on_drop_0_t_ingress_port_get,
     bcmpkt_psamp_mirror_on_drop_0_t_length_get,
@@ -5076,7 +5080,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_psamp_mirror_on_drop_0_t_fget
     bcmpkt_psamp_mirror_on_drop_0_t_template_id_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_psamp_mirror_on_drop_0_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_psamp_mirror_on_drop_0_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_0_t_egress_mod_port_set,
     bcmpkt_psamp_mirror_on_drop_0_t_ingress_port_set,
     bcmpkt_psamp_mirror_on_drop_0_t_length_set,
@@ -5086,13 +5090,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_psamp_mirror_on_drop_0_t_fset
     bcmpkt_psamp_mirror_on_drop_0_t_template_id_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_psamp_mirror_on_drop_0_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_psamp_mirror_on_drop_0_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_psamp_mirror_on_drop_0_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_psamp_mirror_on_drop_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_psamp_mirror_on_drop_0_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_psamp_mirror_on_drop_0_t_field_data,
 };
 
 
@@ -5186,7 +5190,7 @@ static int32_t bcmpkt_psamp_mirror_on_drop_1_t_var_len_indicator_set(uint32_t *d
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_psamp_mirror_on_drop_1_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_psamp_mirror_on_drop_1_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_1_t_ing_drop_reason_get,
     bcmpkt_psamp_mirror_on_drop_1_t_mirror_on_drop_obj_get,
     bcmpkt_psamp_mirror_on_drop_1_t_mmu_drop_ctrl_get,
@@ -5195,7 +5199,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_psamp_mirror_on_drop_1_t_fget
     bcmpkt_psamp_mirror_on_drop_1_t_var_len_indicator_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_psamp_mirror_on_drop_1_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_psamp_mirror_on_drop_1_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_1_t_ing_drop_reason_set,
     bcmpkt_psamp_mirror_on_drop_1_t_mirror_on_drop_obj_set,
     bcmpkt_psamp_mirror_on_drop_1_t_mmu_drop_ctrl_set,
@@ -5204,13 +5208,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_psamp_mirror_on_drop_1_t_fset
     bcmpkt_psamp_mirror_on_drop_1_t_var_len_indicator_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_psamp_mirror_on_drop_1_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_psamp_mirror_on_drop_1_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_psamp_mirror_on_drop_1_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_psamp_mirror_on_drop_1_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_psamp_mirror_on_drop_1_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_psamp_mirror_on_drop_1_t_field_data,
 };
 
 
@@ -5353,7 +5357,7 @@ static int32_t bcmpkt_rarp_t_target_ip_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_rarp_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RARP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_rarp_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RARP_T_FID_COUNT] = {
     bcmpkt_rarp_t_hardware_len_get,
     bcmpkt_rarp_t_hardware_type_get,
     bcmpkt_rarp_t_operation_get,
@@ -5365,7 +5369,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_rarp_t_fget[BCM56880_A0_NFA_6
     bcmpkt_rarp_t_target_ip_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_rarp_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RARP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_rarp_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RARP_T_FID_COUNT] = {
     bcmpkt_rarp_t_hardware_len_set,
     bcmpkt_rarp_t_hardware_type_set,
     bcmpkt_rarp_t_operation_set,
@@ -5377,13 +5381,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_rarp_t_fset[BCM56880_A0_NFA_6
     bcmpkt_rarp_t_target_ip_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_rarp_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_rarp_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_rarp_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RARP_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_rarp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_rarp_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RARP_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_rarp_t_field_data,
 };
 
 
@@ -5463,7 +5467,7 @@ static int32_t bcmpkt_routing_t_segments_left_set(uint32_t *data, int profile, u
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_routing_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ROUTING_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_routing_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ROUTING_T_FID_COUNT] = {
     bcmpkt_routing_t_data_get,
     bcmpkt_routing_t_hdr_ext_len_get,
     bcmpkt_routing_t_next_header_get,
@@ -5471,7 +5475,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_routing_t_fget[BCM56880_A0_NF
     bcmpkt_routing_t_segments_left_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_routing_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ROUTING_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_routing_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ROUTING_T_FID_COUNT] = {
     bcmpkt_routing_t_data_set,
     bcmpkt_routing_t_hdr_ext_len_set,
     bcmpkt_routing_t_next_header_set,
@@ -5479,13 +5483,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_routing_t_fset[BCM56880_A0_NF
     bcmpkt_routing_t_segments_left_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_routing_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ROUTING_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_routing_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ROUTING_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_routing_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_ROUTING_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_routing_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_routing_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_ROUTING_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_routing_t_field_data,
 };
 
 
@@ -5519,23 +5523,23 @@ static int32_t bcmpkt_rspan_t_tpid_set(uint32_t *data, int profile, uint32_t val
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_rspan_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RSPAN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_rspan_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RSPAN_T_FID_COUNT] = {
     bcmpkt_rspan_t_tag_get,
     bcmpkt_rspan_t_tpid_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_rspan_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RSPAN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_rspan_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RSPAN_T_FID_COUNT] = {
     bcmpkt_rspan_t_tag_set,
     bcmpkt_rspan_t_tpid_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_rspan_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RSPAN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_rspan_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RSPAN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_rspan_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_RSPAN_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_rspan_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_rspan_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_RSPAN_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_rspan_t_field_data,
 };
 
 
@@ -5585,25 +5589,25 @@ static int32_t bcmpkt_sflow_shim_0_t_version_set(uint32_t *data, int profile, ui
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_sflow_shim_0_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_sflow_shim_0_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT] = {
     bcmpkt_sflow_shim_0_t_sys_destination_get,
     bcmpkt_sflow_shim_0_t_sys_source_get,
     bcmpkt_sflow_shim_0_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_sflow_shim_0_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_sflow_shim_0_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT] = {
     bcmpkt_sflow_shim_0_t_sys_destination_set,
     bcmpkt_sflow_shim_0_t_sys_source_set,
     bcmpkt_sflow_shim_0_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_sflow_shim_0_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_sflow_shim_0_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_sflow_shim_0_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_sflow_shim_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_sflow_shim_0_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_sflow_shim_0_t_field_data,
 };
 
 
@@ -5727,7 +5731,7 @@ static int32_t bcmpkt_sflow_shim_1_t_sys_opcode_set(uint32_t *data, int profile,
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_sflow_shim_1_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_sflow_shim_1_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT] = {
     bcmpkt_sflow_shim_1_t_flag_dest_sample_get,
     bcmpkt_sflow_shim_1_t_flag_discarded_get,
     bcmpkt_sflow_shim_1_t_flag_flex_sample_get,
@@ -5738,7 +5742,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_sflow_shim_1_t_fget[BCM56880_
     bcmpkt_sflow_shim_1_t_sys_opcode_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_sflow_shim_1_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_sflow_shim_1_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT] = {
     bcmpkt_sflow_shim_1_t_flag_dest_sample_set,
     bcmpkt_sflow_shim_1_t_flag_discarded_set,
     bcmpkt_sflow_shim_1_t_flag_flex_sample_set,
@@ -5749,13 +5753,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_sflow_shim_1_t_fset[BCM56880_
     bcmpkt_sflow_shim_1_t_sys_opcode_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_sflow_shim_1_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_sflow_shim_1_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_1_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_sflow_shim_1_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_sflow_shim_1_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_sflow_shim_1_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_sflow_shim_1_t_field_data,
 };
 
 
@@ -5790,23 +5794,23 @@ static int32_t bcmpkt_sflow_shim_2_t_user_meta_data_set(uint32_t *data, int prof
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_sflow_shim_2_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_sflow_shim_2_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT] = {
     bcmpkt_sflow_shim_2_t_sequence_num_get,
     bcmpkt_sflow_shim_2_t_user_meta_data_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_sflow_shim_2_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_sflow_shim_2_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT] = {
     bcmpkt_sflow_shim_2_t_sequence_num_set,
     bcmpkt_sflow_shim_2_t_user_meta_data_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_sflow_shim_2_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_2_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_sflow_shim_2_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_2_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_sflow_shim_2_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_sflow_shim_2_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_sflow_shim_2_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_sflow_shim_2_t_field_data,
 };
 
 
@@ -5841,23 +5845,23 @@ static int32_t bcmpkt_snap_llc_t_snap_llc_set(uint32_t *data, int profile, uint3
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_snap_llc_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SNAP_LLC_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_snap_llc_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SNAP_LLC_T_FID_COUNT] = {
     bcmpkt_snap_llc_t_length_get,
     bcmpkt_snap_llc_t_snap_llc_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_snap_llc_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SNAP_LLC_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_snap_llc_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SNAP_LLC_T_FID_COUNT] = {
     bcmpkt_snap_llc_t_length_set,
     bcmpkt_snap_llc_t_snap_llc_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_snap_llc_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SNAP_LLC_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_snap_llc_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SNAP_LLC_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_snap_llc_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_SNAP_LLC_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_snap_llc_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_snap_llc_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_SNAP_LLC_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_snap_llc_t_field_data,
 };
 
 
@@ -5891,23 +5895,23 @@ static int32_t bcmpkt_tcp_first_4bytes_t_src_port_set(uint32_t *data, int profil
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_tcp_first_4bytes_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_tcp_first_4bytes_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_first_4bytes_t_dst_port_get,
     bcmpkt_tcp_first_4bytes_t_src_port_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_tcp_first_4bytes_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_tcp_first_4bytes_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_first_4bytes_t_dst_port_set,
     bcmpkt_tcp_first_4bytes_t_src_port_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_tcp_first_4bytes_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_tcp_first_4bytes_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_tcp_first_4bytes_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_tcp_first_4bytes_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_tcp_first_4bytes_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_tcp_first_4bytes_t_field_data,
 };
 
 
@@ -6003,7 +6007,7 @@ static int32_t bcmpkt_tcp_last_16bytes_t_win_size_set(uint32_t *data, int profil
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_tcp_last_16bytes_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_tcp_last_16bytes_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_last_16bytes_t_ack_num_get,
     bcmpkt_tcp_last_16bytes_t_checksum_get,
     bcmpkt_tcp_last_16bytes_t_hdr_len_and_flags_get,
@@ -6012,7 +6016,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_tcp_last_16bytes_t_fget[BCM56
     bcmpkt_tcp_last_16bytes_t_win_size_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_tcp_last_16bytes_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_tcp_last_16bytes_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_last_16bytes_t_ack_num_set,
     bcmpkt_tcp_last_16bytes_t_checksum_set,
     bcmpkt_tcp_last_16bytes_t_hdr_len_and_flags_set,
@@ -6021,13 +6025,13 @@ bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_tcp_last_16bytes_t_fset[BCM56
     bcmpkt_tcp_last_16bytes_t_win_size_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_tcp_last_16bytes_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_tcp_last_16bytes_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_tcp_last_16bytes_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_tcp_last_16bytes_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_tcp_last_16bytes_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_tcp_last_16bytes_t_field_data,
 };
 
 
@@ -6091,27 +6095,27 @@ static int32_t bcmpkt_udp_t_udp_length_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_udp_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UDP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_udp_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UDP_T_FID_COUNT] = {
     bcmpkt_udp_t_checksum_get,
     bcmpkt_udp_t_dst_port_get,
     bcmpkt_udp_t_src_port_get,
     bcmpkt_udp_t_udp_length_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_udp_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UDP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_udp_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UDP_T_FID_COUNT] = {
     bcmpkt_udp_t_checksum_set,
     bcmpkt_udp_t_dst_port_set,
     bcmpkt_udp_t_src_port_set,
     bcmpkt_udp_t_udp_length_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_udp_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_udp_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_udp_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UDP_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_udp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_udp_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UDP_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_udp_t_field_data,
 };
 
 
@@ -6147,23 +6151,23 @@ static int32_t bcmpkt_unknown_l3_t_next_16bytes_of_l3_payload_set(uint32_t *data
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_unknown_l3_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_unknown_l3_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
     bcmpkt_unknown_l3_t_first_16bytes_of_l3_payload_get,
     bcmpkt_unknown_l3_t_next_16bytes_of_l3_payload_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_unknown_l3_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_unknown_l3_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
     bcmpkt_unknown_l3_t_first_16bytes_of_l3_payload_set,
     bcmpkt_unknown_l3_t_next_16bytes_of_l3_payload_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_unknown_l3_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_unknown_l3_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_unknown_l3_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L3_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_unknown_l3_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_unknown_l3_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L3_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_unknown_l3_t_field_data,
 };
 
 
@@ -6183,21 +6187,21 @@ static int32_t bcmpkt_unknown_l4_t_first_4bytes_of_l4_payload_set(uint32_t *data
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_unknown_l4_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_unknown_l4_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
     bcmpkt_unknown_l4_t_first_4bytes_of_l4_payload_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_unknown_l4_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_unknown_l4_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
     bcmpkt_unknown_l4_t_first_4bytes_of_l4_payload_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_unknown_l4_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_unknown_l4_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_unknown_l4_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L4_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_unknown_l4_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_unknown_l4_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L4_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_unknown_l4_t_field_data,
 };
 
 
@@ -6247,25 +6251,25 @@ static int32_t bcmpkt_unknown_l5_t_l5_bytes_4_7_set(uint32_t *data, int profile,
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_unknown_l5_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_unknown_l5_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
     bcmpkt_unknown_l5_t_l5_bytes_0_1_get,
     bcmpkt_unknown_l5_t_l5_bytes_2_3_get,
     bcmpkt_unknown_l5_t_l5_bytes_4_7_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_unknown_l5_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_unknown_l5_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
     bcmpkt_unknown_l5_t_l5_bytes_0_1_set,
     bcmpkt_unknown_l5_t_l5_bytes_2_3_set,
     bcmpkt_unknown_l5_t_l5_bytes_4_7_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_unknown_l5_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_unknown_l5_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_unknown_l5_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_UNKNOWN_L5_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_unknown_l5_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_unknown_l5_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_UNKNOWN_L5_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_unknown_l5_t_field_data,
 };
 
 
@@ -6329,27 +6333,27 @@ static int32_t bcmpkt_vlan_t_vid_set(uint32_t *data, int profile, uint32_t val)
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_vlan_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_vlan_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VLAN_T_FID_COUNT] = {
     bcmpkt_vlan_t_cfi_get,
     bcmpkt_vlan_t_pcp_get,
     bcmpkt_vlan_t_tpid_get,
     bcmpkt_vlan_t_vid_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_vlan_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_vlan_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VLAN_T_FID_COUNT] = {
     bcmpkt_vlan_t_cfi_set,
     bcmpkt_vlan_t_pcp_set,
     bcmpkt_vlan_t_tpid_set,
     bcmpkt_vlan_t_vid_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_vlan_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_vlan_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_vlan_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VLAN_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_vlan_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_vlan_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VLAN_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_vlan_t_field_data,
 };
 
 
@@ -6384,23 +6388,23 @@ static int32_t bcmpkt_vntag_t_tpid_set(uint32_t *data, int profile, uint32_t val
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_vntag_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VNTAG_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_vntag_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VNTAG_T_FID_COUNT] = {
     bcmpkt_vntag_t_tag_get,
     bcmpkt_vntag_t_tpid_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_vntag_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VNTAG_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_vntag_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VNTAG_T_FID_COUNT] = {
     bcmpkt_vntag_t_tag_set,
     bcmpkt_vntag_t_tpid_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_vntag_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VNTAG_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_vntag_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VNTAG_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_vntag_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VNTAG_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_vntag_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_vntag_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VNTAG_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_vntag_t_field_data,
 };
 
 
@@ -6450,25 +6454,25 @@ static int32_t bcmpkt_vxlan_t_vn_id_upper_set(uint32_t *data, int profile, uint3
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_vxlan_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VXLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_vxlan_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VXLAN_T_FID_COUNT] = {
     bcmpkt_vxlan_t_flags_reserved_1_get,
     bcmpkt_vxlan_t_vn_id_lower_reserved2_get,
     bcmpkt_vxlan_t_vn_id_upper_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_vxlan_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VXLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_vxlan_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VXLAN_T_FID_COUNT] = {
     bcmpkt_vxlan_t_flags_reserved_1_set,
     bcmpkt_vxlan_t_vn_id_lower_reserved2_set,
     bcmpkt_vxlan_t_vn_id_upper_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_vxlan_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_vxlan_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_vxlan_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_VXLAN_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_vxlan_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_vxlan_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_VXLAN_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_vxlan_t_field_data,
 };
 
 
@@ -6580,7 +6584,7 @@ static int32_t bcmpkt_wesp_t_wesp_iv_set(uint32_t *data, int profile, uint32_t v
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_wesp_t_fget[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_WESP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_31_3_1_wesp_t_fget[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_WESP_T_FID_COUNT] = {
     bcmpkt_wesp_t_flags_get,
     bcmpkt_wesp_t_header_len_get,
     bcmpkt_wesp_t_next_header_get,
@@ -6590,7 +6594,7 @@ bcmpkt_flex_field_get_f bcm56880_a0_nfa_6_5_30_1_1_wesp_t_fget[BCM56880_A0_NFA_6
     bcmpkt_wesp_t_wesp_iv_get,
 };
 
-bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_wesp_t_fset[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_WESP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_31_3_1_wesp_t_fset[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_WESP_T_FID_COUNT] = {
     bcmpkt_wesp_t_flags_set,
     bcmpkt_wesp_t_header_len_set,
     bcmpkt_wesp_t_next_header_set,
@@ -6600,464 +6604,464 @@ bcmpkt_flex_field_set_f bcm56880_a0_nfa_6_5_30_1_1_wesp_t_fset[BCM56880_A0_NFA_6
     bcmpkt_wesp_t_wesp_iv_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_30_1_1_wesp_t_field_data[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_WESP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56880_a0_nfa_6_5_31_3_1_wesp_t_field_data[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_WESP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_30_1_1_wesp_t_field_info = {
-    .num_fields = BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_WESP_T_FID_COUNT,
-    .info = bcm56880_a0_nfa_6_5_30_1_1_wesp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56880_a0_nfa_6_5_31_3_1_wesp_t_field_info = {
+    .num_fields = BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_WESP_T_FID_COUNT,
+    .info = bcm56880_a0_nfa_6_5_31_3_1_wesp_t_field_data,
 };
 
-static bcmpkt_flex_pmd_info_t bcm56880_a0_nfa_6_5_30_1_1_flexhdr_info_list[BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_FLEXHDR_COUNT] = {
+static bcmpkt_flex_pmd_info_t bcm56880_a0_nfa_6_5_31_3_1_flexhdr_info_list[BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_FLEXHDR_COUNT] = {
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_arp_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_arp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_arp_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_arp_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_arp_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_arp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_authen_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_authen_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_authen_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_authen_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_authen_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_authen_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_bfd_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_bfd_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_bfd_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_bfd_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_bfd_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_bfd_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_cpu_composites_0_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_cpu_composites_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_cpu_composites_0_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_cpu_composites_0_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_cpu_composites_0_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_cpu_composites_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_cpu_composites_1_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_cpu_composites_1_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_cpu_composites_1_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_cpu_composites_1_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_cpu_composites_1_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_cpu_composites_1_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_dest_option_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_dest_option_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_dest_option_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_dest_option_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_dest_option_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_dest_option_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_erspan3_fixed_hdr_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_erspan3_fixed_hdr_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_erspan3_fixed_hdr_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_erspan3_fixed_hdr_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_erspan3_fixed_hdr_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_erspan3_fixed_hdr_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_erspan3_subhdr_5_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_erspan3_subhdr_5_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_erspan3_subhdr_5_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_erspan3_subhdr_5_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_erspan3_subhdr_5_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_erspan3_subhdr_5_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_esp_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_esp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_esp_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_esp_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_esp_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_esp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_etag_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_etag_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_etag_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_etag_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_etag_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_etag_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_ethertype_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_ethertype_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_ethertype_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_ethertype_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_ethertype_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_ethertype_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_frag_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_frag_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_frag_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_frag_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_frag_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_frag_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_generic_loopback_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_generic_loopback_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_generic_loopback_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_generic_loopback_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_generic_loopback_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_generic_loopback_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_gpe_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_gpe_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_gpe_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_gpe_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_gpe_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_gpe_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_gre_chksum_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_gre_chksum_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_gre_chksum_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_gre_chksum_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_gre_chksum_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_gre_chksum_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_gre_key_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_gre_key_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_gre_key_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_gre_key_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_gre_key_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_gre_key_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_gre_rout_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_gre_rout_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_gre_rout_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_gre_rout_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_gre_rout_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_gre_rout_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_gre_seq_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_gre_seq_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_gre_seq_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_gre_seq_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_gre_seq_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_gre_seq_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_gre_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_gre_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_gre_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_gre_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_gre_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_gre_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_gtp_12byte_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_gtp_12byte_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_gtp_12byte_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_gtp_12byte_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_gtp_12byte_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_gtp_12byte_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_gtp_8byte_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_gtp_8byte_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_gtp_8byte_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_gtp_8byte_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_gtp_8byte_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_gtp_8byte_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_gtp_ext_4byte_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_gtp_ext_4byte_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_gtp_ext_4byte_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_gtp_ext_4byte_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_gtp_ext_4byte_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_gtp_ext_4byte_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_gtp_with_ext_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_gtp_with_ext_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_gtp_with_ext_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_gtp_with_ext_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_gtp_with_ext_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_gtp_with_ext_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_hop_by_hop_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_hop_by_hop_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_hop_by_hop_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_hop_by_hop_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_hop_by_hop_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_hop_by_hop_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_icmp_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_icmp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_icmp_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_icmp_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_icmp_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_icmp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_igmp_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_igmp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_igmp_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_igmp_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_igmp_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_igmp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_ipfix_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_ipfix_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_ipfix_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_ipfix_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_ipfix_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_ipfix_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_ipv4_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_ipv4_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_ipv4_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_ipv4_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_ipv4_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_ipv4_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_ipv6_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_ipv6_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_ipv6_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_ipv6_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_ipv6_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_ipv6_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_l2_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_l2_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_l2_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_l2_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_l2_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_l2_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_mirror_erspan_sn_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_mirror_erspan_sn_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_mirror_erspan_sn_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_mirror_erspan_sn_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_mirror_erspan_sn_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_mirror_erspan_sn_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_mirror_transport_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_mirror_transport_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_mirror_transport_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_mirror_transport_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_mirror_transport_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_mirror_transport_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_mpls_ach_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_mpls_ach_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_mpls_ach_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_mpls_ach_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_mpls_ach_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_mpls_ach_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_mpls_bv_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_mpls_bv_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_mpls_bv_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_mpls_bv_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_mpls_bv_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_mpls_bv_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_mpls_cw_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_mpls_cw_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_mpls_cw_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_mpls_cw_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_mpls_cw_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_mpls_cw_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_mpls_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_mpls_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_mpls_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_mpls_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_mpls_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_mpls_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_opaquetag_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_opaquetag_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_opaquetag_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_opaquetag_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_opaquetag_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_opaquetag_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_p_1588_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_p_1588_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_p_1588_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_p_1588_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_p_1588_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_p_1588_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_prog_ext_hdr_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_prog_ext_hdr_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_prog_ext_hdr_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_prog_ext_hdr_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_prog_ext_hdr_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_prog_ext_hdr_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_psamp_0_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_psamp_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_psamp_0_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_psamp_0_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_psamp_0_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_psamp_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_psamp_1_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_psamp_1_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_psamp_1_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_psamp_1_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_psamp_1_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_psamp_1_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_psamp_mirror_on_drop_0_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_psamp_mirror_on_drop_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_psamp_mirror_on_drop_0_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_psamp_mirror_on_drop_0_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_psamp_mirror_on_drop_0_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_psamp_mirror_on_drop_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_psamp_mirror_on_drop_1_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_psamp_mirror_on_drop_1_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_psamp_mirror_on_drop_1_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_psamp_mirror_on_drop_1_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_psamp_mirror_on_drop_1_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_psamp_mirror_on_drop_1_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_rarp_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_rarp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_rarp_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_rarp_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_rarp_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_rarp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_routing_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_routing_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_routing_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_routing_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_routing_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_routing_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_rspan_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_rspan_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_rspan_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_rspan_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_rspan_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_rspan_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_sflow_shim_0_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_sflow_shim_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_sflow_shim_0_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_sflow_shim_0_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_sflow_shim_0_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_sflow_shim_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_sflow_shim_1_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_sflow_shim_1_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_sflow_shim_1_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_sflow_shim_1_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_sflow_shim_1_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_sflow_shim_1_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_sflow_shim_2_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_sflow_shim_2_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_sflow_shim_2_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_sflow_shim_2_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_sflow_shim_2_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_sflow_shim_2_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_snap_llc_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_snap_llc_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_snap_llc_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_snap_llc_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_snap_llc_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_snap_llc_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_tcp_first_4bytes_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_tcp_first_4bytes_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_tcp_first_4bytes_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_tcp_first_4bytes_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_tcp_first_4bytes_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_tcp_first_4bytes_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_tcp_last_16bytes_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_tcp_last_16bytes_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_tcp_last_16bytes_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_tcp_last_16bytes_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_tcp_last_16bytes_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_tcp_last_16bytes_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_udp_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_udp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_udp_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_udp_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_udp_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_udp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_unknown_l3_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_unknown_l3_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_unknown_l3_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_unknown_l3_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_unknown_l3_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_unknown_l3_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_unknown_l4_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_unknown_l4_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_unknown_l4_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_unknown_l4_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_unknown_l4_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_unknown_l4_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_unknown_l5_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_unknown_l5_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_unknown_l5_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_unknown_l5_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_unknown_l5_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_unknown_l5_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_vlan_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_vlan_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_vlan_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_vlan_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_vlan_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_vlan_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_vntag_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_vntag_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_vntag_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_vntag_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_vntag_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_vntag_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_vxlan_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_vxlan_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_vxlan_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_vxlan_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_vxlan_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_vxlan_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_wesp_t_field_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_wesp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56880_a0_nfa_6_5_30_1_1_wesp_t_fget,
-        .flex_fset = bcm56880_a0_nfa_6_5_30_1_1_wesp_t_fset,
+        .flex_fget = bcm56880_a0_nfa_6_5_31_3_1_wesp_t_fget,
+        .flex_fset = bcm56880_a0_nfa_6_5_31_3_1_wesp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_field_info,
-        .reasons_info = &bcm56880_a0_nfa_6_5_30_1_1_rxpmd_flex_reasons_info,
+        .field_info = &bcm56880_a0_nfa_6_5_31_3_1_rxpmd_flex_field_info,
+        .reasons_info = &bcm56880_a0_nfa_6_5_31_3_1_rxpmd_flex_reasons_info,
         .flex_common_fget = bcm56880_a0_rxpmd_flex_fget,
         .flex_common_fset = bcm56880_a0_rxpmd_flex_fset,
     },
 };
 
-static shr_enum_map_t bcm56880_a0_nfa_6_5_30_1_1_flexhdr_id_map[] = {
-    BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_FLEXHDR_NAME_MAP_INIT
+static shr_enum_map_t bcm56880_a0_nfa_6_5_31_3_1_flexhdr_id_map[] = {
+    BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_FLEXHDR_NAME_MAP_INIT
 };
 
-shr_enum_map_t * bcm56880_a0_nfa_6_5_30_1_1_flexhdr_map_get(void)
+shr_enum_map_t * bcm56880_a0_nfa_6_5_31_3_1_flexhdr_map_get(void)
 {
-    return bcm56880_a0_nfa_6_5_30_1_1_flexhdr_id_map;
+    return bcm56880_a0_nfa_6_5_31_3_1_flexhdr_id_map;
 }
 
-bcmpkt_flex_pmd_info_t * bcm56880_a0_nfa_6_5_30_1_1_flex_pmd_info_get(uint32_t hid)
+bcmpkt_flex_pmd_info_t * bcm56880_a0_nfa_6_5_31_3_1_flex_pmd_info_get(uint32_t hid)
 {
-    if (hid >= BCM56880_A0_NFA_6_5_30_1_1_BCMPKT_FLEXHDR_COUNT) {
+    if (hid >= BCM56880_A0_NFA_6_5_31_3_1_BCMPKT_FLEXHDR_COUNT) {
         return NULL;
     }
 
-    return &bcm56880_a0_nfa_6_5_30_1_1_flexhdr_info_list[hid];
+    return &bcm56880_a0_nfa_6_5_31_3_1_flexhdr_info_list[hid];
 }
 
-int bcm56880_a0_nfa_6_5_30_1_1_flexhdr_variant_support_map[BCMPKT_PMD_COUNT] = {
+int bcm56880_a0_nfa_6_5_31_3_1_flexhdr_variant_support_map[BCMPKT_PMD_COUNT] = {
     12,
     -1,
     -1,
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_bcmpkt_rxpmd_match_id.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_bcmpkt_rxpmd_match_id.c
similarity index 77%
rename from platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_bcmpkt_rxpmd_match_id.c
rename to platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_bcmpkt_rxpmd_match_id.c
index e881973ef1e1..1854e50d6c3d 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_bcmpkt_rxpmd_match_id.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_bcmpkt_rxpmd_match_id.c
@@ -2,8 +2,8 @@
  *
  * DO NOT EDIT THIS FILE!
  * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) bcm56890_a0_cna_6_5_30_2_0_sf_match_id_info.yml
- * for device bcm56890_a0 and variant cna_6_5_30_2_0.
+ * from the NPL output file(s) bcm56890_a0_cna_6_5_31_3_0_sf_match_id_info.yml
+ * for device bcm56890_a0 and variant cna_6_5_31_3_0.
  * Edits to this file will be lost when it is regenerated.
  *
  * $Id: $
@@ -29,178 +29,178 @@
 
 
 #include <bcmpkt/bcmpkt_rxpmd_match_id.h>
-#include <bcmpkt/xfcr/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_bcmpkt_rxpmd_match_id_defs.h>
+#include <bcmpkt/xfcr/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_bcmpkt_rxpmd_match_id_defs.h>
 
-static uint32_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_itag[1] =
+static uint32_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_itag[1] =
 {
     0x8,
 };
 
-static uint32_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_l2[1] =
+static uint32_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_l2[1] =
 {
     0xe,
 };
 
-static uint32_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_otag[1] =
+static uint32_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_otag[1] =
 {
     0xc,
 };
 
-static uint32_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_arp[1] =
+static uint32_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_arp[1] =
 {
     0x4,
 };
 
-static uint32_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ethertype[1] =
+static uint32_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ethertype[1] =
 {
     0x7fffe,
 };
 
-static uint32_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_icmp[1] =
+static uint32_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_icmp[1] =
 {
     0x810,
 };
 
-static uint32_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ipv4[1] =
+static uint32_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ipv4[1] =
 {
     0x3f8,
 };
 
-static uint32_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ipv6[1] =
+static uint32_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ipv6[1] =
 {
     0x1fc00,
 };
 
-static uint32_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rarp[1] =
+static uint32_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rarp[1] =
 {
     0x20000,
 };
 
-static uint32_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_tcp_first_4bytes[1] =
+static uint32_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_tcp_first_4bytes[1] =
 {
     0x3060,
 };
 
-static uint32_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_tcp_last_16bytes[1] =
+static uint32_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_tcp_last_16bytes[1] =
 {
     0x2040,
 };
 
-static uint32_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_udp[1] =
+static uint32_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_udp[1] =
 {
     0xc180,
 };
 
-static uint32_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l3[1] =
+static uint32_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l3[1] =
 {
     0x40000,
 };
 
-static uint32_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l4[1] =
+static uint32_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l4[1] =
 {
     0x10200,
 };
 
-static uint32_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l5[1] =
+static uint32_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l5[1] =
 {
     0x8100,
 };
 
-static uint32_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_itag[1] =
+static uint32_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_itag[1] =
 {
     0x28,
 };
 
-static uint32_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_l2[1] =
+static uint32_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_l2[1] =
 {
     0x3e,
 };
 
-static uint32_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_otag[1] =
+static uint32_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_otag[1] =
 {
     0x30,
 };
 
-static uint32_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_arp[1] =
+static uint32_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_arp[1] =
 {
     0x4,
 };
 
-static uint32_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ethertype[1] =
+static uint32_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ethertype[1] =
 {
     0x1ffffe,
 };
 
-static uint32_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_icmp[1] =
+static uint32_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_icmp[1] =
 {
     0x1010,
 };
 
-static uint32_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ipv4[1] =
+static uint32_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ipv4[1] =
 {
     0x7f8,
 };
 
-static uint32_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ipv6[1] =
+static uint32_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ipv6[1] =
 {
     0x7f800,
 };
 
-static uint32_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rarp[1] =
+static uint32_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rarp[1] =
 {
     0x80000,
 };
 
-static uint32_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_tcp_first_4bytes[1] =
+static uint32_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_tcp_first_4bytes[1] =
 {
     0x6060,
 };
 
-static uint32_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_tcp_last_16bytes[1] =
+static uint32_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_tcp_last_16bytes[1] =
 {
     0x4040,
 };
 
-static uint32_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_udp[1] =
+static uint32_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_udp[1] =
 {
     0x38380,
 };
 
-static uint32_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l3[1] =
+static uint32_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l3[1] =
 {
     0x100000,
 };
 
-static uint32_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l4[1] =
+static uint32_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l4[1] =
 {
     0x40400,
 };
 
-static uint32_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l5[1] =
+static uint32_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l5[1] =
 {
     0x10100,
 };
 
-static uint32_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_vxlan[1] =
+static uint32_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_vxlan[1] =
 {
     0x20200,
 };
 
-static uint32_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_sys_hdr_ep_nih[1] =
+static uint32_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_sys_hdr_ep_nih[1] =
 {
     0x4,
 };
 
-static uint32_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_sys_hdr_loopback[1] =
+static uint32_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_sys_hdr_loopback[1] =
 {
     0x8,
 };
 
 
 static bcmpkt_rxpmd_match_id_db_t
-bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_COUNT] = {
+bcm56890_a0_cna_6_5_31_3_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_COUNT] = {
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG */
         .name         = "EGRESS_PKT_FWD_L2_HDR_ITAG",
         .match        = 0x2,
         .match_mask   = 0x2,
@@ -214,7 +214,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2 */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2 */
         .name         = "EGRESS_PKT_FWD_L2_HDR_L2",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -228,7 +228,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE */
         .name         = "EGRESS_PKT_FWD_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x7,
@@ -242,7 +242,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG */
         .name         = "EGRESS_PKT_FWD_L2_HDR_OTAG",
         .match        = 0x4,
         .match_mask   = 0x4,
@@ -256,7 +256,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ARP",
         .match        = 0x20,
         .match_mask   = 0x66,
@@ -270,7 +270,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -284,7 +284,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ICMP",
         .match        = 0x40,
         .match_mask   = 0x66,
@@ -298,7 +298,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4 */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IPV4",
         .match        = 0x8,
         .match_mask   = 0x18,
@@ -312,7 +312,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6 */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IPV6",
         .match        = 0x10,
         .match_mask   = 0x18,
@@ -326,7 +326,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x7f,
@@ -340,7 +340,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_RARP",
         .match        = 0x2,
         .match_mask   = 0x6,
@@ -354,7 +354,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x4,
         .match_mask   = 0x6,
@@ -368,7 +368,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x24,
         .match_mask   = 0x66,
@@ -382,7 +382,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UDP",
         .match        = 0x6,
         .match_mask   = 0x6,
@@ -396,7 +396,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3",
         .match        = 0x18,
         .match_mask   = 0x18,
@@ -410,7 +410,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x60,
         .match_mask   = 0x60,
@@ -424,7 +424,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x46,
         .match_mask   = 0x66,
@@ -438,7 +438,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_VXLAN",
         .match        = 0x26,
         .match_mask   = 0x66,
@@ -452,7 +452,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH */
         .name         = "EGRESS_PKT_SYS_HDR_EP_NIH",
         .match        = 0x2,
         .match_mask   = 0x3,
@@ -466,7 +466,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK */
         .name         = "EGRESS_PKT_SYS_HDR_LOOPBACK",
         .match        = 0x1,
         .match_mask   = 0x3,
@@ -480,7 +480,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE */
         .name         = "EGRESS_PKT_SYS_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3,
@@ -494,7 +494,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_ITAG",
         .match        = 0x2,
         .match_mask   = 0x2,
@@ -508,7 +508,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2 */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2 */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_L2",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -522,7 +522,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x7,
@@ -536,7 +536,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_OTAG",
         .match        = 0x4,
         .match_mask   = 0x4,
@@ -550,7 +550,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP",
         .match        = 0x20,
         .match_mask   = 0x66,
@@ -564,7 +564,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -578,7 +578,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP",
         .match        = 0x40,
         .match_mask   = 0x66,
@@ -592,7 +592,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4 */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4",
         .match        = 0x8,
         .match_mask   = 0x18,
@@ -606,7 +606,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6 */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6",
         .match        = 0x10,
         .match_mask   = 0x18,
@@ -620,7 +620,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x7f,
@@ -634,7 +634,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP",
         .match        = 0x2,
         .match_mask   = 0x6,
@@ -648,7 +648,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x4,
         .match_mask   = 0x6,
@@ -662,7 +662,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x24,
         .match_mask   = 0x66,
@@ -676,7 +676,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP",
         .match        = 0x6,
         .match_mask   = 0x6,
@@ -690,7 +690,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3",
         .match        = 0x18,
         .match_mask   = 0x18,
@@ -704,7 +704,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x60,
         .match_mask   = 0x60,
@@ -718,7 +718,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x46,
         .match_mask   = 0x66,
@@ -732,7 +732,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN",
         .match        = 0x26,
         .match_mask   = 0x66,
@@ -746,7 +746,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG */
         .name         = "INGRESS_PKT_INNER_L2_HDR_ITAG",
         .match        = 0x2,
         .match_mask   = 0x2,
@@ -760,11 +760,11 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
         .zone_minbit  = 10,
         .arc_id_mask  = 0xc00,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_itag,
+        .zone_bmp = bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_itag,
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2 */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2 */
         .name         = "INGRESS_PKT_INNER_L2_HDR_L2",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -778,11 +778,11 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
         .zone_minbit  = 10,
         .arc_id_mask  = 0xc00,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_l2,
+        .zone_bmp = bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_l2,
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE */
         .name         = "INGRESS_PKT_INNER_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x7,
@@ -798,7 +798,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG */
         .name         = "INGRESS_PKT_INNER_L2_HDR_OTAG",
         .match        = 0x4,
         .match_mask   = 0x4,
@@ -812,11 +812,11 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
         .zone_minbit  = 10,
         .arc_id_mask  = 0xc00,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_otag,
+        .zone_bmp = bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_otag,
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ARP",
         .match        = 0x20,
         .match_mask   = 0x66,
@@ -830,11 +830,11 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
         .zone_minbit  = 12,
         .arc_id_mask  = 0x1f000,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_arp,
+        .zone_bmp = bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_arp,
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -848,11 +848,11 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
         .zone_minbit  = 12,
         .arc_id_mask  = 0x1f000,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ethertype,
+        .zone_bmp = bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ethertype,
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ICMP",
         .match        = 0x40,
         .match_mask   = 0x66,
@@ -866,11 +866,11 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
         .zone_minbit  = 12,
         .arc_id_mask  = 0x1f000,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_icmp,
+        .zone_bmp = bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_icmp,
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4 */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_IPV4",
         .match        = 0x8,
         .match_mask   = 0x18,
@@ -884,11 +884,11 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
         .zone_minbit  = 12,
         .arc_id_mask  = 0x1f000,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ipv4,
+        .zone_bmp = bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ipv4,
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6 */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_IPV6",
         .match        = 0x10,
         .match_mask   = 0x18,
@@ -902,11 +902,11 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
         .zone_minbit  = 12,
         .arc_id_mask  = 0x1f000,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ipv6,
+        .zone_bmp = bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ipv6,
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x7f,
@@ -922,7 +922,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_RARP",
         .match        = 0x2,
         .match_mask   = 0x6,
@@ -936,11 +936,11 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
         .zone_minbit  = 12,
         .arc_id_mask  = 0x1f000,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rarp,
+        .zone_bmp = bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rarp,
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x4,
         .match_mask   = 0x6,
@@ -954,11 +954,11 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
         .zone_minbit  = 12,
         .arc_id_mask  = 0x1f000,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_tcp_first_4bytes,
+        .zone_bmp = bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_tcp_first_4bytes,
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x24,
         .match_mask   = 0x66,
@@ -972,11 +972,11 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
         .zone_minbit  = 12,
         .arc_id_mask  = 0x1f000,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_tcp_last_16bytes,
+        .zone_bmp = bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_tcp_last_16bytes,
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UDP",
         .match        = 0x6,
         .match_mask   = 0x6,
@@ -990,11 +990,11 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
         .zone_minbit  = 12,
         .arc_id_mask  = 0x1f000,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_udp,
+        .zone_bmp = bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_udp,
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3",
         .match        = 0x18,
         .match_mask   = 0x18,
@@ -1008,11 +1008,11 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
         .zone_minbit  = 12,
         .arc_id_mask  = 0x1f000,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l3,
+        .zone_bmp = bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l3,
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x60,
         .match_mask   = 0x60,
@@ -1026,11 +1026,11 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
         .zone_minbit  = 12,
         .arc_id_mask  = 0x1f000,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l4,
+        .zone_bmp = bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l4,
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x46,
         .match_mask   = 0x66,
@@ -1044,11 +1044,11 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
         .zone_minbit  = 12,
         .arc_id_mask  = 0x1f000,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l5,
+        .zone_bmp = bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l5,
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_ITAG",
         .match        = 0x2,
         .match_mask   = 0x2,
@@ -1062,11 +1062,11 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
         .zone_minbit  = 2,
         .arc_id_mask  = 0x1c,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_itag,
+        .zone_bmp = bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_itag,
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2 */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2 */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_L2",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -1080,11 +1080,11 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
         .zone_minbit  = 2,
         .arc_id_mask  = 0x1c,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_l2,
+        .zone_bmp = bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_l2,
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x7,
@@ -1100,7 +1100,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_OTAG",
         .match        = 0x4,
         .match_mask   = 0x4,
@@ -1114,11 +1114,11 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
         .zone_minbit  = 2,
         .arc_id_mask  = 0x1c,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_otag,
+        .zone_bmp = bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_otag,
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ARP",
         .match        = 0x20,
         .match_mask   = 0x66,
@@ -1132,11 +1132,11 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
         .zone_minbit  = 5,
         .arc_id_mask  = 0x3e0,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_arp,
+        .zone_bmp = bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_arp,
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -1150,11 +1150,11 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
         .zone_minbit  = 5,
         .arc_id_mask  = 0x3e0,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ethertype,
+        .zone_bmp = bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ethertype,
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ICMP",
         .match        = 0x40,
         .match_mask   = 0x66,
@@ -1168,11 +1168,11 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
         .zone_minbit  = 5,
         .arc_id_mask  = 0x3e0,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_icmp,
+        .zone_bmp = bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_icmp,
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4 */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IPV4",
         .match        = 0x8,
         .match_mask   = 0x18,
@@ -1186,11 +1186,11 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
         .zone_minbit  = 5,
         .arc_id_mask  = 0x3e0,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ipv4,
+        .zone_bmp = bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ipv4,
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6 */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IPV6",
         .match        = 0x10,
         .match_mask   = 0x18,
@@ -1204,11 +1204,11 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
         .zone_minbit  = 5,
         .arc_id_mask  = 0x3e0,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ipv6,
+        .zone_bmp = bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ipv6,
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x7f,
@@ -1224,7 +1224,7 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_RARP",
         .match        = 0x2,
         .match_mask   = 0x6,
@@ -1238,11 +1238,11 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
         .zone_minbit  = 5,
         .arc_id_mask  = 0x3e0,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rarp,
+        .zone_bmp = bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rarp,
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x4,
         .match_mask   = 0x6,
@@ -1256,11 +1256,11 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
         .zone_minbit  = 5,
         .arc_id_mask  = 0x3e0,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_tcp_first_4bytes,
+        .zone_bmp = bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_tcp_first_4bytes,
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x24,
         .match_mask   = 0x66,
@@ -1274,11 +1274,11 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
         .zone_minbit  = 5,
         .arc_id_mask  = 0x3e0,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_tcp_last_16bytes,
+        .zone_bmp = bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_tcp_last_16bytes,
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UDP",
         .match        = 0x6,
         .match_mask   = 0x6,
@@ -1292,11 +1292,11 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
         .zone_minbit  = 5,
         .arc_id_mask  = 0x3e0,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_udp,
+        .zone_bmp = bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_udp,
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3",
         .match        = 0x18,
         .match_mask   = 0x18,
@@ -1310,11 +1310,11 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
         .zone_minbit  = 5,
         .arc_id_mask  = 0x3e0,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l3,
+        .zone_bmp = bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l3,
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x60,
         .match_mask   = 0x60,
@@ -1328,11 +1328,11 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
         .zone_minbit  = 5,
         .arc_id_mask  = 0x3e0,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l4,
+        .zone_bmp = bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l4,
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x46,
         .match_mask   = 0x66,
@@ -1346,11 +1346,11 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
         .zone_minbit  = 5,
         .arc_id_mask  = 0x3e0,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l5,
+        .zone_bmp = bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l5,
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN",
         .match        = 0x26,
         .match_mask   = 0x66,
@@ -1364,11 +1364,11 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
         .zone_minbit  = 5,
         .arc_id_mask  = 0x3e0,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_vxlan,
+        .zone_bmp = bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_vxlan,
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH */
         .name         = "INGRESS_PKT_SYS_HDR_EP_NIH",
         .match        = 0x2,
         .match_mask   = 0x3,
@@ -1382,11 +1382,11 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
         .zone_minbit  = 0,
         .arc_id_mask  = 0x3,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_sys_hdr_ep_nih,
+        .zone_bmp = bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_sys_hdr_ep_nih,
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK */
         .name         = "INGRESS_PKT_SYS_HDR_LOOPBACK",
         .match        = 0x1,
         .match_mask   = 0x3,
@@ -1400,11 +1400,11 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
         .zone_minbit  = 0,
         .arc_id_mask  = 0x3,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_cna_6_5_30_2_0_rxpmd_arc_ingress_pkt_sys_hdr_loopback,
+        .zone_bmp = bcm56890_a0_cna_6_5_31_3_0_rxpmd_arc_ingress_pkt_sys_hdr_loopback,
 
     },
     {
-        /* BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE */
+        /* BCM56890_A0_CNA_6_5_31_3_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE */
         .name         = "INGRESS_PKT_SYS_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3,
@@ -1421,23 +1421,23 @@ bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db[BCM56890_A0_CNA_6_5_30_2_0_RXPMD_MA
     },
 };
 
-static bcmpkt_rxpmd_match_id_db_info_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db_info = {
+static bcmpkt_rxpmd_match_id_db_info_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_match_id_db_info = {
     .num_entries = 77,
-    .db = bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db
+    .db = bcm56890_a0_cna_6_5_31_3_0_rxpmd_match_id_db
 };
-bcmpkt_rxpmd_match_id_db_info_t * bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db_info_get(void) {
-    return &bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_db_info;
+bcmpkt_rxpmd_match_id_db_info_t * bcm56890_a0_cna_6_5_31_3_0_rxpmd_match_id_db_info_get(void) {
+    return &bcm56890_a0_cna_6_5_31_3_0_rxpmd_match_id_db_info;
 }
 
-static shr_enum_map_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_map[] = {
-    BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT
+static shr_enum_map_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_match_id_map[] = {
+    BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_rxpmd_match_id_map_info_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_map_info = {
+static bcmpkt_rxpmd_match_id_map_info_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_match_id_map_info = {
     .num_entries = 77,
-    .map = bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_map
+    .map = bcm56890_a0_cna_6_5_31_3_0_rxpmd_match_id_map
 };
 
-bcmpkt_rxpmd_match_id_map_info_t * bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_map_info_get(void) {
-    return &bcm56890_a0_cna_6_5_30_2_0_rxpmd_match_id_map_info;
+bcmpkt_rxpmd_match_id_map_info_t * bcm56890_a0_cna_6_5_31_3_0_rxpmd_match_id_map_info_get(void) {
+    return &bcm56890_a0_cna_6_5_31_3_0_rxpmd_match_id_map_info;
 }
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_pkt_flexhdr.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_pkt_flexhdr.c
similarity index 74%
rename from platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_pkt_flexhdr.c
rename to platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_pkt_flexhdr.c
index 93a8aa7726a5..254f825fd768 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_pkt_flexhdr.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_pkt_flexhdr.c
@@ -3,7 +3,7 @@
  * DO NOT EDIT THIS FILE!
  * This file is auto-generated by xfc_map_parser
  * from the NPL output file(s) map.yml
- * for device bcm56890_a0 and variant cna_6_5_30_2_0.
+ * for device bcm56890_a0 and variant cna_6_5_31_3_0.
  * Edits to this file will be lost when it is regenerated.
  *
  * $Id: $
@@ -31,516 +31,444 @@
 #include <shr/shr_error.h>
 #include <bcmpkt/bcmpkt_flexhdr.h>
 #include <bcmpkt/chip/bcm56890_a0/bcmpkt_bcm56890_a0_rxpmd.h>
-#include <bcmpkt/xfcr/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_bcmpkt_flexhdr.h>
-#include <bcmpkt/xfcr/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_bcmpkt_flexhdr_data.h>
-#include <bcmpkt/xfcr/bcm56890_a0/cna_6_5_30_2_0/bcm56890_a0_cna_6_5_30_2_0_bcmpkt_rxpmd_flex_data.h>
+#include <bcmpkt/xfcr/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_bcmpkt_flexhdr.h>
+#include <bcmpkt/xfcr/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_bcmpkt_flexhdr_data.h>
+#include <bcmpkt/xfcr/bcm56890_a0/cna_6_5_31_3_0/bcm56890_a0_cna_6_5_31_3_0_bcmpkt_rxpmd_flex_data.h>
 
 #define MASK(_bn) (((uint32_t)0x1<<(_bn))-1)
 #define WORD_FIELD_GET(_d,_s,_l) (((_d) >> (_s)) & MASK(_l))
 #define WORD_FIELD_SET(_d,_s,_l,_v) (_d)=(((_d) & ~(MASK(_l) << (_s))) | (((_v) & MASK(_l)) << (_s)))
 #define WORD_FIELD_MASK(_d,_s,_l) (_d)=((_d) | (MASK(_l) << (_s)))
 
-static void bcm56890_a0_cna_6_5_30_2_0_rxpmd_flex_reason_decode(uint32_t *data, bcmpkt_bitmap_t *reasons)
+static void bcm56890_a0_cna_6_5_31_3_0_rxpmd_flex_reason_decode(uint32_t *data, bcmpkt_bitmap_t *reasons)
 {
     uint32_t *reason = data + 0;
 
     if (reason[13] & (0x1 << 0)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU);
     }
     if (reason[13] & (0x1 << 1)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS);
     }
     if (reason[13] & (0x1 << 2)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE);
     }
     if (reason[13] & (0x1 << 3)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_DISCARD);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_DISCARD);
     }
     if (reason[13] & (0x1 << 4)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST);
     }
     if (reason[13] & (0x1 << 5)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED);
     }
     if (reason[13] & (0x1 << 6)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT);
     }
     if (reason[13] & (0x1 << 7)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED);
     }
     if (reason[13] & (0x1 << 8)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED);
     }
     if (reason[13] & (0x1 << 9)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS);
     }
     if (reason[13] & (0x1 << 10)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP);
     }
     if (reason[13] & (0x1 << 11)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS);
     }
     if (reason[13] & (0x1 << 12)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP);
     }
     if (reason[13] & (0x1 << 13)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR);
     }
     if (reason[13] & (0x1 << 14)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR);
     }
     if (reason[13] & (0x1 << 16)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL);
     }
     if (reason[13] & (0x1 << 17)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_VFP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_VFP);
     }
     if (reason[13] & (0x1 << 18)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IFP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP);
     }
     if (reason[13] & (0x1 << 19)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER);
     }
     if (reason[13] & (0x1 << 23)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT);
     }
     if (reason[12] & (0x1 << 15)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP);
     }
 }
 
-static void bcm56890_a0_cna_6_5_30_2_0_rxpmd_flex_reason_encode(bcmpkt_bitmap_t *reasons, uint32_t *data)
+static void bcm56890_a0_cna_6_5_31_3_0_rxpmd_flex_reason_encode(bcmpkt_bitmap_t *reasons, uint32_t *data)
 {
     uint32_t *reason = data + 0;
 
     reason[13] = 0;
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU)) {
         reason[13] |= (0x1 << 0);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS)) {
         reason[13] |= (0x1 << 1);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE)) {
         reason[13] |= (0x1 << 2);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_DISCARD)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_DISCARD)) {
         reason[13] |= (0x1 << 3);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST)) {
         reason[13] |= (0x1 << 4);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED)) {
         reason[13] |= (0x1 << 5);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT)) {
         reason[13] |= (0x1 << 6);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED)) {
         reason[13] |= (0x1 << 7);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED)) {
         reason[13] |= (0x1 << 8);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS)) {
         reason[13] |= (0x1 << 9);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP)) {
         reason[13] |= (0x1 << 10);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS)) {
         reason[13] |= (0x1 << 11);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP)) {
         reason[13] |= (0x1 << 12);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR)) {
         reason[13] |= (0x1 << 13);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR)) {
         reason[13] |= (0x1 << 14);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL)) {
         reason[13] |= (0x1 << 16);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_VFP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_VFP)) {
         reason[13] |= (0x1 << 17);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IFP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP)) {
         reason[13] |= (0x1 << 18);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER)) {
         reason[13] |= (0x1 << 19);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT)) {
         reason[13] |= (0x1 << 23);
     }
     reason[12] = 0;
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP)) {
         reason[12] |= (0x1 << 15);
     }
 }
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_flex_field_data[] = {
+static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_flex_field_data[] = {
     {
         .name = "DROP_CODE_15_0",
-        .fid = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0,
+        .fid = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 48, 63 }, /* Profile 2. */
             { -1, -1 }, /* Profile 3. */
             { 48, 63 }, /* Profile 4. */
-            { 48, 63 }, /* Profile 5. */
-            { -1, -1 }, /* Profile 6. */
-            { 48, 63 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "DVP_15_0",
-        .fid = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_DVP_15_0,
+        .fid = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_DVP_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 128, 143 }, /* Profile 2. */
             { 112, 127 }, /* Profile 3. */
             { 128, 143 }, /* Profile 4. */
-            { 112, 127 }, /* Profile 5. */
-            { 96, 111 }, /* Profile 6. */
-            { 112, 127 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "EFFECTIVE_TTL_7_0",
-        .fid = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_7_0,
+        .fid = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_7_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 336, 343 }, /* Profile 2. */
             { 336, 343 }, /* Profile 3. */
             { 336, 343 }, /* Profile 4. */
-            { 304, 311 }, /* Profile 5. */
-            { 304, 311 }, /* Profile 6. */
-            { 304, 311 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "ENTROPY_LABEL_HIGH_3_0",
-        .fid = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_HIGH_3_0,
+        .fid = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_HIGH_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 400, 403 }, /* Profile 2. */
             { 400, 403 }, /* Profile 3. */
             { 400, 403 }, /* Profile 4. */
-            { 368, 371 }, /* Profile 5. */
-            { 368, 371 }, /* Profile 6. */
-            { 368, 371 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "ENTROPY_LABEL_LOW_15_0",
-        .fid = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0,
+        .fid = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 368, 383 }, /* Profile 2. */
             { 368, 383 }, /* Profile 3. */
             { 368, 383 }, /* Profile 4. */
-            { 336, 351 }, /* Profile 5. */
-            { 336, 351 }, /* Profile 6. */
-            { 336, 351 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "EP_NIH_HDR_DROP_CODE_15_0",
-        .fid = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_DROP_CODE_15_0,
+        .fid = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_DROP_CODE_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { -1, -1 }, /* Profile 2. */
             { 176, 191 }, /* Profile 3. */
-            { -1, -1 }, /* Profile 4. */
-            { -1, -1 }, /* Profile 5. */
-            { 144, 159 }, /* Profile 6. */
         },
-        .profile_cnt = 7,
+        .profile_cnt = 4,
     },
     {
         .name = "EP_NIH_HDR_RECIRC_CODE_3_0",
-        .fid = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_RECIRC_CODE_3_0,
+        .fid = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_RECIRC_CODE_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 388, 391 }, /* Profile 2. */
             { 388, 391 }, /* Profile 3. */
             { 388, 391 }, /* Profile 4. */
-            { 356, 359 }, /* Profile 5. */
-            { 356, 359 }, /* Profile 6. */
-            { 356, 359 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "EP_NIH_HDR_TIMESTAMP_15_0",
-        .fid = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_15_0,
+        .fid = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 144, 159 }, /* Profile 2. */
             { 128, 143 }, /* Profile 3. */
-            { -1, -1 }, /* Profile 4. */
-            { 128, 143 }, /* Profile 5. */
-            { 112, 127 }, /* Profile 6. */
         },
-        .profile_cnt = 7,
+        .profile_cnt = 4,
     },
     {
         .name = "EP_NIH_HDR_TIMESTAMP_31_16",
-        .fid = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_31_16,
+        .fid = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_31_16,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 160, 175 }, /* Profile 2. */
             { 144, 159 }, /* Profile 3. */
-            { -1, -1 }, /* Profile 4. */
-            { 144, 159 }, /* Profile 5. */
-            { 128, 143 }, /* Profile 6. */
         },
-        .profile_cnt = 7,
+        .profile_cnt = 4,
     },
     {
         .name = "ERSPAN3_GBP_SID_15_0",
-        .fid = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_ERSPAN3_GBP_SID_15_0,
+        .fid = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_ERSPAN3_GBP_SID_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 352, 367 }, /* Profile 2. */
             { 352, 367 }, /* Profile 3. */
             { 352, 367 }, /* Profile 4. */
-            { 320, 335 }, /* Profile 5. */
-            { 320, 335 }, /* Profile 6. */
-            { 320, 335 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "EVENT_TRACE_VECTOR_15_0",
-        .fid = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_15_0,
+        .fid = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 0, 15 }, /* Profile 2. */
             { 0, 15 }, /* Profile 3. */
             { 0, 15 }, /* Profile 4. */
-            { 0, 15 }, /* Profile 5. */
-            { 0, 15 }, /* Profile 6. */
-            { 0, 15 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "EVENT_TRACE_VECTOR_31_16",
-        .fid = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_16,
+        .fid = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_16,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 16, 31 }, /* Profile 2. */
             { 16, 31 }, /* Profile 3. */
             { 16, 31 }, /* Profile 4. */
-            { 16, 31 }, /* Profile 5. */
-            { 16, 31 }, /* Profile 6. */
-            { 16, 31 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "EVENT_TRACE_VECTOR_47_32",
-        .fid = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32,
+        .fid = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 32, 47 }, /* Profile 2. */
             { 32, 47 }, /* Profile 3. */
             { 32, 47 }, /* Profile 4. */
-            { 32, 47 }, /* Profile 5. */
-            { 32, 47 }, /* Profile 6. */
-            { 32, 47 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "I2E_CLASS_ID_15_0",
-        .fid = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0,
+        .fid = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 208, 223 }, /* Profile 2. */
-            { 208, 223 }, /* Profile 3. */
-            { 208, 223 }, /* Profile 4. */
-            { 176, 191 }, /* Profile 5. */
-            { 176, 191 }, /* Profile 6. */
-            { 176, 191 }, /* Profile 7. */
+            { 192, 207 }, /* Profile 2. */
+            { 192, 207 }, /* Profile 3. */
+            { 192, 207 }, /* Profile 4. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "ING_TIMESTAMP_15_0",
-        .fid = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_15_0,
+        .fid = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { -1, -1 }, /* Profile 2. */
             { -1, -1 }, /* Profile 3. */
             { 144, 159 }, /* Profile 4. */
-            { -1, -1 }, /* Profile 5. */
-            { -1, -1 }, /* Profile 6. */
-            { 128, 143 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "ING_TIMESTAMP_31_16",
-        .fid = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_16,
+        .fid = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_16,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { -1, -1 }, /* Profile 2. */
             { -1, -1 }, /* Profile 3. */
             { 160, 175 }, /* Profile 4. */
-            { -1, -1 }, /* Profile 5. */
-            { -1, -1 }, /* Profile 6. */
-            { 144, 159 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "INGRESS_PP_PORT_8_0",
-        .fid = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_INGRESS_PP_PORT_8_0,
+        .fid = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_INGRESS_PP_PORT_8_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 272, 280 }, /* Profile 2. */
             { 272, 280 }, /* Profile 3. */
             { 272, 280 }, /* Profile 4. */
-            { 240, 248 }, /* Profile 5. */
-            { 240, 248 }, /* Profile 6. */
-            { 240, 248 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0",
-        .fid = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0,
+        .fid = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 224, 239 }, /* Profile 2. */
-            { 224, 239 }, /* Profile 3. */
-            { 224, 239 }, /* Profile 4. */
-            { 192, 207 }, /* Profile 5. */
-            { 192, 207 }, /* Profile 6. */
-            { 192, 207 }, /* Profile 7. */
+            { 208, 223 }, /* Profile 2. */
+            { 208, 223 }, /* Profile 3. */
+            { 208, 223 }, /* Profile 4. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "INGRESS_QOS_REMARK_CTRL_3_0",
-        .fid = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0,
+        .fid = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 408, 411 }, /* Profile 2. */
             { 408, 411 }, /* Profile 3. */
             { 408, 411 }, /* Profile 4. */
-            { 376, 379 }, /* Profile 5. */
-            { 376, 379 }, /* Profile 6. */
-            { 376, 379 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "INT_PRI_3_0",
-        .fid = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_INT_PRI_3_0,
+        .fid = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_INT_PRI_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 416, 419 }, /* Profile 2. */
             { 416, 419 }, /* Profile 3. */
             { 416, 419 }, /* Profile 4. */
-            { 384, 387 }, /* Profile 5. */
-            { 384, 387 }, /* Profile 6. */
-            { 384, 387 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "L2_IIF_10_0",
-        .fid = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_L2_IIF_10_0,
+        .fid = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_L2_IIF_10_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 192, 202 }, /* Profile 2. */
-            { 192, 202 }, /* Profile 3. */
-            { 192, 202 }, /* Profile 4. */
-            { 160, 170 }, /* Profile 5. */
-            { 160, 170 }, /* Profile 6. */
-            { 160, 170 }, /* Profile 7. */
+            { 224, 234 }, /* Profile 2. */
+            { 224, 234 }, /* Profile 3. */
+            { 224, 234 }, /* Profile 4. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "L2_OIF_10_0",
-        .fid = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_L2_OIF_10_0,
+        .fid = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_L2_OIF_10_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 96, 106 }, /* Profile 2. */
             { 80, 90 }, /* Profile 3. */
             { 96, 106 }, /* Profile 4. */
-            { 96, 106 }, /* Profile 5. */
-            { 80, 90 }, /* Profile 6. */
-            { 96, 106 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "L2_TUNNEL_SVP_15_0",
-        .fid = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_L2_TUNNEL_SVP_15_0,
+        .fid = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_L2_TUNNEL_SVP_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 240, 255 }, /* Profile 2. */
             { 240, 255 }, /* Profile 3. */
             { 240, 255 }, /* Profile 4. */
-            { 208, 223 }, /* Profile 5. */
-            { 208, 223 }, /* Profile 6. */
-            { 208, 223 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "L3_IIF_13_0",
-        .fid = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_L3_IIF_13_0,
+        .fid = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_L3_IIF_13_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 256, 269 }, /* Profile 2. */
             { 256, 269 }, /* Profile 3. */
             { 256, 269 }, /* Profile 4. */
-            { 224, 237 }, /* Profile 5. */
-            { 224, 237 }, /* Profile 6. */
-            { 224, 237 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "L3_OIF_1_13_0",
-        .fid = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0,
+        .fid = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -552,22 +480,19 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_flex_field_
     },
     {
         .name = "NHOP_2_OR_ECMP_GROUP_INDEX_1_14_0",
-        .fid = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_14_0,
+        .fid = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_14_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 304, 318 }, /* Profile 2. */
             { 304, 318 }, /* Profile 3. */
             { 304, 318 }, /* Profile 4. */
-            { 272, 286 }, /* Profile 5. */
-            { 272, 286 }, /* Profile 6. */
-            { 272, 286 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "NHOP_INDEX_1_14_0",
-        .fid = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_14_0,
+        .fid = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_14_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -579,153 +504,130 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_flex_field_
     },
     {
         .name = "PARSER_VHLEN_0_15_0",
-        .fid = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0,
+        .fid = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 64, 79 }, /* Profile 2. */
             { 48, 63 }, /* Profile 3. */
             { 64, 79 }, /* Profile 4. */
-            { 64, 79 }, /* Profile 5. */
-            { 48, 63 }, /* Profile 6. */
-            { 64, 79 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "PKT_MISC_CTRL_0_3_0",
-        .fid = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0,
+        .fid = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 404, 407 }, /* Profile 2. */
             { 404, 407 }, /* Profile 3. */
             { 404, 407 }, /* Profile 4. */
-            { 372, 375 }, /* Profile 5. */
-            { 372, 375 }, /* Profile 6. */
-            { 372, 375 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "SVP_NETWORK_GROUP_BITMAP_3_0",
-        .fid = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0,
+        .fid = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 392, 395 }, /* Profile 2. */
             { 392, 395 }, /* Profile 3. */
             { 392, 395 }, /* Profile 4. */
-            { 360, 363 }, /* Profile 5. */
-            { 360, 363 }, /* Profile 6. */
-            { 360, 363 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "SYSTEM_DESTINATION_15_0",
-        .fid = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0,
+        .fid = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 320, 335 }, /* Profile 2. */
             { 320, 335 }, /* Profile 3. */
             { 320, 335 }, /* Profile 4. */
-            { 288, 303 }, /* Profile 5. */
-            { 288, 303 }, /* Profile 6. */
-            { 288, 303 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "SYSTEM_OPCODE_3_0",
-        .fid = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0,
+        .fid = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 396, 399 }, /* Profile 2. */
             { 396, 399 }, /* Profile 3. */
             { 396, 399 }, /* Profile 4. */
-            { 364, 367 }, /* Profile 5. */
-            { 364, 367 }, /* Profile 6. */
-            { 364, 367 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "SYSTEM_SOURCE_15_0",
-        .fid = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_SYSTEM_SOURCE_15_0,
+        .fid = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_SYSTEM_SOURCE_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 288, 303 }, /* Profile 2. */
             { 288, 303 }, /* Profile 3. */
             { 288, 303 }, /* Profile 4. */
-            { 256, 271 }, /* Profile 5. */
-            { 256, 271 }, /* Profile 6. */
-            { 256, 271 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "TAG_ACTION_CTRL_1_0",
-        .fid = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_TAG_ACTION_CTRL_1_0,
+        .fid = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_TAG_ACTION_CTRL_1_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 412, 413 }, /* Profile 2. */
             { 412, 413 }, /* Profile 3. */
             { 412, 413 }, /* Profile 4. */
-            { 380, 381 }, /* Profile 5. */
-            { 380, 381 }, /* Profile 6. */
-            { 380, 381 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "TUNNEL_PROCESSING_RESULTS_1_3_0",
-        .fid = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0,
+        .fid = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 384, 387 }, /* Profile 2. */
             { 384, 387 }, /* Profile 3. */
             { 384, 387 }, /* Profile 4. */
-            { 352, 355 }, /* Profile 5. */
-            { 352, 355 }, /* Profile 6. */
-            { 352, 355 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
     {
         .name = "VFI_15_0",
-        .fid = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_VFI_15_0,
+        .fid = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_VFI_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 80, 95 }, /* Profile 2. */
             { 64, 79 }, /* Profile 3. */
             { 80, 95 }, /* Profile 4. */
-            { 80, 95 }, /* Profile 5. */
-            { 64, 79 }, /* Profile 6. */
-            { 80, 95 }, /* Profile 7. */
         },
-        .profile_cnt = 8,
+        .profile_cnt = 5,
     },
-};static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_flex_field_info = {
-    .num_fields = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_FID_COUNT,
-    .info = bcm56890_a0_cna_6_5_30_2_0_rxpmd_flex_field_data,
+};
+static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_flex_field_info = {
+    .num_fields = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_FID_COUNT,
+    .info = bcm56890_a0_cna_6_5_31_3_0_rxpmd_flex_field_data,
+    .profile_bmp_cnt = 1,
+    .profile_bmp[0] = 0x1c,
+
 };
 
-static shr_enum_map_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_flex_reason_names[] = {
-    BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT
+static shr_enum_map_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_flex_reason_names[] = {
+    BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_reasons_info_t bcm56890_a0_cna_6_5_30_2_0_rxpmd_flex_reasons_info = {
-    .num_reasons = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RXPMD_FLEX_REASON_COUNT,
-    .reason_names = bcm56890_a0_cna_6_5_30_2_0_rxpmd_flex_reason_names,
-    .reason_encode = bcm56890_a0_cna_6_5_30_2_0_rxpmd_flex_reason_encode,
-    .reason_decode = bcm56890_a0_cna_6_5_30_2_0_rxpmd_flex_reason_decode,
+static bcmpkt_flex_reasons_info_t bcm56890_a0_cna_6_5_31_3_0_rxpmd_flex_reasons_info = {
+    .num_reasons = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RXPMD_FLEX_REASON_COUNT,
+    .reason_names = bcm56890_a0_cna_6_5_31_3_0_rxpmd_flex_reason_names,
+    .reason_encode = bcm56890_a0_cna_6_5_31_3_0_rxpmd_flex_reason_encode,
+    .reason_decode = bcm56890_a0_cna_6_5_31_3_0_rxpmd_flex_reason_decode,
 };
 
 
@@ -868,7 +770,7 @@ static int32_t bcmpkt_arp_t_target_ip_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_arp_t_fget[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_31_3_0_arp_t_fget[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_FID_COUNT] = {
     bcmpkt_arp_t_hardware_len_get,
     bcmpkt_arp_t_hardware_type_get,
     bcmpkt_arp_t_operation_get,
@@ -880,7 +782,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_arp_t_fget[BCM56890_A0_CNA_6_
     bcmpkt_arp_t_target_ip_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_arp_t_fset[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_31_3_0_arp_t_fset[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_FID_COUNT] = {
     bcmpkt_arp_t_hardware_len_set,
     bcmpkt_arp_t_hardware_type_set,
     bcmpkt_arp_t_operation_set,
@@ -892,13 +794,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_arp_t_fset[BCM56890_A0_CNA_6_
     bcmpkt_arp_t_target_ip_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_30_2_0_arp_t_field_data[] = {
-    BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_31_3_0_arp_t_field_data[] = {
+    BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_30_2_0_arp_t_field_info = {
-    .num_fields = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ARP_T_FID_COUNT,
-    .info = bcm56890_a0_cna_6_5_30_2_0_arp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_31_3_0_arp_t_field_info = {
+    .num_fields = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ARP_T_FID_COUNT,
+    .info = bcm56890_a0_cna_6_5_31_3_0_arp_t_field_data,
 };
 
 
@@ -1014,7 +916,7 @@ static int32_t bcmpkt_cpu_composites_0_t_dma_cont6_set(uint32_t *data, int profi
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_cpu_composites_0_t_fget[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_31_3_0_cpu_composites_0_t_fget[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
     bcmpkt_cpu_composites_0_t_dma_cont0_get,
     bcmpkt_cpu_composites_0_t_dma_cont1_get,
     bcmpkt_cpu_composites_0_t_dma_cont2_get,
@@ -1024,7 +926,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_cpu_composites_0_t_fget[BCM56
     bcmpkt_cpu_composites_0_t_dma_cont6_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_cpu_composites_0_t_fset[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_31_3_0_cpu_composites_0_t_fset[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
     bcmpkt_cpu_composites_0_t_dma_cont0_set,
     bcmpkt_cpu_composites_0_t_dma_cont1_set,
     bcmpkt_cpu_composites_0_t_dma_cont2_set,
@@ -1034,13 +936,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_cpu_composites_0_t_fset[BCM56
     bcmpkt_cpu_composites_0_t_dma_cont6_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_30_2_0_cpu_composites_0_t_field_data[] = {
-    BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_31_3_0_cpu_composites_0_t_field_data[] = {
+    BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_30_2_0_cpu_composites_0_t_field_info = {
-    .num_fields = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT,
-    .info = bcm56890_a0_cna_6_5_30_2_0_cpu_composites_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_31_3_0_cpu_composites_0_t_field_info = {
+    .num_fields = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT,
+    .info = bcm56890_a0_cna_6_5_31_3_0_cpu_composites_0_t_field_data,
 };
 
 
@@ -1220,7 +1122,7 @@ static int32_t bcmpkt_cpu_composites_1_t_dma_cont9_set(uint32_t *data, int profi
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_cpu_composites_1_t_fget[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_31_3_0_cpu_composites_1_t_fget[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
     bcmpkt_cpu_composites_1_t_dma_cont10_get,
     bcmpkt_cpu_composites_1_t_dma_cont11_get,
     bcmpkt_cpu_composites_1_t_dma_cont12_get,
@@ -1234,7 +1136,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_cpu_composites_1_t_fget[BCM56
     bcmpkt_cpu_composites_1_t_dma_cont9_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_cpu_composites_1_t_fset[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_31_3_0_cpu_composites_1_t_fset[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
     bcmpkt_cpu_composites_1_t_dma_cont10_set,
     bcmpkt_cpu_composites_1_t_dma_cont11_set,
     bcmpkt_cpu_composites_1_t_dma_cont12_set,
@@ -1248,13 +1150,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_cpu_composites_1_t_fset[BCM56
     bcmpkt_cpu_composites_1_t_dma_cont9_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_30_2_0_cpu_composites_1_t_field_data[] = {
-    BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_31_3_0_cpu_composites_1_t_field_data[] = {
+    BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_30_2_0_cpu_composites_1_t_field_info = {
-    .num_fields = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT,
-    .info = bcm56890_a0_cna_6_5_30_2_0_cpu_composites_1_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_31_3_0_cpu_composites_1_t_field_info = {
+    .num_fields = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT,
+    .info = bcm56890_a0_cna_6_5_31_3_0_cpu_composites_1_t_field_data,
 };
 
 
@@ -1440,7 +1342,7 @@ static int32_t bcmpkt_ep_nih_header_t_timestamp_set(uint32_t *data, int profile,
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_ep_nih_header_t_fget[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_31_3_0_ep_nih_header_t_fget[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT] = {
     bcmpkt_ep_nih_header_t_header_subtype_get,
     bcmpkt_ep_nih_header_t_header_type_get,
     bcmpkt_ep_nih_header_t_opaque_ctrl_a_get,
@@ -1455,7 +1357,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_ep_nih_header_t_fget[BCM56890
     bcmpkt_ep_nih_header_t_timestamp_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_ep_nih_header_t_fset[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_31_3_0_ep_nih_header_t_fset[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT] = {
     bcmpkt_ep_nih_header_t_header_subtype_set,
     bcmpkt_ep_nih_header_t_header_type_set,
     bcmpkt_ep_nih_header_t_opaque_ctrl_a_set,
@@ -1470,13 +1372,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_ep_nih_header_t_fset[BCM56890
     bcmpkt_ep_nih_header_t_timestamp_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_30_2_0_ep_nih_header_t_field_data[] = {
-    BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_31_3_0_ep_nih_header_t_field_data[] = {
+    BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_30_2_0_ep_nih_header_t_field_info = {
-    .num_fields = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT,
-    .info = bcm56890_a0_cna_6_5_30_2_0_ep_nih_header_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_31_3_0_ep_nih_header_t_field_info = {
+    .num_fields = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT,
+    .info = bcm56890_a0_cna_6_5_31_3_0_ep_nih_header_t_field_data,
 };
 
 
@@ -1616,7 +1518,7 @@ static int32_t bcmpkt_erspan3_fixed_hdr_t_vlan_set(uint32_t *data, int profile,
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_erspan3_fixed_hdr_t_fget[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_31_3_0_erspan3_fixed_hdr_t_fget[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
     bcmpkt_erspan3_fixed_hdr_t_bso_get,
     bcmpkt_erspan3_fixed_hdr_t_cos_get,
     bcmpkt_erspan3_fixed_hdr_t_gbp_sid_get,
@@ -1628,7 +1530,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_erspan3_fixed_hdr_t_fget[BCM5
     bcmpkt_erspan3_fixed_hdr_t_vlan_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_erspan3_fixed_hdr_t_fset[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_31_3_0_erspan3_fixed_hdr_t_fset[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
     bcmpkt_erspan3_fixed_hdr_t_bso_set,
     bcmpkt_erspan3_fixed_hdr_t_cos_set,
     bcmpkt_erspan3_fixed_hdr_t_gbp_sid_set,
@@ -1640,13 +1542,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_erspan3_fixed_hdr_t_fset[BCM5
     bcmpkt_erspan3_fixed_hdr_t_vlan_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_30_2_0_erspan3_fixed_hdr_t_field_data[] = {
-    BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_31_3_0_erspan3_fixed_hdr_t_field_data[] = {
+    BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_30_2_0_erspan3_fixed_hdr_t_field_info = {
-    .num_fields = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT,
-    .info = bcm56890_a0_cna_6_5_30_2_0_erspan3_fixed_hdr_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_31_3_0_erspan3_fixed_hdr_t_field_info = {
+    .num_fields = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT,
+    .info = bcm56890_a0_cna_6_5_31_3_0_erspan3_fixed_hdr_t_field_data,
 };
 
 
@@ -1711,27 +1613,27 @@ static int32_t bcmpkt_erspan3_subhdr_5_t_timestamp_set(uint32_t *data, int profi
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_erspan3_subhdr_5_t_fget[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_31_3_0_erspan3_subhdr_5_t_fget[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
     bcmpkt_erspan3_subhdr_5_t_platform_id_get,
     bcmpkt_erspan3_subhdr_5_t_port_id_get,
     bcmpkt_erspan3_subhdr_5_t_switch_id_get,
     bcmpkt_erspan3_subhdr_5_t_timestamp_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_erspan3_subhdr_5_t_fset[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_31_3_0_erspan3_subhdr_5_t_fset[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
     bcmpkt_erspan3_subhdr_5_t_platform_id_set,
     bcmpkt_erspan3_subhdr_5_t_port_id_set,
     bcmpkt_erspan3_subhdr_5_t_switch_id_set,
     bcmpkt_erspan3_subhdr_5_t_timestamp_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_30_2_0_erspan3_subhdr_5_t_field_data[] = {
-    BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_31_3_0_erspan3_subhdr_5_t_field_data[] = {
+    BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_30_2_0_erspan3_subhdr_5_t_field_info = {
-    .num_fields = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT,
-    .info = bcm56890_a0_cna_6_5_30_2_0_erspan3_subhdr_5_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_31_3_0_erspan3_subhdr_5_t_field_info = {
+    .num_fields = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT,
+    .info = bcm56890_a0_cna_6_5_31_3_0_erspan3_subhdr_5_t_field_data,
 };
 
 
@@ -1750,21 +1652,21 @@ static int32_t bcmpkt_ethertype_t_type_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_ethertype_t_fget[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_31_3_0_ethertype_t_fget[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
     bcmpkt_ethertype_t_type_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_ethertype_t_fset[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_31_3_0_ethertype_t_fset[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
     bcmpkt_ethertype_t_type_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_30_2_0_ethertype_t_field_data[] = {
-    BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_31_3_0_ethertype_t_field_data[] = {
+    BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_30_2_0_ethertype_t_field_info = {
-    .num_fields = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ETHERTYPE_T_FID_COUNT,
-    .info = bcm56890_a0_cna_6_5_30_2_0_ethertype_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_31_3_0_ethertype_t_field_info = {
+    .num_fields = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ETHERTYPE_T_FID_COUNT,
+    .info = bcm56890_a0_cna_6_5_31_3_0_ethertype_t_field_data,
 };
 
 
@@ -1993,7 +1895,7 @@ static int32_t bcmpkt_generic_loopback_t_start_byte_set(uint32_t *data, int prof
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_generic_loopback_t_fget[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_31_3_0_generic_loopback_t_fget[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
     bcmpkt_generic_loopback_t_destination_obj_get,
     bcmpkt_generic_loopback_t_destination_type_get,
     bcmpkt_generic_loopback_t_entropy_obj_get,
@@ -2011,7 +1913,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_generic_loopback_t_fget[BCM56
     bcmpkt_generic_loopback_t_start_byte_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_generic_loopback_t_fset[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_31_3_0_generic_loopback_t_fset[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
     bcmpkt_generic_loopback_t_destination_obj_set,
     bcmpkt_generic_loopback_t_destination_type_set,
     bcmpkt_generic_loopback_t_entropy_obj_set,
@@ -2029,13 +1931,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_generic_loopback_t_fset[BCM56
     bcmpkt_generic_loopback_t_start_byte_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_30_2_0_generic_loopback_t_field_data[] = {
-    BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_31_3_0_generic_loopback_t_field_data[] = {
+    BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_30_2_0_generic_loopback_t_field_info = {
-    .num_fields = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT,
-    .info = bcm56890_a0_cna_6_5_30_2_0_generic_loopback_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_31_3_0_generic_loopback_t_field_info = {
+    .num_fields = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT,
+    .info = bcm56890_a0_cna_6_5_31_3_0_generic_loopback_t_field_data,
 };
 
 
@@ -2084,25 +1986,25 @@ static int32_t bcmpkt_icmp_t_icmp_type_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_icmp_t_fget[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ICMP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_31_3_0_icmp_t_fget[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ICMP_T_FID_COUNT] = {
     bcmpkt_icmp_t_checksum_get,
     bcmpkt_icmp_t_code_get,
     bcmpkt_icmp_t_icmp_type_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_icmp_t_fset[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ICMP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_31_3_0_icmp_t_fset[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ICMP_T_FID_COUNT] = {
     bcmpkt_icmp_t_checksum_set,
     bcmpkt_icmp_t_code_set,
     bcmpkt_icmp_t_icmp_type_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_30_2_0_icmp_t_field_data[] = {
-    BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_31_3_0_icmp_t_field_data[] = {
+    BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_30_2_0_icmp_t_field_info = {
-    .num_fields = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_ICMP_T_FID_COUNT,
-    .info = bcm56890_a0_cna_6_5_30_2_0_icmp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_31_3_0_icmp_t_field_info = {
+    .num_fields = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_ICMP_T_FID_COUNT,
+    .info = bcm56890_a0_cna_6_5_31_3_0_icmp_t_field_data,
 };
 
 
@@ -2184,7 +2086,7 @@ static int32_t bcmpkt_ipfix_t_version_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_ipfix_t_fget[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPFIX_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_31_3_0_ipfix_t_fget[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPFIX_T_FID_COUNT] = {
     bcmpkt_ipfix_t_export_time_get,
     bcmpkt_ipfix_t_length_get,
     bcmpkt_ipfix_t_obs_domain_id_get,
@@ -2192,7 +2094,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_ipfix_t_fget[BCM56890_A0_CNA_
     bcmpkt_ipfix_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_ipfix_t_fset[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPFIX_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_31_3_0_ipfix_t_fset[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPFIX_T_FID_COUNT] = {
     bcmpkt_ipfix_t_export_time_set,
     bcmpkt_ipfix_t_length_set,
     bcmpkt_ipfix_t_obs_domain_id_set,
@@ -2200,13 +2102,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_ipfix_t_fset[BCM56890_A0_CNA_
     bcmpkt_ipfix_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_30_2_0_ipfix_t_field_data[] = {
-    BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_31_3_0_ipfix_t_field_data[] = {
+    BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_30_2_0_ipfix_t_field_info = {
-    .num_fields = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPFIX_T_FID_COUNT,
-    .info = bcm56890_a0_cna_6_5_30_2_0_ipfix_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_31_3_0_ipfix_t_field_info = {
+    .num_fields = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPFIX_T_FID_COUNT,
+    .info = bcm56890_a0_cna_6_5_31_3_0_ipfix_t_field_data,
 };
 
 
@@ -2378,7 +2280,7 @@ static int32_t bcmpkt_ipv4_t_version_hdr_len_set(uint32_t *data, int profile, ui
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_ipv4_t_fget[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_31_3_0_ipv4_t_fget[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_FID_COUNT] = {
     bcmpkt_ipv4_t_da_get,
     bcmpkt_ipv4_t_flags_frag_offset_get,
     bcmpkt_ipv4_t_hdr_checksum_get,
@@ -2392,7 +2294,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_ipv4_t_fget[BCM56890_A0_CNA_6
     bcmpkt_ipv4_t_version_hdr_len_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_ipv4_t_fset[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_31_3_0_ipv4_t_fset[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_FID_COUNT] = {
     bcmpkt_ipv4_t_da_set,
     bcmpkt_ipv4_t_flags_frag_offset_set,
     bcmpkt_ipv4_t_hdr_checksum_set,
@@ -2406,13 +2308,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_ipv4_t_fset[BCM56890_A0_CNA_6
     bcmpkt_ipv4_t_version_hdr_len_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_30_2_0_ipv4_t_field_data[] = {
-    BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_31_3_0_ipv4_t_field_data[] = {
+    BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_30_2_0_ipv4_t_field_info = {
-    .num_fields = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV4_T_FID_COUNT,
-    .info = bcm56890_a0_cna_6_5_30_2_0_ipv4_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_31_3_0_ipv4_t_field_info = {
+    .num_fields = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV4_T_FID_COUNT,
+    .info = bcm56890_a0_cna_6_5_31_3_0_ipv4_t_field_data,
 };
 
 
@@ -2538,7 +2440,7 @@ static int32_t bcmpkt_ipv6_t_version_set(uint32_t *data, int profile, uint32_t v
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_ipv6_t_fget[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_31_3_0_ipv6_t_fget[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_FID_COUNT] = {
     bcmpkt_ipv6_t_da_get,
     bcmpkt_ipv6_t_flow_label_get,
     bcmpkt_ipv6_t_hop_limit_get,
@@ -2549,7 +2451,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_ipv6_t_fget[BCM56890_A0_CNA_6
     bcmpkt_ipv6_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_ipv6_t_fset[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_31_3_0_ipv6_t_fset[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_FID_COUNT] = {
     bcmpkt_ipv6_t_da_set,
     bcmpkt_ipv6_t_flow_label_set,
     bcmpkt_ipv6_t_hop_limit_set,
@@ -2560,13 +2462,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_ipv6_t_fset[BCM56890_A0_CNA_6
     bcmpkt_ipv6_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_30_2_0_ipv6_t_field_data[] = {
-    BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_31_3_0_ipv6_t_field_data[] = {
+    BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_30_2_0_ipv6_t_field_info = {
-    .num_fields = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_IPV6_T_FID_COUNT,
-    .info = bcm56890_a0_cna_6_5_30_2_0_ipv6_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_31_3_0_ipv6_t_field_info = {
+    .num_fields = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_IPV6_T_FID_COUNT,
+    .info = bcm56890_a0_cna_6_5_31_3_0_ipv6_t_field_data,
 };
 
 
@@ -2602,23 +2504,23 @@ static int32_t bcmpkt_l2_t_macsa_set(uint32_t *data, int profile, uint32_t val)
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_l2_t_fget[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_L2_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_31_3_0_l2_t_fget[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_L2_T_FID_COUNT] = {
     bcmpkt_l2_t_macda_get,
     bcmpkt_l2_t_macsa_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_l2_t_fset[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_L2_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_31_3_0_l2_t_fset[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_L2_T_FID_COUNT] = {
     bcmpkt_l2_t_macda_set,
     bcmpkt_l2_t_macsa_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_30_2_0_l2_t_field_data[] = {
-    BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_L2_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_31_3_0_l2_t_field_data[] = {
+    BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_L2_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_30_2_0_l2_t_field_info = {
-    .num_fields = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_L2_T_FID_COUNT,
-    .info = bcm56890_a0_cna_6_5_30_2_0_l2_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_31_3_0_l2_t_field_info = {
+    .num_fields = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_L2_T_FID_COUNT,
+    .info = bcm56890_a0_cna_6_5_31_3_0_l2_t_field_data,
 };
 
 
@@ -2638,21 +2540,21 @@ static int32_t bcmpkt_mirror_erspan_sn_t_seq_num_set(uint32_t *data, int profile
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_mirror_erspan_sn_t_fget[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_31_3_0_mirror_erspan_sn_t_fget[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
     bcmpkt_mirror_erspan_sn_t_seq_num_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_mirror_erspan_sn_t_fset[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_31_3_0_mirror_erspan_sn_t_fset[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
     bcmpkt_mirror_erspan_sn_t_seq_num_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_30_2_0_mirror_erspan_sn_t_field_data[] = {
-    BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_31_3_0_mirror_erspan_sn_t_field_data[] = {
+    BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_30_2_0_mirror_erspan_sn_t_field_info = {
-    .num_fields = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT,
-    .info = bcm56890_a0_cna_6_5_30_2_0_mirror_erspan_sn_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_31_3_0_mirror_erspan_sn_t_field_info = {
+    .num_fields = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT,
+    .info = bcm56890_a0_cna_6_5_31_3_0_mirror_erspan_sn_t_field_data,
 };
 
 
@@ -2672,21 +2574,21 @@ static int32_t bcmpkt_mirror_transport_t_data_set(uint32_t *data, int profile, u
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_mirror_transport_t_fget[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_31_3_0_mirror_transport_t_fget[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
     bcmpkt_mirror_transport_t_data_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_mirror_transport_t_fset[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_31_3_0_mirror_transport_t_fset[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
     bcmpkt_mirror_transport_t_data_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_30_2_0_mirror_transport_t_field_data[] = {
-    BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_31_3_0_mirror_transport_t_field_data[] = {
+    BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_30_2_0_mirror_transport_t_field_info = {
-    .num_fields = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT,
-    .info = bcm56890_a0_cna_6_5_30_2_0_mirror_transport_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_31_3_0_mirror_transport_t_field_info = {
+    .num_fields = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT,
+    .info = bcm56890_a0_cna_6_5_31_3_0_mirror_transport_t_field_data,
 };
 
 
@@ -2798,7 +2700,7 @@ static int32_t bcmpkt_psamp_mirror_on_drop_0_t_template_id_set(uint32_t *data, i
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_0_t_fget[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_0_t_fget[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_0_t_egress_mod_port_get,
     bcmpkt_psamp_mirror_on_drop_0_t_ingress_port_get,
     bcmpkt_psamp_mirror_on_drop_0_t_length_get,
@@ -2808,7 +2710,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_0_t_fget
     bcmpkt_psamp_mirror_on_drop_0_t_template_id_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_0_t_fset[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_0_t_fset[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_0_t_egress_mod_port_set,
     bcmpkt_psamp_mirror_on_drop_0_t_ingress_port_set,
     bcmpkt_psamp_mirror_on_drop_0_t_length_set,
@@ -2818,13 +2720,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_0_t_fset
     bcmpkt_psamp_mirror_on_drop_0_t_template_id_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_0_t_field_data[] = {
-    BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_0_t_field_data[] = {
+    BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_0_t_field_info = {
-    .num_fields = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT,
-    .info = bcm56890_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_0_t_field_info = {
+    .num_fields = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT,
+    .info = bcm56890_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_0_t_field_data,
 };
 
 
@@ -2918,7 +2820,7 @@ static int32_t bcmpkt_psamp_mirror_on_drop_1_t_var_len_indicator_set(uint32_t *d
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_1_t_fget[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_1_t_fget[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_1_t_ing_drop_reason_get,
     bcmpkt_psamp_mirror_on_drop_1_t_mirror_on_drop_obj_get,
     bcmpkt_psamp_mirror_on_drop_1_t_mmu_drop_ctrl_get,
@@ -2927,7 +2829,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_1_t_fget
     bcmpkt_psamp_mirror_on_drop_1_t_var_len_indicator_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_1_t_fset[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_1_t_fset[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_1_t_ing_drop_reason_set,
     bcmpkt_psamp_mirror_on_drop_1_t_mirror_on_drop_obj_set,
     bcmpkt_psamp_mirror_on_drop_1_t_mmu_drop_ctrl_set,
@@ -2936,13 +2838,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_1_t_fset
     bcmpkt_psamp_mirror_on_drop_1_t_var_len_indicator_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_1_t_field_data[] = {
-    BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_1_t_field_data[] = {
+    BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_1_t_field_info = {
-    .num_fields = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FID_COUNT,
-    .info = bcm56890_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_1_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_1_t_field_info = {
+    .num_fields = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_1_T_FID_COUNT,
+    .info = bcm56890_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_1_t_field_data,
 };
 
 
@@ -3036,7 +2938,7 @@ static int32_t bcmpkt_psamp_mirror_on_drop_2_t_var_len_indicator_set(uint32_t *d
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_2_t_fget[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_2_t_fget[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_2_t_egr_drop_reason_get,
     bcmpkt_psamp_mirror_on_drop_2_t_ep_copy_session_index_get,
     bcmpkt_psamp_mirror_on_drop_2_t_reserved_0_get,
@@ -3045,7 +2947,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_2_t_fget
     bcmpkt_psamp_mirror_on_drop_2_t_var_len_indicator_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_2_t_fset[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_2_t_fset[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_2_t_egr_drop_reason_set,
     bcmpkt_psamp_mirror_on_drop_2_t_ep_copy_session_index_set,
     bcmpkt_psamp_mirror_on_drop_2_t_reserved_0_set,
@@ -3054,13 +2956,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_2_t_fset
     bcmpkt_psamp_mirror_on_drop_2_t_var_len_indicator_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_2_t_field_data[] = {
-    BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_2_t_field_data[] = {
+    BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_2_t_field_info = {
-    .num_fields = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_FID_COUNT,
-    .info = bcm56890_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_2_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_2_t_field_info = {
+    .num_fields = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_PSAMP_MIRROR_ON_DROP_2_T_FID_COUNT,
+    .info = bcm56890_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_2_t_field_data,
 };
 
 
@@ -3203,7 +3105,7 @@ static int32_t bcmpkt_rarp_t_target_ip_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_rarp_t_fget[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_31_3_0_rarp_t_fget[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_FID_COUNT] = {
     bcmpkt_rarp_t_hardware_len_get,
     bcmpkt_rarp_t_hardware_type_get,
     bcmpkt_rarp_t_operation_get,
@@ -3215,7 +3117,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_rarp_t_fget[BCM56890_A0_CNA_6
     bcmpkt_rarp_t_target_ip_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_rarp_t_fset[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_31_3_0_rarp_t_fset[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_FID_COUNT] = {
     bcmpkt_rarp_t_hardware_len_set,
     bcmpkt_rarp_t_hardware_type_set,
     bcmpkt_rarp_t_operation_set,
@@ -3227,13 +3129,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_rarp_t_fset[BCM56890_A0_CNA_6
     bcmpkt_rarp_t_target_ip_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_30_2_0_rarp_t_field_data[] = {
-    BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_31_3_0_rarp_t_field_data[] = {
+    BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_30_2_0_rarp_t_field_info = {
-    .num_fields = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_RARP_T_FID_COUNT,
-    .info = bcm56890_a0_cna_6_5_30_2_0_rarp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_31_3_0_rarp_t_field_info = {
+    .num_fields = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_RARP_T_FID_COUNT,
+    .info = bcm56890_a0_cna_6_5_31_3_0_rarp_t_field_data,
 };
 
 
@@ -3267,23 +3169,23 @@ static int32_t bcmpkt_tcp_first_4bytes_t_src_port_set(uint32_t *data, int profil
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_tcp_first_4bytes_t_fget[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_31_3_0_tcp_first_4bytes_t_fget[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_first_4bytes_t_dst_port_get,
     bcmpkt_tcp_first_4bytes_t_src_port_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_tcp_first_4bytes_t_fset[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_31_3_0_tcp_first_4bytes_t_fset[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_first_4bytes_t_dst_port_set,
     bcmpkt_tcp_first_4bytes_t_src_port_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_30_2_0_tcp_first_4bytes_t_field_data[] = {
-    BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_31_3_0_tcp_first_4bytes_t_field_data[] = {
+    BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_30_2_0_tcp_first_4bytes_t_field_info = {
-    .num_fields = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT,
-    .info = bcm56890_a0_cna_6_5_30_2_0_tcp_first_4bytes_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_31_3_0_tcp_first_4bytes_t_field_info = {
+    .num_fields = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT,
+    .info = bcm56890_a0_cna_6_5_31_3_0_tcp_first_4bytes_t_field_data,
 };
 
 
@@ -3379,7 +3281,7 @@ static int32_t bcmpkt_tcp_last_16bytes_t_win_size_set(uint32_t *data, int profil
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_tcp_last_16bytes_t_fget[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_31_3_0_tcp_last_16bytes_t_fget[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_last_16bytes_t_ack_num_get,
     bcmpkt_tcp_last_16bytes_t_checksum_get,
     bcmpkt_tcp_last_16bytes_t_hdr_len_and_flags_get,
@@ -3388,7 +3290,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_tcp_last_16bytes_t_fget[BCM56
     bcmpkt_tcp_last_16bytes_t_win_size_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_tcp_last_16bytes_t_fset[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_31_3_0_tcp_last_16bytes_t_fset[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_last_16bytes_t_ack_num_set,
     bcmpkt_tcp_last_16bytes_t_checksum_set,
     bcmpkt_tcp_last_16bytes_t_hdr_len_and_flags_set,
@@ -3397,13 +3299,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_tcp_last_16bytes_t_fset[BCM56
     bcmpkt_tcp_last_16bytes_t_win_size_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_30_2_0_tcp_last_16bytes_t_field_data[] = {
-    BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_31_3_0_tcp_last_16bytes_t_field_data[] = {
+    BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_30_2_0_tcp_last_16bytes_t_field_info = {
-    .num_fields = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT,
-    .info = bcm56890_a0_cna_6_5_30_2_0_tcp_last_16bytes_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_31_3_0_tcp_last_16bytes_t_field_info = {
+    .num_fields = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT,
+    .info = bcm56890_a0_cna_6_5_31_3_0_tcp_last_16bytes_t_field_data,
 };
 
 
@@ -3467,27 +3369,27 @@ static int32_t bcmpkt_udp_t_udp_length_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_udp_t_fget[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UDP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_31_3_0_udp_t_fget[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UDP_T_FID_COUNT] = {
     bcmpkt_udp_t_checksum_get,
     bcmpkt_udp_t_dst_port_get,
     bcmpkt_udp_t_src_port_get,
     bcmpkt_udp_t_udp_length_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_udp_t_fset[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UDP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_31_3_0_udp_t_fset[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UDP_T_FID_COUNT] = {
     bcmpkt_udp_t_checksum_set,
     bcmpkt_udp_t_dst_port_set,
     bcmpkt_udp_t_src_port_set,
     bcmpkt_udp_t_udp_length_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_30_2_0_udp_t_field_data[] = {
-    BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_31_3_0_udp_t_field_data[] = {
+    BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_30_2_0_udp_t_field_info = {
-    .num_fields = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UDP_T_FID_COUNT,
-    .info = bcm56890_a0_cna_6_5_30_2_0_udp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_31_3_0_udp_t_field_info = {
+    .num_fields = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UDP_T_FID_COUNT,
+    .info = bcm56890_a0_cna_6_5_31_3_0_udp_t_field_data,
 };
 
 
@@ -3523,23 +3425,23 @@ static int32_t bcmpkt_unknown_l3_t_next_16bytes_of_l3_payload_set(uint32_t *data
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_unknown_l3_t_fget[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_31_3_0_unknown_l3_t_fget[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
     bcmpkt_unknown_l3_t_first_16bytes_of_l3_payload_get,
     bcmpkt_unknown_l3_t_next_16bytes_of_l3_payload_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_unknown_l3_t_fset[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_31_3_0_unknown_l3_t_fset[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
     bcmpkt_unknown_l3_t_first_16bytes_of_l3_payload_set,
     bcmpkt_unknown_l3_t_next_16bytes_of_l3_payload_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_30_2_0_unknown_l3_t_field_data[] = {
-    BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_31_3_0_unknown_l3_t_field_data[] = {
+    BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_30_2_0_unknown_l3_t_field_info = {
-    .num_fields = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT,
-    .info = bcm56890_a0_cna_6_5_30_2_0_unknown_l3_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_31_3_0_unknown_l3_t_field_info = {
+    .num_fields = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT,
+    .info = bcm56890_a0_cna_6_5_31_3_0_unknown_l3_t_field_data,
 };
 
 
@@ -3559,21 +3461,21 @@ static int32_t bcmpkt_unknown_l4_t_first_4bytes_of_l4_payload_set(uint32_t *data
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_unknown_l4_t_fget[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_31_3_0_unknown_l4_t_fget[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
     bcmpkt_unknown_l4_t_first_4bytes_of_l4_payload_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_unknown_l4_t_fset[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_31_3_0_unknown_l4_t_fset[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
     bcmpkt_unknown_l4_t_first_4bytes_of_l4_payload_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_30_2_0_unknown_l4_t_field_data[] = {
-    BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_31_3_0_unknown_l4_t_field_data[] = {
+    BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_30_2_0_unknown_l4_t_field_info = {
-    .num_fields = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT,
-    .info = bcm56890_a0_cna_6_5_30_2_0_unknown_l4_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_31_3_0_unknown_l4_t_field_info = {
+    .num_fields = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT,
+    .info = bcm56890_a0_cna_6_5_31_3_0_unknown_l4_t_field_data,
 };
 
 
@@ -3623,25 +3525,25 @@ static int32_t bcmpkt_unknown_l5_t_l5_bytes_4_7_set(uint32_t *data, int profile,
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_unknown_l5_t_fget[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_31_3_0_unknown_l5_t_fget[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
     bcmpkt_unknown_l5_t_l5_bytes_0_1_get,
     bcmpkt_unknown_l5_t_l5_bytes_2_3_get,
     bcmpkt_unknown_l5_t_l5_bytes_4_7_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_unknown_l5_t_fset[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_31_3_0_unknown_l5_t_fset[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
     bcmpkt_unknown_l5_t_l5_bytes_0_1_set,
     bcmpkt_unknown_l5_t_l5_bytes_2_3_set,
     bcmpkt_unknown_l5_t_l5_bytes_4_7_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_30_2_0_unknown_l5_t_field_data[] = {
-    BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_31_3_0_unknown_l5_t_field_data[] = {
+    BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_30_2_0_unknown_l5_t_field_info = {
-    .num_fields = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT,
-    .info = bcm56890_a0_cna_6_5_30_2_0_unknown_l5_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_31_3_0_unknown_l5_t_field_info = {
+    .num_fields = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT,
+    .info = bcm56890_a0_cna_6_5_31_3_0_unknown_l5_t_field_data,
 };
 
 
@@ -3705,27 +3607,27 @@ static int32_t bcmpkt_vlan_t_vid_set(uint32_t *data, int profile, uint32_t val)
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_vlan_t_fget[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_VLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_31_3_0_vlan_t_fget[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_VLAN_T_FID_COUNT] = {
     bcmpkt_vlan_t_cfi_get,
     bcmpkt_vlan_t_pcp_get,
     bcmpkt_vlan_t_tpid_get,
     bcmpkt_vlan_t_vid_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_vlan_t_fset[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_VLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_31_3_0_vlan_t_fset[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_VLAN_T_FID_COUNT] = {
     bcmpkt_vlan_t_cfi_set,
     bcmpkt_vlan_t_pcp_set,
     bcmpkt_vlan_t_tpid_set,
     bcmpkt_vlan_t_vid_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_30_2_0_vlan_t_field_data[] = {
-    BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_31_3_0_vlan_t_field_data[] = {
+    BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_30_2_0_vlan_t_field_info = {
-    .num_fields = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_VLAN_T_FID_COUNT,
-    .info = bcm56890_a0_cna_6_5_30_2_0_vlan_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_31_3_0_vlan_t_field_info = {
+    .num_fields = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_VLAN_T_FID_COUNT,
+    .info = bcm56890_a0_cna_6_5_31_3_0_vlan_t_field_data,
 };
 
 
@@ -3775,245 +3677,245 @@ static int32_t bcmpkt_vxlan_t_vn_id_set(uint32_t *data, int profile, uint32_t va
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_30_2_0_vxlan_t_fget[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_VXLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_cna_6_5_31_3_0_vxlan_t_fget[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_VXLAN_T_FID_COUNT] = {
     bcmpkt_vxlan_t_flags_reserved_1_get,
     bcmpkt_vxlan_t_reserved2_get,
     bcmpkt_vxlan_t_vn_id_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_30_2_0_vxlan_t_fset[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_VXLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_cna_6_5_31_3_0_vxlan_t_fset[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_VXLAN_T_FID_COUNT] = {
     bcmpkt_vxlan_t_flags_reserved_1_set,
     bcmpkt_vxlan_t_reserved2_set,
     bcmpkt_vxlan_t_vn_id_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_30_2_0_vxlan_t_field_data[] = {
-    BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_cna_6_5_31_3_0_vxlan_t_field_data[] = {
+    BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_30_2_0_vxlan_t_field_info = {
-    .num_fields = BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_VXLAN_T_FID_COUNT,
-    .info = bcm56890_a0_cna_6_5_30_2_0_vxlan_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_cna_6_5_31_3_0_vxlan_t_field_info = {
+    .num_fields = BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_VXLAN_T_FID_COUNT,
+    .info = bcm56890_a0_cna_6_5_31_3_0_vxlan_t_field_data,
 };
 
-static bcmpkt_flex_pmd_info_t bcm56890_a0_cna_6_5_30_2_0_flexhdr_info_list[BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_FLEXHDR_COUNT] = {
+static bcmpkt_flex_pmd_info_t bcm56890_a0_cna_6_5_31_3_0_flexhdr_info_list[BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_FLEXHDR_COUNT] = {
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_cna_6_5_30_2_0_arp_t_field_info,
+        .field_info = &bcm56890_a0_cna_6_5_31_3_0_arp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_cna_6_5_30_2_0_arp_t_fget,
-        .flex_fset = bcm56890_a0_cna_6_5_30_2_0_arp_t_fset,
+        .flex_fget = bcm56890_a0_cna_6_5_31_3_0_arp_t_fget,
+        .flex_fset = bcm56890_a0_cna_6_5_31_3_0_arp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_cna_6_5_30_2_0_cpu_composites_0_t_field_info,
+        .field_info = &bcm56890_a0_cna_6_5_31_3_0_cpu_composites_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_cna_6_5_30_2_0_cpu_composites_0_t_fget,
-        .flex_fset = bcm56890_a0_cna_6_5_30_2_0_cpu_composites_0_t_fset,
+        .flex_fget = bcm56890_a0_cna_6_5_31_3_0_cpu_composites_0_t_fget,
+        .flex_fset = bcm56890_a0_cna_6_5_31_3_0_cpu_composites_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_cna_6_5_30_2_0_cpu_composites_1_t_field_info,
+        .field_info = &bcm56890_a0_cna_6_5_31_3_0_cpu_composites_1_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_cna_6_5_30_2_0_cpu_composites_1_t_fget,
-        .flex_fset = bcm56890_a0_cna_6_5_30_2_0_cpu_composites_1_t_fset,
+        .flex_fget = bcm56890_a0_cna_6_5_31_3_0_cpu_composites_1_t_fget,
+        .flex_fset = bcm56890_a0_cna_6_5_31_3_0_cpu_composites_1_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_cna_6_5_30_2_0_ep_nih_header_t_field_info,
+        .field_info = &bcm56890_a0_cna_6_5_31_3_0_ep_nih_header_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_cna_6_5_30_2_0_ep_nih_header_t_fget,
-        .flex_fset = bcm56890_a0_cna_6_5_30_2_0_ep_nih_header_t_fset,
+        .flex_fget = bcm56890_a0_cna_6_5_31_3_0_ep_nih_header_t_fget,
+        .flex_fset = bcm56890_a0_cna_6_5_31_3_0_ep_nih_header_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_cna_6_5_30_2_0_erspan3_fixed_hdr_t_field_info,
+        .field_info = &bcm56890_a0_cna_6_5_31_3_0_erspan3_fixed_hdr_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_cna_6_5_30_2_0_erspan3_fixed_hdr_t_fget,
-        .flex_fset = bcm56890_a0_cna_6_5_30_2_0_erspan3_fixed_hdr_t_fset,
+        .flex_fget = bcm56890_a0_cna_6_5_31_3_0_erspan3_fixed_hdr_t_fget,
+        .flex_fset = bcm56890_a0_cna_6_5_31_3_0_erspan3_fixed_hdr_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_cna_6_5_30_2_0_erspan3_subhdr_5_t_field_info,
+        .field_info = &bcm56890_a0_cna_6_5_31_3_0_erspan3_subhdr_5_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_cna_6_5_30_2_0_erspan3_subhdr_5_t_fget,
-        .flex_fset = bcm56890_a0_cna_6_5_30_2_0_erspan3_subhdr_5_t_fset,
+        .flex_fget = bcm56890_a0_cna_6_5_31_3_0_erspan3_subhdr_5_t_fget,
+        .flex_fset = bcm56890_a0_cna_6_5_31_3_0_erspan3_subhdr_5_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_cna_6_5_30_2_0_ethertype_t_field_info,
+        .field_info = &bcm56890_a0_cna_6_5_31_3_0_ethertype_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_cna_6_5_30_2_0_ethertype_t_fget,
-        .flex_fset = bcm56890_a0_cna_6_5_30_2_0_ethertype_t_fset,
+        .flex_fget = bcm56890_a0_cna_6_5_31_3_0_ethertype_t_fget,
+        .flex_fset = bcm56890_a0_cna_6_5_31_3_0_ethertype_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_cna_6_5_30_2_0_generic_loopback_t_field_info,
+        .field_info = &bcm56890_a0_cna_6_5_31_3_0_generic_loopback_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_cna_6_5_30_2_0_generic_loopback_t_fget,
-        .flex_fset = bcm56890_a0_cna_6_5_30_2_0_generic_loopback_t_fset,
+        .flex_fget = bcm56890_a0_cna_6_5_31_3_0_generic_loopback_t_fget,
+        .flex_fset = bcm56890_a0_cna_6_5_31_3_0_generic_loopback_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_cna_6_5_30_2_0_icmp_t_field_info,
+        .field_info = &bcm56890_a0_cna_6_5_31_3_0_icmp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_cna_6_5_30_2_0_icmp_t_fget,
-        .flex_fset = bcm56890_a0_cna_6_5_30_2_0_icmp_t_fset,
+        .flex_fget = bcm56890_a0_cna_6_5_31_3_0_icmp_t_fget,
+        .flex_fset = bcm56890_a0_cna_6_5_31_3_0_icmp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_cna_6_5_30_2_0_ipfix_t_field_info,
+        .field_info = &bcm56890_a0_cna_6_5_31_3_0_ipfix_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_cna_6_5_30_2_0_ipfix_t_fget,
-        .flex_fset = bcm56890_a0_cna_6_5_30_2_0_ipfix_t_fset,
+        .flex_fget = bcm56890_a0_cna_6_5_31_3_0_ipfix_t_fget,
+        .flex_fset = bcm56890_a0_cna_6_5_31_3_0_ipfix_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_cna_6_5_30_2_0_ipv4_t_field_info,
+        .field_info = &bcm56890_a0_cna_6_5_31_3_0_ipv4_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_cna_6_5_30_2_0_ipv4_t_fget,
-        .flex_fset = bcm56890_a0_cna_6_5_30_2_0_ipv4_t_fset,
+        .flex_fget = bcm56890_a0_cna_6_5_31_3_0_ipv4_t_fget,
+        .flex_fset = bcm56890_a0_cna_6_5_31_3_0_ipv4_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_cna_6_5_30_2_0_ipv6_t_field_info,
+        .field_info = &bcm56890_a0_cna_6_5_31_3_0_ipv6_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_cna_6_5_30_2_0_ipv6_t_fget,
-        .flex_fset = bcm56890_a0_cna_6_5_30_2_0_ipv6_t_fset,
+        .flex_fget = bcm56890_a0_cna_6_5_31_3_0_ipv6_t_fget,
+        .flex_fset = bcm56890_a0_cna_6_5_31_3_0_ipv6_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_cna_6_5_30_2_0_l2_t_field_info,
+        .field_info = &bcm56890_a0_cna_6_5_31_3_0_l2_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_cna_6_5_30_2_0_l2_t_fget,
-        .flex_fset = bcm56890_a0_cna_6_5_30_2_0_l2_t_fset,
+        .flex_fget = bcm56890_a0_cna_6_5_31_3_0_l2_t_fget,
+        .flex_fset = bcm56890_a0_cna_6_5_31_3_0_l2_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_cna_6_5_30_2_0_mirror_erspan_sn_t_field_info,
+        .field_info = &bcm56890_a0_cna_6_5_31_3_0_mirror_erspan_sn_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_cna_6_5_30_2_0_mirror_erspan_sn_t_fget,
-        .flex_fset = bcm56890_a0_cna_6_5_30_2_0_mirror_erspan_sn_t_fset,
+        .flex_fget = bcm56890_a0_cna_6_5_31_3_0_mirror_erspan_sn_t_fget,
+        .flex_fset = bcm56890_a0_cna_6_5_31_3_0_mirror_erspan_sn_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_cna_6_5_30_2_0_mirror_transport_t_field_info,
+        .field_info = &bcm56890_a0_cna_6_5_31_3_0_mirror_transport_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_cna_6_5_30_2_0_mirror_transport_t_fget,
-        .flex_fset = bcm56890_a0_cna_6_5_30_2_0_mirror_transport_t_fset,
+        .flex_fget = bcm56890_a0_cna_6_5_31_3_0_mirror_transport_t_fget,
+        .flex_fset = bcm56890_a0_cna_6_5_31_3_0_mirror_transport_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_0_t_field_info,
+        .field_info = &bcm56890_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_0_t_fget,
-        .flex_fset = bcm56890_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_0_t_fset,
+        .flex_fget = bcm56890_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_0_t_fget,
+        .flex_fset = bcm56890_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_1_t_field_info,
+        .field_info = &bcm56890_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_1_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_1_t_fget,
-        .flex_fset = bcm56890_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_1_t_fset,
+        .flex_fget = bcm56890_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_1_t_fget,
+        .flex_fset = bcm56890_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_1_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_2_t_field_info,
+        .field_info = &bcm56890_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_2_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_2_t_fget,
-        .flex_fset = bcm56890_a0_cna_6_5_30_2_0_psamp_mirror_on_drop_2_t_fset,
+        .flex_fget = bcm56890_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_2_t_fget,
+        .flex_fset = bcm56890_a0_cna_6_5_31_3_0_psamp_mirror_on_drop_2_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_cna_6_5_30_2_0_rarp_t_field_info,
+        .field_info = &bcm56890_a0_cna_6_5_31_3_0_rarp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_cna_6_5_30_2_0_rarp_t_fget,
-        .flex_fset = bcm56890_a0_cna_6_5_30_2_0_rarp_t_fset,
+        .flex_fget = bcm56890_a0_cna_6_5_31_3_0_rarp_t_fget,
+        .flex_fset = bcm56890_a0_cna_6_5_31_3_0_rarp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_cna_6_5_30_2_0_tcp_first_4bytes_t_field_info,
+        .field_info = &bcm56890_a0_cna_6_5_31_3_0_tcp_first_4bytes_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_cna_6_5_30_2_0_tcp_first_4bytes_t_fget,
-        .flex_fset = bcm56890_a0_cna_6_5_30_2_0_tcp_first_4bytes_t_fset,
+        .flex_fget = bcm56890_a0_cna_6_5_31_3_0_tcp_first_4bytes_t_fget,
+        .flex_fset = bcm56890_a0_cna_6_5_31_3_0_tcp_first_4bytes_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_cna_6_5_30_2_0_tcp_last_16bytes_t_field_info,
+        .field_info = &bcm56890_a0_cna_6_5_31_3_0_tcp_last_16bytes_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_cna_6_5_30_2_0_tcp_last_16bytes_t_fget,
-        .flex_fset = bcm56890_a0_cna_6_5_30_2_0_tcp_last_16bytes_t_fset,
+        .flex_fget = bcm56890_a0_cna_6_5_31_3_0_tcp_last_16bytes_t_fget,
+        .flex_fset = bcm56890_a0_cna_6_5_31_3_0_tcp_last_16bytes_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_cna_6_5_30_2_0_udp_t_field_info,
+        .field_info = &bcm56890_a0_cna_6_5_31_3_0_udp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_cna_6_5_30_2_0_udp_t_fget,
-        .flex_fset = bcm56890_a0_cna_6_5_30_2_0_udp_t_fset,
+        .flex_fget = bcm56890_a0_cna_6_5_31_3_0_udp_t_fget,
+        .flex_fset = bcm56890_a0_cna_6_5_31_3_0_udp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_cna_6_5_30_2_0_unknown_l3_t_field_info,
+        .field_info = &bcm56890_a0_cna_6_5_31_3_0_unknown_l3_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_cna_6_5_30_2_0_unknown_l3_t_fget,
-        .flex_fset = bcm56890_a0_cna_6_5_30_2_0_unknown_l3_t_fset,
+        .flex_fget = bcm56890_a0_cna_6_5_31_3_0_unknown_l3_t_fget,
+        .flex_fset = bcm56890_a0_cna_6_5_31_3_0_unknown_l3_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_cna_6_5_30_2_0_unknown_l4_t_field_info,
+        .field_info = &bcm56890_a0_cna_6_5_31_3_0_unknown_l4_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_cna_6_5_30_2_0_unknown_l4_t_fget,
-        .flex_fset = bcm56890_a0_cna_6_5_30_2_0_unknown_l4_t_fset,
+        .flex_fget = bcm56890_a0_cna_6_5_31_3_0_unknown_l4_t_fget,
+        .flex_fset = bcm56890_a0_cna_6_5_31_3_0_unknown_l4_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_cna_6_5_30_2_0_unknown_l5_t_field_info,
+        .field_info = &bcm56890_a0_cna_6_5_31_3_0_unknown_l5_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_cna_6_5_30_2_0_unknown_l5_t_fget,
-        .flex_fset = bcm56890_a0_cna_6_5_30_2_0_unknown_l5_t_fset,
+        .flex_fget = bcm56890_a0_cna_6_5_31_3_0_unknown_l5_t_fget,
+        .flex_fset = bcm56890_a0_cna_6_5_31_3_0_unknown_l5_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_cna_6_5_30_2_0_vlan_t_field_info,
+        .field_info = &bcm56890_a0_cna_6_5_31_3_0_vlan_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_cna_6_5_30_2_0_vlan_t_fget,
-        .flex_fset = bcm56890_a0_cna_6_5_30_2_0_vlan_t_fset,
+        .flex_fget = bcm56890_a0_cna_6_5_31_3_0_vlan_t_fget,
+        .flex_fset = bcm56890_a0_cna_6_5_31_3_0_vlan_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_cna_6_5_30_2_0_vxlan_t_field_info,
+        .field_info = &bcm56890_a0_cna_6_5_31_3_0_vxlan_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_cna_6_5_30_2_0_vxlan_t_fget,
-        .flex_fset = bcm56890_a0_cna_6_5_30_2_0_vxlan_t_fset,
+        .flex_fget = bcm56890_a0_cna_6_5_31_3_0_vxlan_t_fget,
+        .flex_fset = bcm56890_a0_cna_6_5_31_3_0_vxlan_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_cna_6_5_30_2_0_rxpmd_flex_field_info,
-        .reasons_info = &bcm56890_a0_cna_6_5_30_2_0_rxpmd_flex_reasons_info,
+        .field_info = &bcm56890_a0_cna_6_5_31_3_0_rxpmd_flex_field_info,
+        .reasons_info = &bcm56890_a0_cna_6_5_31_3_0_rxpmd_flex_reasons_info,
         .flex_common_fget = bcm56890_a0_rxpmd_flex_fget,
         .flex_common_fset = bcm56890_a0_rxpmd_flex_fset,
     },
 };
 
-static shr_enum_map_t bcm56890_a0_cna_6_5_30_2_0_flexhdr_id_map[] = {
-    BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_FLEXHDR_NAME_MAP_INIT
+static shr_enum_map_t bcm56890_a0_cna_6_5_31_3_0_flexhdr_id_map[] = {
+    BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_FLEXHDR_NAME_MAP_INIT
 };
 
-shr_enum_map_t * bcm56890_a0_cna_6_5_30_2_0_flexhdr_map_get(void)
+shr_enum_map_t * bcm56890_a0_cna_6_5_31_3_0_flexhdr_map_get(void)
 {
-    return bcm56890_a0_cna_6_5_30_2_0_flexhdr_id_map;
+    return bcm56890_a0_cna_6_5_31_3_0_flexhdr_id_map;
 }
 
-bcmpkt_flex_pmd_info_t * bcm56890_a0_cna_6_5_30_2_0_flex_pmd_info_get(uint32_t hid)
+bcmpkt_flex_pmd_info_t * bcm56890_a0_cna_6_5_31_3_0_flex_pmd_info_get(uint32_t hid)
 {
-    if (hid >= BCM56890_A0_CNA_6_5_30_2_0_BCMPKT_FLEXHDR_COUNT) {
+    if (hid >= BCM56890_A0_CNA_6_5_31_3_0_BCMPKT_FLEXHDR_COUNT) {
         return NULL;
     }
 
-    return &bcm56890_a0_cna_6_5_30_2_0_flexhdr_info_list[hid];
+    return &bcm56890_a0_cna_6_5_31_3_0_flexhdr_info_list[hid];
 }
 
-int bcm56890_a0_cna_6_5_30_2_0_flexhdr_variant_support_map[BCMPKT_PMD_COUNT] = {
+int bcm56890_a0_cna_6_5_31_3_0_flexhdr_variant_support_map[BCMPKT_PMD_COUNT] = {
     7,
     -1,
     -1,
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_bcmpkt_rxpmd_match_id.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_bcmpkt_rxpmd_match_id.c
similarity index 82%
rename from platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_bcmpkt_rxpmd_match_id.c
rename to platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_bcmpkt_rxpmd_match_id.c
index e15b2d476da5..ade5c4c33e19 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_bcmpkt_rxpmd_match_id.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_bcmpkt_rxpmd_match_id.c
@@ -2,8 +2,8 @@
  *
  * DO NOT EDIT THIS FILE!
  * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) bcm56890_a0_dna_6_5_30_8_0_sf_match_id_info.yml
- * for device bcm56890_a0 and variant dna_6_5_30_8_0.
+ * from the NPL output file(s) bcm56890_a0_dna_6_5_31_6_0_sf_match_id_info.yml
+ * for device bcm56890_a0 and variant dna_6_5_31_6_0.
  * Edits to this file will be lost when it is regenerated.
  *
  * $Id: $
@@ -29,39 +29,39 @@
 
 
 #include <bcmpkt/bcmpkt_rxpmd_match_id.h>
-#include <bcmpkt/xfcr/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_bcmpkt_rxpmd_match_id_defs.h>
+#include <bcmpkt/xfcr/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_bcmpkt_rxpmd_match_id_defs.h>
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_cntag[1] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_cntag[1] =
 {
     0x366c,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_itag[1] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_itag[1] =
 {
     0x78f0,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_l2[1] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_l2[1] =
 {
     0x1fffe,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_otag[1] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_otag[1] =
 {
     0xff00,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_snap_or_llc[1] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_snap_or_llc[1] =
 {
     0x1e4c8,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_arp[1] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_arp[1] =
 {
     0x4,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_auth_ext_1[39] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_auth_ext_1[39] =
 {
     0x10,
     0x400000,
@@ -104,7 +104,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x777f7,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_auth_ext_2[55] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_auth_ext_2[55] =
 {
     0x0,
     0x0,
@@ -163,7 +163,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0xeef0,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_bfd[57] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_bfd[57] =
 {
     0x0,
     0x0,
@@ -224,7 +224,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x80080200,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_dest_opt_ext_1[42] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_dest_opt_ext_1[42] =
 {
     0x0,
     0x0,
@@ -270,7 +270,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x1ddfdd,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_dest_opt_ext_2[55] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_dest_opt_ext_2[55] =
 {
     0x0,
     0x0,
@@ -329,7 +329,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0xeef0000,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_esp_ext[55] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_esp_ext[55] =
 {
     0x0,
     0x0,
@@ -388,7 +388,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x10000000,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ethertype[29] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ethertype[29] =
 {
     0x1e,
     0x400000,
@@ -421,7 +421,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x1bbbfb,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_frag_ext_1[45] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_frag_ext_1[45] =
 {
     0x0,
     0x0,
@@ -470,7 +470,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x777,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_frag_ext_2[56] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_frag_ext_2[56] =
 {
     0x0,
     0x0,
@@ -530,7 +530,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x1dd,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_hop_by_hop_ext_1[48] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_hop_by_hop_ext_1[48] =
 {
     0x0,
     0x0,
@@ -582,7 +582,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0xeef,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_hop_by_hop_ext_2[56] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_hop_by_hop_ext_2[56] =
 {
     0x0,
     0x0,
@@ -642,7 +642,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x1dde00,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_icmp[57] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_icmp[57] =
 {
     0x0,
     0x400000,
@@ -703,7 +703,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x2000008,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ifa_header[48] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ifa_header[48] =
 {
     0x0,
     0x0,
@@ -755,7 +755,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x15e000,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ifa_metadata_base[48] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ifa_metadata_base[48] =
 {
     0x0,
     0x0,
@@ -807,7 +807,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x110000,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_igmp[36] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_igmp[36] =
 {
     0x0,
     0x0,
@@ -847,7 +847,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x10000,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ipv4[36] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ipv4[36] =
 {
     0x18,
     0x400000,
@@ -887,7 +887,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x1000e,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ipv6[58] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ipv6[58] =
 {
     0x0,
     0x0,
@@ -949,7 +949,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0xe,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_p_1588[58] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_p_1588[58] =
 {
     0x0,
     0x0,
@@ -1011,7 +1011,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x2,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_prog_ext_1[51] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_prog_ext_1[51] =
 {
     0x0,
     0x0,
@@ -1066,7 +1066,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0xeefeef,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_prog_ext_2[57] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_prog_ext_2[57] =
 {
     0x0,
     0x0,
@@ -1127,7 +1127,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x3,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rarp[29] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rarp[29] =
 {
     0x0,
     0x0,
@@ -1160,7 +1160,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x80000,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rout_ext_1[54] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rout_ext_1[54] =
 {
     0x0,
     0x0,
@@ -1218,7 +1218,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x1ddfddf,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rout_ext_2[57] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rout_ext_2[57] =
 {
     0x0,
     0x0,
@@ -1279,7 +1279,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x3bbc,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_tcp_first_4bytes[57] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_tcp_first_4bytes[57] =
 {
     0x0,
     0x0,
@@ -1340,7 +1340,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x2c02c0b0,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_tcp_last_16bytes[57] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_tcp_last_16bytes[57] =
 {
     0x0,
     0x0,
@@ -1401,7 +1401,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x280280a0,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_udp[58] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_udp[58] =
 {
     0x0,
     0x0,
@@ -1463,7 +1463,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x6,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l3[29] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l3[29] =
 {
     0x0,
     0x0,
@@ -1496,7 +1496,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x100000,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l4[58] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l4[58] =
 {
     0x0,
     0x0,
@@ -1558,7 +1558,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x8,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l5[58] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l5[58] =
 {
     0x0,
     0x0,
@@ -1620,7 +1620,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x4,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_wesp_ext_1[58] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_wesp_ext_1[58] =
 {
     0x0,
     0x0,
@@ -1682,7 +1682,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0xe,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_wesp_ext_2[58] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_wesp_ext_2[58] =
 {
     0x0,
     0x0,
@@ -1744,7 +1744,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0xe,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_cntag[4] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_cntag[4] =
 {
     0x33033198,
     0xcc66066,
@@ -1752,7 +1752,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_cn
     0x6633033,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_gbp_ethernet_shim[4] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_gbp_ethernet_shim[4] =
 {
     0x44044220,
     0x11088088,
@@ -1760,7 +1760,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_gb
     0x8844044,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_hg3_base[4] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_hg3_base[4] =
 {
     0xffc00000,
     0xffffffff,
@@ -1768,7 +1768,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_hg
     0x7fffffff,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_hg3_ext_0[4] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_hg3_ext_0[4] =
 {
     0x0,
     0xfffff800,
@@ -1776,7 +1776,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_hg
     0x7ffffc00,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_itag[4] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_itag[4] =
 {
     0xf80f87c0,
     0x3e1f01f0,
@@ -1784,7 +1784,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_it
     0x1f0f80f8,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_l2[4] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_l2[4] =
 {
     0xfffffffe,
     0xffffffff,
@@ -1792,7 +1792,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_l2
     0x7fffffff,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_otag[4] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_otag[4] =
 {
     0x1ff800,
     0x7fe003ff,
@@ -1800,7 +1800,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_ot
     0x3ff001ff,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_snap_or_llc[4] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_snap_or_llc[4] =
 {
     0xa23a2510,
     0xe8944744,
@@ -1808,7 +1808,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_sn
     0x744a23a2,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_svtag[4] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_svtag[4] =
 {
     0x0,
     0x0,
@@ -1816,12 +1816,12 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_sv
     0x7fffffff,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_arp[1] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_arp[1] =
 {
     0x4,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_auth_ext_1[14] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_auth_ext_1[14] =
 {
     0x10,
     0x0,
@@ -1839,7 +1839,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x7bef,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_auth_ext_2[35] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_auth_ext_2[35] =
 {
     0x0,
     0x0,
@@ -1878,7 +1878,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x1efbc00,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_bfd[40] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_bfd[40] =
 {
     0x0,
     0x0,
@@ -1888,7 +1888,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x80000,
     0x0,
     0x0,
-    0x20000000,
+    0x40000000,
     0x40000000,
     0x20002000,
     0x10001000,
@@ -1916,13 +1916,13 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x100040,
     0x20002,
     0x80010001,
-    0x40008000,
-    0x4000800,
+    0x80010000,
+    0x8001000,
     0x11111000,
     0x11,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_dest_opt_ext_1[18] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_dest_opt_ext_1[18] =
 {
     0x0,
     0x0,
@@ -1944,7 +1944,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x1ef,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_dest_opt_ext_2[36] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_dest_opt_ext_2[36] =
 {
     0x0,
     0x0,
@@ -1984,7 +1984,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0xf7,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_esp_ext[36] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_esp_ext[36] =
 {
     0x0,
     0x0,
@@ -2024,7 +2024,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x100,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ethertype[40] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ethertype[40] =
 {
     0x1e,
     0x0,
@@ -2033,9 +2033,9 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0xffffffff,
     0xfbef117,
     0x0,
-    0x2000000,
-    0xfb000000,
-    0xf7f0001e,
+    0x6000000,
+    0xf6000000,
+    0xf7e0003d,
     0xfbfefbfd,
     0x7dff7dfe,
     0xf7dfbeff,
@@ -2062,13 +2062,13 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0xbf7dfdf7,
     0xdfefbfef,
     0xeff7dff7,
-    0xf7fbeffb,
-    0xdf7fbefd,
-    0xfffffffb,
+    0xeff7defb,
+    0xbeff7dfb,
+    0xffffffff,
     0x1ff,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_frag_ext_1[21] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_frag_ext_1[21] =
 {
     0x0,
     0x0,
@@ -2093,7 +2093,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0xf7dfe,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_frag_ext_2[36] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_frag_ext_2[36] =
 {
     0x0,
     0x0,
@@ -2133,7 +2133,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0xf7de00,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gpe[38] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gpe[38] =
 {
     0x0,
     0x0,
@@ -2143,8 +2143,8 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x300000,
     0x0,
     0x0,
-    0xc0000000,
     0x80000000,
+    0x80000001,
     0xc000c001,
     0x60006000,
     0x6003000,
@@ -2171,11 +2171,11 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x600180,
     0xc000c,
     0x60006,
-    0x80030003,
-    0x18003001,
+    0x60003,
+    0x30006003,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre[22] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre[22] =
 {
     0x0,
     0x0,
@@ -2201,7 +2201,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x7ffff,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_chksum[22] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_chksum[22] =
 {
     0x0,
     0x0,
@@ -2227,7 +2227,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x3f,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_key[22] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_key[22] =
 {
     0x0,
     0x0,
@@ -2253,7 +2253,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x3fc0,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_rout[22] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_rout[22] =
 {
     0x0,
     0x0,
@@ -2279,7 +2279,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x63333,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_seq[22] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_seq[22] =
 {
     0x0,
     0x0,
@@ -2305,7 +2305,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x7bc3c,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_hop_by_hop_ext_1[26] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_hop_by_hop_ext_1[26] =
 {
     0x0,
     0x0,
@@ -2335,7 +2335,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0xf7d,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_hop_by_hop_ext_2[37] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_hop_by_hop_ext_2[37] =
 {
     0x0,
     0x0,
@@ -2376,7 +2376,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x7b,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_icmp[38] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_icmp[38] =
 {
     0x0,
     0x0,
@@ -2414,11 +2414,11 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x1,
     0x4000800,
     0x2000400,
-    0x1000280,
-    0x100000,
+    0x2000480,
+    0x200000,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ifa_header[26] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ifa_header[26] =
 {
     0x0,
     0x0,
@@ -2448,7 +2448,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x45e000,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ifa_metadata_base[26] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ifa_metadata_base[26] =
 {
     0x0,
     0x0,
@@ -2478,7 +2478,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x410000,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_igmp[10] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_igmp[8] =
 {
     0x0,
     0x0,
@@ -2487,12 +2487,10 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x1000,
     0x0,
-    0x0,
-    0x0,
-    0x100000,
+    0x4000000,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ioam_e2e[38] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ioam_e2e[38] =
 {
     0x0,
     0x0,
@@ -2502,8 +2500,8 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x200000,
     0x0,
     0x0,
-    0x80000000,
     0x0,
+    0x1,
     0x80008001,
     0x40004000,
     0x4002000,
@@ -2530,11 +2528,11 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x400100,
     0x80008,
     0x40004,
-    0x20002,
-    0x10002001,
+    0x40002,
+    0x20004002,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ipv4[10] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ipv4[10] =
 {
     0x18,
     0x0,
@@ -2543,12 +2541,12 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0xffffffff,
     0xfbef117,
     0x0,
-    0x2000000,
-    0xfb000000,
-    0x10001e,
+    0x6000000,
+    0xf6000000,
+    0x3d,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ipv6[39] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ipv6[39] =
 {
     0x0,
     0x0,
@@ -2586,12 +2584,12 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0xbf7dfdf7,
     0xdfefbfef,
     0xeff7dff7,
-    0xf7fbeffb,
-    0xdf7fbefd,
-    0x3,
+    0xeff7defb,
+    0xbeff7dfb,
+    0x7,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls0[40] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls0[40] =
 {
     0x0,
     0x0,
@@ -2635,7 +2633,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x3f,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls1[40] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls1[40] =
 {
     0x0,
     0x0,
@@ -2679,7 +2677,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x3,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls2[39] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls2[39] =
 {
     0x0,
     0x0,
@@ -2722,7 +2720,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x3fffffe0,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls3[39] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls3[39] =
 {
     0x0,
     0x0,
@@ -2765,7 +2763,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x3ffffc0,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls4[39] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls4[39] =
 {
     0x0,
     0x0,
@@ -2808,7 +2806,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x3fff80,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls5[39] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls5[39] =
 {
     0x0,
     0x0,
@@ -2851,7 +2849,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x3ff00,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls6[39] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls6[39] =
 {
     0x0,
     0x0,
@@ -2894,7 +2892,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x3e00,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls_ach[40] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls_ach[40] =
 {
     0x0,
     0x0,
@@ -2938,7 +2936,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x19,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls_cw[40] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls_cw[40] =
 {
     0x0,
     0x0,
@@ -2982,7 +2980,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x22,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_p_1588[40] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_p_1588[40] =
 {
     0x0,
     0x0,
@@ -2993,7 +2991,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x2,
+    0x4,
     0x20004,
     0x10002,
     0x10008001,
@@ -3020,13 +3018,13 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x1000400,
     0x200020,
     0x100010,
-    0x80008,
-    0x40008004,
+    0x100008,
+    0x80010008,
     0x0,
     0x40,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_prog_ext_1[30] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_prog_ext_1[30] =
 {
     0x0,
     0x0,
@@ -3060,7 +3058,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0xf7dfe,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_prog_ext_2[37] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_prog_ext_2[37] =
 {
     0x0,
     0x0,
@@ -3098,10 +3096,10 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x7bef00,
+    0xf7de00,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rarp[40] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rarp[40] =
 {
     0x0,
     0x0,
@@ -3145,7 +3143,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x80,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rout_ext_1[34] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rout_ext_1[34] =
 {
     0x0,
     0x0,
@@ -3183,7 +3181,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x3df7,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rout_ext_2[38] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rout_ext_2[38] =
 {
     0x0,
     0x0,
@@ -3221,11 +3219,11 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0xf7800000,
-    0x3d,
+    0xef000000,
+    0x7b,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_seg_rout_ext_1[34] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_seg_rout_ext_1[34] =
 {
     0x0,
     0x0,
@@ -3263,7 +3261,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0xf7dc000,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_tcp_first_4bytes[38] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_tcp_first_4bytes[38] =
 {
     0x0,
     0x0,
@@ -3273,7 +3271,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x2c007,
     0x0,
     0x0,
-    0xb000000,
+    0x16000000,
     0x16000000,
     0xb000b00,
     0x5800580,
@@ -3301,11 +3299,11 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0xb0058016,
     0x5800b000,
     0x2c005800,
-    0x16002c00,
-    0x16002c0,
+    0x2c005800,
+    0x2c00580,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_tcp_last_16bytes[38] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_tcp_last_16bytes[38] =
 {
     0x0,
     0x0,
@@ -3315,7 +3313,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x28006,
     0x0,
     0x0,
-    0xa000000,
+    0x14000000,
     0x14000000,
     0xa000a00,
     0x5000500,
@@ -3343,11 +3341,11 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0xa0050014,
     0x5000a000,
     0x28005000,
-    0x14002800,
-    0x1400280,
+    0x28005000,
+    0x2800500,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_udp[39] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_udp[39] =
 {
     0x0,
     0x0,
@@ -3357,8 +3355,8 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x3bc0110,
     0x0,
     0x0,
-    0xf0000000,
-    0xe000000e,
+    0xe0000000,
+    0xe000001d,
     0xf00ef01d,
     0x7807780e,
     0x7783bc07,
@@ -3385,12 +3383,12 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x7781de0,
     0x80ef00ef,
     0xc0778077,
-    0xe03bc03b,
-    0xde03bc1d,
-    0x1,
+    0xc077803b,
+    0xbc07783b,
+    0x3,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l3[40] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l3[40] =
 {
     0x0,
     0x0,
@@ -3434,7 +3432,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x100,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l4[39] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l4[39] =
 {
     0x0,
     0x0,
@@ -3445,7 +3443,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x10,
+    0x20,
     0x100020,
     0x80010,
     0x80040008,
@@ -3472,12 +3470,12 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x8002000,
     0x1000100,
     0x800080,
-    0x400040,
-    0x40020,
-    0x2,
+    0x800040,
+    0x80040,
+    0x4,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l5[38] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l5[39] =
 {
     0x0,
     0x0,
@@ -3487,8 +3485,8 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x1020000,
     0x0,
     0x0,
-    0x8000000,
-    0x10000004,
+    0x10000000,
+    0x10000008,
     0x8040808,
     0x4020404,
     0x20410202,
@@ -3515,11 +3513,12 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x82040810,
     0x40408040,
     0x20204020,
-    0x10102010,
-    0x81010208,
+    0x20204010,
+    0x2020410,
+    0x1,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_vxlan[39] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_vxlan[39] =
 {
     0x0,
     0x0,
@@ -3530,7 +3529,7 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x8,
+    0x10,
     0x80010,
     0x40008,
     0x40020004,
@@ -3557,12 +3556,12 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x4001000,
     0x800080,
     0x400040,
-    0x200020,
-    0x20010,
-    0x1,
+    0x400020,
+    0x40020,
+    0x2,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_wesp_ext_1[39] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_wesp_ext_1[39] =
 {
     0x0,
     0x0,
@@ -3571,9 +3570,9 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x8000000,
     0x0,
-    0x2000000,
-    0xfb000000,
-    0x10001e,
+    0x6000000,
+    0xf6000000,
+    0x3d,
     0x0,
     0x0,
     0x0,
@@ -3600,12 +3599,12 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0xdfefbe00,
     0xeff7dff7,
-    0xf7fbeffb,
-    0xdf7fbefd,
-    0x3,
+    0xeff7defb,
+    0xbeff7dfb,
+    0x7,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_wesp_ext_2[39] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_wesp_ext_2[39] =
 {
     0x0,
     0x0,
@@ -3644,25 +3643,25 @@ static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0xdf780000,
-    0x3,
+    0xbef00000,
+    0x7,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_sys_hdr_ep_nih[1] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_sys_hdr_ep_nih[1] =
 {
     0x4,
 };
 
-static uint32_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_sys_hdr_loopback[1] =
+static uint32_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_sys_hdr_loopback[1] =
 {
     0x8,
 };
 
 
 static bcmpkt_rxpmd_match_id_db_t
-bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_COUNT] = {
+bcm56890_a0_dna_6_5_31_6_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_COUNT] = {
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_CNTAG */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_CNTAG */
         .name         = "EGRESS_PKT_FWD_L2_HDR_CNTAG",
         .match        = 0x100,
         .match_mask   = 0x180,
@@ -3676,7 +3675,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_GBP_ETHERNET_SHIM */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_GBP_ETHERNET_SHIM */
         .name         = "EGRESS_PKT_FWD_L2_HDR_GBP_ETHERNET_SHIM",
         .match        = 0x80,
         .match_mask   = 0x180,
@@ -3690,7 +3689,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_BASE */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_BASE */
         .name         = "EGRESS_PKT_FWD_L2_HDR_HG3_BASE",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -3704,7 +3703,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0 */
         .name         = "EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0",
         .match        = 0x10,
         .match_mask   = 0x10,
@@ -3718,7 +3717,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG */
         .name         = "EGRESS_PKT_FWD_L2_HDR_ITAG",
         .match        = 0x40,
         .match_mask   = 0x40,
@@ -3732,7 +3731,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2 */
         .name         = "EGRESS_PKT_FWD_L2_HDR_L2",
         .match        = 0x2,
         .match_mask   = 0x2,
@@ -3746,7 +3745,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE */
         .name         = "EGRESS_PKT_FWD_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x1ff,
@@ -3760,7 +3759,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG */
         .name         = "EGRESS_PKT_FWD_L2_HDR_OTAG",
         .match        = 0x20,
         .match_mask   = 0x20,
@@ -3774,7 +3773,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC */
         .name         = "EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC",
         .match        = 0x4,
         .match_mask   = 0x4,
@@ -3788,7 +3787,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SVTAG */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SVTAG */
         .name         = "EGRESS_PKT_FWD_L2_HDR_SVTAG",
         .match        = 0x8,
         .match_mask   = 0x8,
@@ -3802,7 +3801,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ARP",
         .match        = 0x4000,
         .match_mask   = 0x3c000,
@@ -3816,7 +3815,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1",
         .match        = 0x24000,
         .match_mask   = 0x3c000,
@@ -3830,7 +3829,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2",
         .match        = 0x140,
         .match_mask   = 0x7c0,
@@ -3844,7 +3843,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_BFD",
         .match        = 0x3000,
         .match_mask   = 0x3800,
@@ -3858,7 +3857,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_1 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_1",
         .match        = 0x2c000,
         .match_mask   = 0x3c000,
@@ -3872,7 +3871,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_2 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_2",
         .match        = 0x200,
         .match_mask   = 0x7c0,
@@ -3886,7 +3885,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT",
         .match        = 0x40,
         .match_mask   = 0x7c0,
@@ -3900,7 +3899,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -3914,7 +3913,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1",
         .match        = 0x30000,
         .match_mask   = 0x3c000,
@@ -3928,7 +3927,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2",
         .match        = 0x240,
         .match_mask   = 0x7c0,
@@ -3942,7 +3941,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GPE",
         .match        = 0x30,
         .match_mask   = 0x438,
@@ -3956,7 +3955,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE",
         .match        = 0x18,
         .match_mask   = 0x418,
@@ -3970,7 +3969,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM",
         .match        = 0x80,
         .match_mask   = 0x7c0,
@@ -3984,7 +3983,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY",
         .match        = 0x1800,
         .match_mask   = 0x3800,
@@ -3998,7 +3997,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT",
         .match        = 0x10000,
         .match_mask   = 0x3c000,
@@ -4012,7 +4011,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ",
         .match        = 0x38,
         .match_mask   = 0x438,
@@ -4026,7 +4025,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_1 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_1",
         .match        = 0x8000,
         .match_mask   = 0x3c000,
@@ -4040,7 +4039,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_2 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_2",
         .match        = 0xc0,
         .match_mask   = 0x7c0,
@@ -4054,7 +4053,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ICMP",
         .match        = 0x800,
         .match_mask   = 0x3818,
@@ -4068,7 +4067,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_HEADER */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_HEADER */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IFA_HEADER",
         .match        = 0x2c0,
         .match_mask   = 0x7c0,
@@ -4082,7 +4081,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA_BASE */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA_BASE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA_BASE",
         .match        = 0xc000,
         .match_mask   = 0x3c000,
@@ -4096,7 +4095,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IGMP",
         .match        = 0x100,
         .match_mask   = 0x7c0,
@@ -4110,7 +4109,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IOAM_E2E */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IOAM_E2E */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IOAM_E2E",
         .match        = 0x1000,
         .match_mask   = 0x3800,
@@ -4124,7 +4123,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IPV4",
         .match        = 0x2,
         .match_mask   = 0x406,
@@ -4138,7 +4137,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IPV6",
         .match        = 0x4,
         .match_mask   = 0x406,
@@ -4152,7 +4151,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS0",
         .match        = 0x400,
         .match_mask   = 0x400,
@@ -4166,7 +4165,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS1",
         .match        = 0x402,
         .match_mask   = 0x402,
@@ -4180,7 +4179,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS2",
         .match        = 0x404,
         .match_mask   = 0x404,
@@ -4194,7 +4193,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS3",
         .match        = 0x408,
         .match_mask   = 0x408,
@@ -4208,7 +4207,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS4",
         .match        = 0x410,
         .match_mask   = 0x410,
@@ -4222,7 +4221,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS5",
         .match        = 0x420,
         .match_mask   = 0x420,
@@ -4236,7 +4235,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS6",
         .match        = 0x440,
         .match_mask   = 0x440,
@@ -4250,7 +4249,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH",
         .match        = 0x480,
         .match_mask   = 0x480,
@@ -4264,7 +4263,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW",
         .match        = 0x500,
         .match_mask   = 0x500,
@@ -4278,7 +4277,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3ffff,
@@ -4292,7 +4291,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_P_1588",
         .match        = 0x2800,
         .match_mask   = 0x3800,
@@ -4306,7 +4305,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_1 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_1",
         .match        = 0x34000,
         .match_mask   = 0x3c000,
@@ -4320,7 +4319,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_2 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_2",
         .match        = 0x280,
         .match_mask   = 0x7c0,
@@ -4334,7 +4333,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_RARP",
         .match        = 0x14000,
         .match_mask   = 0x3c000,
@@ -4348,7 +4347,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_1 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_1",
         .match        = 0x20000,
         .match_mask   = 0x3c000,
@@ -4362,7 +4361,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_2 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_2",
         .match        = 0x1c0,
         .match_mask   = 0x7c0,
@@ -4376,7 +4375,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_SEG_ROUT_EXT_1 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_SEG_ROUT_EXT_1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_SEG_ROUT_EXT_1",
         .match        = 0x18000,
         .match_mask   = 0x3c000,
@@ -4390,7 +4389,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x8,
         .match_mask   = 0x418,
@@ -4404,7 +4403,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x28,
         .match_mask   = 0x438,
@@ -4418,7 +4417,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UDP",
         .match        = 0x10,
         .match_mask   = 0x418,
@@ -4432,7 +4431,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3",
         .match        = 0x1c000,
         .match_mask   = 0x3c000,
@@ -4446,7 +4445,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x2000,
         .match_mask   = 0x3800,
@@ -4460,7 +4459,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x3800,
         .match_mask   = 0x3800,
@@ -4474,7 +4473,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_VXLAN",
         .match        = 0x810,
         .match_mask   = 0x3c18,
@@ -4488,7 +4487,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_1 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_1",
         .match        = 0x28000,
         .match_mask   = 0x3c000,
@@ -4502,7 +4501,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_2 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_2",
         .match        = 0x180,
         .match_mask   = 0x7c0,
@@ -4516,7 +4515,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH */
         .name         = "EGRESS_PKT_SYS_HDR_EP_NIH",
         .match        = 0x2,
         .match_mask   = 0x3,
@@ -4530,7 +4529,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK */
         .name         = "EGRESS_PKT_SYS_HDR_LOOPBACK",
         .match        = 0x1,
         .match_mask   = 0x3,
@@ -4544,7 +4543,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE */
         .name         = "EGRESS_PKT_SYS_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3,
@@ -4558,7 +4557,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_CNTAG */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_CNTAG */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_CNTAG",
         .match        = 0x100,
         .match_mask   = 0x180,
@@ -4572,7 +4571,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_GBP_ETHERNET_SHIM */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_GBP_ETHERNET_SHIM */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_GBP_ETHERNET_SHIM",
         .match        = 0x80,
         .match_mask   = 0x180,
@@ -4586,7 +4585,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -4600,7 +4599,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0 */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0",
         .match        = 0x10,
         .match_mask   = 0x10,
@@ -4614,7 +4613,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_ITAG",
         .match        = 0x40,
         .match_mask   = 0x40,
@@ -4628,7 +4627,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2 */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_L2",
         .match        = 0x2,
         .match_mask   = 0x2,
@@ -4642,7 +4641,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x1ff,
@@ -4656,7 +4655,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_OTAG",
         .match        = 0x20,
         .match_mask   = 0x20,
@@ -4670,7 +4669,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC",
         .match        = 0x4,
         .match_mask   = 0x4,
@@ -4684,7 +4683,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SVTAG */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SVTAG */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_SVTAG",
         .match        = 0x8,
         .match_mask   = 0x8,
@@ -4698,7 +4697,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP",
         .match        = 0x4000,
         .match_mask   = 0x3c000,
@@ -4712,7 +4711,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1",
         .match        = 0x24000,
         .match_mask   = 0x3c000,
@@ -4726,7 +4725,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2",
         .match        = 0x140,
         .match_mask   = 0x7c0,
@@ -4740,7 +4739,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD",
         .match        = 0x3000,
         .match_mask   = 0x3800,
@@ -4754,7 +4753,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_1 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_1",
         .match        = 0x2c000,
         .match_mask   = 0x3c000,
@@ -4768,7 +4767,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_2 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_2",
         .match        = 0x200,
         .match_mask   = 0x7c0,
@@ -4782,7 +4781,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT",
         .match        = 0x40,
         .match_mask   = 0x7c0,
@@ -4796,7 +4795,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -4810,7 +4809,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1",
         .match        = 0x30000,
         .match_mask   = 0x3c000,
@@ -4824,7 +4823,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2",
         .match        = 0x240,
         .match_mask   = 0x7c0,
@@ -4838,7 +4837,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE",
         .match        = 0x30,
         .match_mask   = 0x438,
@@ -4852,7 +4851,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE",
         .match        = 0x18,
         .match_mask   = 0x418,
@@ -4866,7 +4865,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM",
         .match        = 0x80,
         .match_mask   = 0x7c0,
@@ -4880,7 +4879,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY",
         .match        = 0x1800,
         .match_mask   = 0x3800,
@@ -4894,7 +4893,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT",
         .match        = 0x10000,
         .match_mask   = 0x3c000,
@@ -4908,7 +4907,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ",
         .match        = 0x38,
         .match_mask   = 0x438,
@@ -4922,7 +4921,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_1 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_1",
         .match        = 0x8000,
         .match_mask   = 0x3c000,
@@ -4936,7 +4935,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_2 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_2",
         .match        = 0xc0,
         .match_mask   = 0x7c0,
@@ -4950,7 +4949,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP",
         .match        = 0x800,
         .match_mask   = 0x3818,
@@ -4964,7 +4963,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_HEADER */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_HEADER */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_HEADER",
         .match        = 0x2c0,
         .match_mask   = 0x7c0,
@@ -4978,7 +4977,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA_BASE */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA_BASE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA_BASE",
         .match        = 0xc000,
         .match_mask   = 0x3c000,
@@ -4992,7 +4991,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP",
         .match        = 0x100,
         .match_mask   = 0x7c0,
@@ -5006,7 +5005,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IOAM_E2E */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IOAM_E2E */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IOAM_E2E",
         .match        = 0x1000,
         .match_mask   = 0x3800,
@@ -5020,7 +5019,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4",
         .match        = 0x2,
         .match_mask   = 0x406,
@@ -5034,7 +5033,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6",
         .match        = 0x4,
         .match_mask   = 0x406,
@@ -5048,7 +5047,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0",
         .match        = 0x400,
         .match_mask   = 0x400,
@@ -5062,7 +5061,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1",
         .match        = 0x402,
         .match_mask   = 0x402,
@@ -5076,7 +5075,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2",
         .match        = 0x404,
         .match_mask   = 0x404,
@@ -5090,7 +5089,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3",
         .match        = 0x408,
         .match_mask   = 0x408,
@@ -5104,7 +5103,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4",
         .match        = 0x410,
         .match_mask   = 0x410,
@@ -5118,7 +5117,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5",
         .match        = 0x420,
         .match_mask   = 0x420,
@@ -5132,7 +5131,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6",
         .match        = 0x440,
         .match_mask   = 0x440,
@@ -5146,7 +5145,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH",
         .match        = 0x480,
         .match_mask   = 0x480,
@@ -5160,7 +5159,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW",
         .match        = 0x500,
         .match_mask   = 0x500,
@@ -5174,7 +5173,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3ffff,
@@ -5188,7 +5187,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588",
         .match        = 0x2800,
         .match_mask   = 0x3800,
@@ -5202,7 +5201,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_1 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_1",
         .match        = 0x34000,
         .match_mask   = 0x3c000,
@@ -5216,7 +5215,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_2 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_2",
         .match        = 0x280,
         .match_mask   = 0x7c0,
@@ -5230,7 +5229,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP",
         .match        = 0x14000,
         .match_mask   = 0x3c000,
@@ -5244,7 +5243,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_1 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_1",
         .match        = 0x20000,
         .match_mask   = 0x3c000,
@@ -5258,7 +5257,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_2 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_2",
         .match        = 0x1c0,
         .match_mask   = 0x7c0,
@@ -5272,7 +5271,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_SEG_ROUT_EXT_1 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_SEG_ROUT_EXT_1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_SEG_ROUT_EXT_1",
         .match        = 0x18000,
         .match_mask   = 0x3c000,
@@ -5286,7 +5285,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x8,
         .match_mask   = 0x418,
@@ -5300,7 +5299,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x28,
         .match_mask   = 0x438,
@@ -5314,7 +5313,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP",
         .match        = 0x10,
         .match_mask   = 0x418,
@@ -5328,7 +5327,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3",
         .match        = 0x1c000,
         .match_mask   = 0x3c000,
@@ -5342,7 +5341,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x2000,
         .match_mask   = 0x3800,
@@ -5356,7 +5355,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x3800,
         .match_mask   = 0x3800,
@@ -5370,7 +5369,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN",
         .match        = 0x810,
         .match_mask   = 0x3c18,
@@ -5384,7 +5383,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_1 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_1",
         .match        = 0x28000,
         .match_mask   = 0x3c000,
@@ -5398,7 +5397,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_2 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_2",
         .match        = 0x180,
         .match_mask   = 0x7c0,
@@ -5412,7 +5411,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_CNTAG */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_CNTAG */
         .name         = "INGRESS_PKT_INNER_L2_HDR_CNTAG",
         .match        = 0x100,
         .match_mask   = 0x180,
@@ -5426,11 +5425,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 20,
         .arc_id_mask  = 0x1f00000,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_cntag,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_cntag,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG */
         .name         = "INGRESS_PKT_INNER_L2_HDR_ITAG",
         .match        = 0x40,
         .match_mask   = 0x40,
@@ -5444,11 +5443,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 20,
         .arc_id_mask  = 0x1f00000,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_itag,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_itag,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2 */
         .name         = "INGRESS_PKT_INNER_L2_HDR_L2",
         .match        = 0x2,
         .match_mask   = 0x2,
@@ -5462,11 +5461,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 20,
         .arc_id_mask  = 0x1f00000,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_l2,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_l2,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE */
         .name         = "INGRESS_PKT_INNER_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x1ff,
@@ -5482,7 +5481,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG */
         .name         = "INGRESS_PKT_INNER_L2_HDR_OTAG",
         .match        = 0x20,
         .match_mask   = 0x20,
@@ -5496,11 +5495,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 20,
         .arc_id_mask  = 0x1f00000,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_otag,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_otag,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC */
         .name         = "INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC",
         .match        = 0x4,
         .match_mask   = 0x4,
@@ -5514,11 +5513,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 20,
         .arc_id_mask  = 0x1f00000,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_snap_or_llc,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_snap_or_llc,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ARP",
         .match        = 0x4000,
         .match_mask   = 0x3c000,
@@ -5532,11 +5531,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_arp,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_arp,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1",
         .match        = 0x24000,
         .match_mask   = 0x3c000,
@@ -5550,11 +5549,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 39,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_auth_ext_1,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_auth_ext_1,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2",
         .match        = 0x140,
         .match_mask   = 0x7c0,
@@ -5568,11 +5567,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 55,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_auth_ext_2,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_auth_ext_2,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_BFD",
         .match        = 0x3000,
         .match_mask   = 0x3800,
@@ -5586,11 +5585,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 57,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_bfd,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_bfd,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_1 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_1 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_1",
         .match        = 0x2c000,
         .match_mask   = 0x3c000,
@@ -5604,11 +5603,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 42,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_dest_opt_ext_1,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_dest_opt_ext_1,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_2 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_2 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_2",
         .match        = 0x200,
         .match_mask   = 0x7c0,
@@ -5622,11 +5621,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 55,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_dest_opt_ext_2,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_dest_opt_ext_2,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT",
         .match        = 0x40,
         .match_mask   = 0x7c0,
@@ -5640,11 +5639,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 55,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_esp_ext,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_esp_ext,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -5658,11 +5657,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 29,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ethertype,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ethertype,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1",
         .match        = 0x30000,
         .match_mask   = 0x3c000,
@@ -5676,11 +5675,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 45,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_frag_ext_1,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_frag_ext_1,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2",
         .match        = 0x240,
         .match_mask   = 0x7c0,
@@ -5694,11 +5693,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 56,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_frag_ext_2,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_frag_ext_2,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_1 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_1 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_1",
         .match        = 0x8000,
         .match_mask   = 0x3c000,
@@ -5712,11 +5711,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 48,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_hop_by_hop_ext_1,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_hop_by_hop_ext_1,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_2 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_2 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_2",
         .match        = 0xc0,
         .match_mask   = 0x7c0,
@@ -5730,11 +5729,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 56,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_hop_by_hop_ext_2,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_hop_by_hop_ext_2,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ICMP",
         .match        = 0x800,
         .match_mask   = 0x3818,
@@ -5748,11 +5747,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 57,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_icmp,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_icmp,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_HEADER */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_HEADER */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_IFA_HEADER",
         .match        = 0x2c0,
         .match_mask   = 0x7c0,
@@ -5766,11 +5765,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 48,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ifa_header,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ifa_header,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA_BASE */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA_BASE */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA_BASE",
         .match        = 0xc000,
         .match_mask   = 0x3c000,
@@ -5784,11 +5783,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 48,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ifa_metadata_base,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ifa_metadata_base,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_IGMP",
         .match        = 0x100,
         .match_mask   = 0x7c0,
@@ -5802,11 +5801,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 36,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_igmp,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_igmp,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_IPV4",
         .match        = 0x2,
         .match_mask   = 0x406,
@@ -5820,11 +5819,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 36,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ipv4,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ipv4,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_IPV6",
         .match        = 0x4,
         .match_mask   = 0x406,
@@ -5838,11 +5837,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 58,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ipv6,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ipv6,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3ffff,
@@ -5858,7 +5857,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_P_1588",
         .match        = 0x2800,
         .match_mask   = 0x3800,
@@ -5872,11 +5871,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 58,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_p_1588,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_p_1588,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_1 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_1 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_1",
         .match        = 0x34000,
         .match_mask   = 0x3c000,
@@ -5890,11 +5889,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 51,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_prog_ext_1,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_prog_ext_1,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_2 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_2 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_2",
         .match        = 0x280,
         .match_mask   = 0x7c0,
@@ -5908,11 +5907,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 57,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_prog_ext_2,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_prog_ext_2,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_RARP",
         .match        = 0x14000,
         .match_mask   = 0x3c000,
@@ -5926,11 +5925,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 29,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rarp,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rarp,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_1 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_1 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_1",
         .match        = 0x20000,
         .match_mask   = 0x3c000,
@@ -5944,11 +5943,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 54,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rout_ext_1,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rout_ext_1,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_2 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_2 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_2",
         .match        = 0x1c0,
         .match_mask   = 0x7c0,
@@ -5962,11 +5961,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 57,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rout_ext_2,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rout_ext_2,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x8,
         .match_mask   = 0x418,
@@ -5980,11 +5979,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 57,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_tcp_first_4bytes,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_tcp_first_4bytes,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x28,
         .match_mask   = 0x438,
@@ -5998,11 +5997,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 57,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_tcp_last_16bytes,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_tcp_last_16bytes,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UDP",
         .match        = 0x10,
         .match_mask   = 0x418,
@@ -6016,11 +6015,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 58,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_udp,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_udp,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3",
         .match        = 0x1c000,
         .match_mask   = 0x3c000,
@@ -6034,11 +6033,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 29,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l3,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l3,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x2000,
         .match_mask   = 0x3800,
@@ -6052,11 +6051,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 58,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l4,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l4,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x3800,
         .match_mask   = 0x3800,
@@ -6070,11 +6069,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 58,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l5,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l5,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_1 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_1 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_1",
         .match        = 0x28000,
         .match_mask   = 0x3c000,
@@ -6088,11 +6087,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 58,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_wesp_ext_1,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_wesp_ext_1,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_2 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_2 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_2",
         .match        = 0x180,
         .match_mask   = 0x7c0,
@@ -6106,11 +6105,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 58,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_wesp_ext_2,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_wesp_ext_2,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_CNTAG */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_CNTAG */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_CNTAG",
         .match        = 0x100,
         .match_mask   = 0x180,
@@ -6124,11 +6123,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 2,
         .arc_id_mask  = 0x1fc,
         .num_zone_bmp_words = 4,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_cntag,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_cntag,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_GBP_ETHERNET_SHIM */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_GBP_ETHERNET_SHIM */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_GBP_ETHERNET_SHIM",
         .match        = 0x80,
         .match_mask   = 0x180,
@@ -6142,11 +6141,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 2,
         .arc_id_mask  = 0x1fc,
         .num_zone_bmp_words = 4,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_gbp_ethernet_shim,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_gbp_ethernet_shim,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_BASE */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_BASE */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_HG3_BASE",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -6160,11 +6159,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 2,
         .arc_id_mask  = 0x1fc,
         .num_zone_bmp_words = 4,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_hg3_base,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_hg3_base,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0 */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0",
         .match        = 0x10,
         .match_mask   = 0x10,
@@ -6178,11 +6177,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 2,
         .arc_id_mask  = 0x1fc,
         .num_zone_bmp_words = 4,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_hg3_ext_0,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_hg3_ext_0,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_ITAG",
         .match        = 0x40,
         .match_mask   = 0x40,
@@ -6196,11 +6195,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 2,
         .arc_id_mask  = 0x1fc,
         .num_zone_bmp_words = 4,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_itag,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_itag,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2 */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_L2",
         .match        = 0x2,
         .match_mask   = 0x2,
@@ -6214,11 +6213,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 2,
         .arc_id_mask  = 0x1fc,
         .num_zone_bmp_words = 4,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_l2,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_l2,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x1ff,
@@ -6234,7 +6233,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_OTAG",
         .match        = 0x20,
         .match_mask   = 0x20,
@@ -6248,11 +6247,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 2,
         .arc_id_mask  = 0x1fc,
         .num_zone_bmp_words = 4,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_otag,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_otag,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC",
         .match        = 0x4,
         .match_mask   = 0x4,
@@ -6266,11 +6265,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 2,
         .arc_id_mask  = 0x1fc,
         .num_zone_bmp_words = 4,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_snap_or_llc,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_snap_or_llc,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SVTAG */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SVTAG */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_SVTAG",
         .match        = 0x8,
         .match_mask   = 0x8,
@@ -6284,11 +6283,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 2,
         .arc_id_mask  = 0x1fc,
         .num_zone_bmp_words = 4,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_svtag,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_svtag,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ARP",
         .match        = 0x4000,
         .match_mask   = 0x3c000,
@@ -6302,11 +6301,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_arp,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_arp,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1",
         .match        = 0x24000,
         .match_mask   = 0x3c000,
@@ -6320,11 +6319,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 14,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_auth_ext_1,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_auth_ext_1,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2",
         .match        = 0x140,
         .match_mask   = 0x7c0,
@@ -6338,11 +6337,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 35,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_auth_ext_2,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_auth_ext_2,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_BFD",
         .match        = 0x3000,
         .match_mask   = 0x3800,
@@ -6356,11 +6355,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 40,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_bfd,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_bfd,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_1 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_1",
         .match        = 0x2c000,
         .match_mask   = 0x3c000,
@@ -6374,11 +6373,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 18,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_dest_opt_ext_1,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_dest_opt_ext_1,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_2 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_2",
         .match        = 0x200,
         .match_mask   = 0x7c0,
@@ -6392,11 +6391,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 36,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_dest_opt_ext_2,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_dest_opt_ext_2,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT",
         .match        = 0x40,
         .match_mask   = 0x7c0,
@@ -6410,11 +6409,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 36,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_esp_ext,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_esp_ext,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -6428,11 +6427,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 40,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ethertype,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ethertype,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1",
         .match        = 0x30000,
         .match_mask   = 0x3c000,
@@ -6446,11 +6445,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 21,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_frag_ext_1,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_frag_ext_1,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2",
         .match        = 0x240,
         .match_mask   = 0x7c0,
@@ -6464,11 +6463,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 36,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_frag_ext_2,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_frag_ext_2,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GPE",
         .match        = 0x30,
         .match_mask   = 0x438,
@@ -6482,11 +6481,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 38,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gpe,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gpe,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE",
         .match        = 0x18,
         .match_mask   = 0x418,
@@ -6500,11 +6499,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 22,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM",
         .match        = 0x80,
         .match_mask   = 0x7c0,
@@ -6518,11 +6517,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 22,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_chksum,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_chksum,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY",
         .match        = 0x1800,
         .match_mask   = 0x3800,
@@ -6536,11 +6535,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 22,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_key,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_key,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT",
         .match        = 0x10000,
         .match_mask   = 0x3c000,
@@ -6554,11 +6553,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 22,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_rout,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_rout,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ",
         .match        = 0x38,
         .match_mask   = 0x438,
@@ -6572,11 +6571,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 22,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_seq,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_seq,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_1 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_1",
         .match        = 0x8000,
         .match_mask   = 0x3c000,
@@ -6590,11 +6589,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 26,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_hop_by_hop_ext_1,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_hop_by_hop_ext_1,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_2 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_2",
         .match        = 0xc0,
         .match_mask   = 0x7c0,
@@ -6608,11 +6607,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 37,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_hop_by_hop_ext_2,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_hop_by_hop_ext_2,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ICMP",
         .match        = 0x800,
         .match_mask   = 0x3818,
@@ -6626,11 +6625,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 38,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_icmp,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_icmp,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_HEADER */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_HEADER */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IFA_HEADER",
         .match        = 0x2c0,
         .match_mask   = 0x7c0,
@@ -6644,11 +6643,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 26,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ifa_header,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ifa_header,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA_BASE */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA_BASE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA_BASE",
         .match        = 0xc000,
         .match_mask   = 0x3c000,
@@ -6662,11 +6661,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 26,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ifa_metadata_base,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ifa_metadata_base,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IGMP",
         .match        = 0x100,
         .match_mask   = 0x7c0,
@@ -6679,12 +6678,12 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .pminbit      = 11,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
-        .num_zone_bmp_words = 10,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_igmp,
+        .num_zone_bmp_words = 8,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_igmp,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IOAM_E2E */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IOAM_E2E */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IOAM_E2E",
         .match        = 0x1000,
         .match_mask   = 0x3800,
@@ -6698,11 +6697,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 38,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ioam_e2e,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ioam_e2e,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IPV4",
         .match        = 0x2,
         .match_mask   = 0x406,
@@ -6716,11 +6715,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 10,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ipv4,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ipv4,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IPV6",
         .match        = 0x4,
         .match_mask   = 0x406,
@@ -6734,11 +6733,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 39,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ipv6,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ipv6,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0",
         .match        = 0x400,
         .match_mask   = 0x400,
@@ -6752,11 +6751,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 40,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls0,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls0,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1",
         .match        = 0x402,
         .match_mask   = 0x402,
@@ -6770,11 +6769,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 40,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls1,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls1,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2",
         .match        = 0x404,
         .match_mask   = 0x404,
@@ -6788,11 +6787,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 39,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls2,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls2,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3",
         .match        = 0x408,
         .match_mask   = 0x408,
@@ -6806,11 +6805,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 39,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls3,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls3,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4",
         .match        = 0x410,
         .match_mask   = 0x410,
@@ -6824,11 +6823,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 39,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls4,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls4,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5",
         .match        = 0x420,
         .match_mask   = 0x420,
@@ -6842,11 +6841,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 39,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls5,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls5,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6",
         .match        = 0x440,
         .match_mask   = 0x440,
@@ -6860,11 +6859,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 39,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls6,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls6,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH",
         .match        = 0x480,
         .match_mask   = 0x480,
@@ -6878,11 +6877,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 40,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls_ach,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls_ach,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW",
         .match        = 0x500,
         .match_mask   = 0x500,
@@ -6896,11 +6895,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 40,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls_cw,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls_cw,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3ffff,
@@ -6916,7 +6915,7 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_P_1588",
         .match        = 0x2800,
         .match_mask   = 0x3800,
@@ -6930,11 +6929,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 40,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_p_1588,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_p_1588,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_1 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_1",
         .match        = 0x34000,
         .match_mask   = 0x3c000,
@@ -6948,11 +6947,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 30,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_prog_ext_1,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_prog_ext_1,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_2 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_2",
         .match        = 0x280,
         .match_mask   = 0x7c0,
@@ -6966,11 +6965,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 37,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_prog_ext_2,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_prog_ext_2,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_RARP",
         .match        = 0x14000,
         .match_mask   = 0x3c000,
@@ -6984,11 +6983,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 40,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rarp,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rarp,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_1 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_1",
         .match        = 0x20000,
         .match_mask   = 0x3c000,
@@ -7002,11 +7001,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 34,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rout_ext_1,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rout_ext_1,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_2 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_2",
         .match        = 0x1c0,
         .match_mask   = 0x7c0,
@@ -7020,11 +7019,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 38,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rout_ext_2,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rout_ext_2,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_SEG_ROUT_EXT_1 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_SEG_ROUT_EXT_1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_SEG_ROUT_EXT_1",
         .match        = 0x18000,
         .match_mask   = 0x3c000,
@@ -7038,11 +7037,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 34,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_seg_rout_ext_1,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_seg_rout_ext_1,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x8,
         .match_mask   = 0x418,
@@ -7056,11 +7055,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 38,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_tcp_first_4bytes,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_tcp_first_4bytes,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x28,
         .match_mask   = 0x438,
@@ -7074,11 +7073,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 38,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_tcp_last_16bytes,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_tcp_last_16bytes,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UDP",
         .match        = 0x10,
         .match_mask   = 0x418,
@@ -7092,11 +7091,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 39,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_udp,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_udp,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3",
         .match        = 0x1c000,
         .match_mask   = 0x3c000,
@@ -7110,11 +7109,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 40,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l3,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l3,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x2000,
         .match_mask   = 0x3800,
@@ -7128,11 +7127,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 39,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l4,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l4,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x3800,
         .match_mask   = 0x3800,
@@ -7145,12 +7144,12 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .pminbit      = 11,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
-        .num_zone_bmp_words = 38,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l5,
+        .num_zone_bmp_words = 39,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l5,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN",
         .match        = 0x810,
         .match_mask   = 0x3c18,
@@ -7164,11 +7163,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 39,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_vxlan,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_vxlan,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_1 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_1",
         .match        = 0x28000,
         .match_mask   = 0x3c000,
@@ -7182,11 +7181,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 39,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_wesp_ext_1,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_wesp_ext_1,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_2 */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_2",
         .match        = 0x180,
         .match_mask   = 0x7c0,
@@ -7200,11 +7199,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 39,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_wesp_ext_2,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_wesp_ext_2,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH */
         .name         = "INGRESS_PKT_SYS_HDR_EP_NIH",
         .match        = 0x2,
         .match_mask   = 0x3,
@@ -7218,11 +7217,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 0,
         .arc_id_mask  = 0x3,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_sys_hdr_ep_nih,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_sys_hdr_ep_nih,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK */
         .name         = "INGRESS_PKT_SYS_HDR_LOOPBACK",
         .match        = 0x1,
         .match_mask   = 0x3,
@@ -7236,11 +7235,11 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
         .zone_minbit  = 0,
         .arc_id_mask  = 0x3,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm56890_a0_dna_6_5_30_8_0_rxpmd_arc_ingress_pkt_sys_hdr_loopback,
+        .zone_bmp = bcm56890_a0_dna_6_5_31_6_0_rxpmd_arc_ingress_pkt_sys_hdr_loopback,
 
     },
     {
-        /* BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE */
+        /* BCM56890_A0_DNA_6_5_31_6_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE */
         .name         = "INGRESS_PKT_SYS_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3,
@@ -7257,23 +7256,23 @@ bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db[BCM56890_A0_DNA_6_5_30_8_0_RXPMD_MA
     },
 };
 
-static bcmpkt_rxpmd_match_id_db_info_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db_info = {
+static bcmpkt_rxpmd_match_id_db_info_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_match_id_db_info = {
     .num_entries = 228,
-    .db = bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db
+    .db = bcm56890_a0_dna_6_5_31_6_0_rxpmd_match_id_db
 };
-bcmpkt_rxpmd_match_id_db_info_t * bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db_info_get(void) {
-    return &bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_db_info;
+bcmpkt_rxpmd_match_id_db_info_t * bcm56890_a0_dna_6_5_31_6_0_rxpmd_match_id_db_info_get(void) {
+    return &bcm56890_a0_dna_6_5_31_6_0_rxpmd_match_id_db_info;
 }
 
-static shr_enum_map_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_map[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT
+static shr_enum_map_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_match_id_map[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_rxpmd_match_id_map_info_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_map_info = {
+static bcmpkt_rxpmd_match_id_map_info_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_match_id_map_info = {
     .num_entries = 228,
-    .map = bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_map
+    .map = bcm56890_a0_dna_6_5_31_6_0_rxpmd_match_id_map
 };
 
-bcmpkt_rxpmd_match_id_map_info_t * bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_map_info_get(void) {
-    return &bcm56890_a0_dna_6_5_30_8_0_rxpmd_match_id_map_info;
+bcmpkt_rxpmd_match_id_map_info_t * bcm56890_a0_dna_6_5_31_6_0_rxpmd_match_id_map_info_get(void) {
+    return &bcm56890_a0_dna_6_5_31_6_0_rxpmd_match_id_map_info;
 }
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_pkt_flexhdr.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_pkt_flexhdr.c
similarity index 84%
rename from platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_pkt_flexhdr.c
rename to platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_pkt_flexhdr.c
index f969be32b491..8b12d1f1e4fc 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_pkt_flexhdr.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_pkt_flexhdr.c
@@ -3,7 +3,7 @@
  * DO NOT EDIT THIS FILE!
  * This file is auto-generated by xfc_map_parser
  * from the NPL output file(s) map.yml
- * for device bcm56890_a0 and variant dna_6_5_30_8_0.
+ * for device bcm56890_a0 and variant dna_6_5_31_6_0.
  * Edits to this file will be lost when it is regenerated.
  *
  * $Id: $
@@ -31,321 +31,321 @@
 #include <shr/shr_error.h>
 #include <bcmpkt/bcmpkt_flexhdr.h>
 #include <bcmpkt/chip/bcm56890_a0/bcmpkt_bcm56890_a0_rxpmd.h>
-#include <bcmpkt/xfcr/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_bcmpkt_flexhdr.h>
-#include <bcmpkt/xfcr/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_bcmpkt_flexhdr_data.h>
-#include <bcmpkt/xfcr/bcm56890_a0/dna_6_5_30_8_0/bcm56890_a0_dna_6_5_30_8_0_bcmpkt_rxpmd_flex_data.h>
+#include <bcmpkt/xfcr/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_bcmpkt_flexhdr.h>
+#include <bcmpkt/xfcr/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_bcmpkt_flexhdr_data.h>
+#include <bcmpkt/xfcr/bcm56890_a0/dna_6_5_31_6_0/bcm56890_a0_dna_6_5_31_6_0_bcmpkt_rxpmd_flex_data.h>
 
 #define MASK(_bn) (((uint32_t)0x1<<(_bn))-1)
 #define WORD_FIELD_GET(_d,_s,_l) (((_d) >> (_s)) & MASK(_l))
 #define WORD_FIELD_SET(_d,_s,_l,_v) (_d)=(((_d) & ~(MASK(_l) << (_s))) | (((_v) & MASK(_l)) << (_s)))
 #define WORD_FIELD_MASK(_d,_s,_l) (_d)=((_d) | (MASK(_l) << (_s)))
 
-static void bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_reason_decode(uint32_t *data, bcmpkt_bitmap_t *reasons)
+static void bcm56890_a0_dna_6_5_31_6_0_rxpmd_flex_reason_decode(uint32_t *data, bcmpkt_bitmap_t *reasons)
 {
     uint32_t *reason = data + 0;
 
     if (reason[13] & (0x1 << 0)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU);
     }
     if (reason[13] & (0x1 << 1)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS);
     }
     if (reason[13] & (0x1 << 2)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE);
     }
     if (reason[13] & (0x1 << 3)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT_HPAE_MISS);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT_HPAE_MISS);
     }
     if (reason[13] & (0x1 << 4)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD);
     }
     if (reason[13] & (0x1 << 5)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED);
     }
     if (reason[13] & (0x1 << 6)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT);
     }
     if (reason[13] & (0x1 << 7)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD);
     }
     if (reason[13] & (0x1 << 8)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD);
     }
     if (reason[13] & (0x1 << 9)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS);
     }
     if (reason[13] & (0x1 << 10)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP);
     }
     if (reason[13] & (0x1 << 11)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS);
     }
     if (reason[13] & (0x1 << 12)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP);
     }
     if (reason[13] & (0x1 << 13)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR);
     }
     if (reason[13] & (0x1 << 14)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR);
     }
     if (reason[13] & (0x1 << 15)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED);
     }
     if (reason[13] & (0x1 << 16)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL);
     }
     if (reason[13] & (0x1 << 17)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_VFP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_VFP);
     }
     if (reason[13] & (0x1 << 18)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_IFP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_IFP);
     }
     if (reason[13] & (0x1 << 19)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER);
     }
     if (reason[13] & (0x1 << 20)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP);
     }
     if (reason[13] & (0x1 << 21)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_SVP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_SVP);
     }
     if (reason[13] & (0x1 << 22)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT);
     }
     if (reason[13] & (0x1 << 23)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT);
     }
     if (reason[13] & (0x1 << 24)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED);
     }
     if (reason[13] & (0x1 << 25)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED);
     }
     if (reason[13] & (0x1 << 26)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP);
     }
     if (reason[13] & (0x1 << 27)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED);
     }
     if (reason[13] & (0x1 << 28)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF);
     }
     if (reason[13] & (0x1 << 29)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED);
     }
     if (reason[13] & (0x1 << 30)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED);
     }
     if (reason[13] & (0x1 << 31)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU);
     }
     if (reason[12] & (0x1 << 0)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0);
     }
     if (reason[12] & (0x1 << 1)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1);
     }
     if (reason[12] & (0x1 << 2)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2);
     }
     if (reason[12] & (0x1 << 3)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3);
     }
     if (reason[12] & (0x1 << 4)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4);
     }
     if (reason[12] & (0x1 << 5)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5);
     }
     if (reason[12] & (0x1 << 6)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6);
     }
     if (reason[12] & (0x1 << 7)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7);
     }
     if (reason[12] & (0x1 << 8)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_DEFAULT);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_DEFAULT);
     }
     if (reason[12] & (0x1 << 9)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED);
     }
     if (reason[12] & (0x1 << 10)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED);
     }
     if (reason[12] & (0x1 << 11)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_SRV6);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_SRV6);
     }
     if (reason[12] & (0x1 << 12)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR);
     }
     if (reason[12] & (0x1 << 13)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU);
     }
     if (reason[12] & (0x1 << 14)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE);
     }
     if (reason[12] & (0x1 << 15)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP);
     }
 }
 
-static void bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_reason_encode(bcmpkt_bitmap_t *reasons, uint32_t *data)
+static void bcm56890_a0_dna_6_5_31_6_0_rxpmd_flex_reason_encode(bcmpkt_bitmap_t *reasons, uint32_t *data)
 {
     uint32_t *reason = data + 0;
 
     reason[13] = 0;
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU)) {
         reason[13] |= (0x1 << 0);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS)) {
         reason[13] |= (0x1 << 1);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE)) {
         reason[13] |= (0x1 << 2);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT_HPAE_MISS)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT_HPAE_MISS)) {
         reason[13] |= (0x1 << 3);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD)) {
         reason[13] |= (0x1 << 4);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED)) {
         reason[13] |= (0x1 << 5);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT)) {
         reason[13] |= (0x1 << 6);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD)) {
         reason[13] |= (0x1 << 7);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD)) {
         reason[13] |= (0x1 << 8);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS)) {
         reason[13] |= (0x1 << 9);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP)) {
         reason[13] |= (0x1 << 10);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS)) {
         reason[13] |= (0x1 << 11);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP)) {
         reason[13] |= (0x1 << 12);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR)) {
         reason[13] |= (0x1 << 13);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR)) {
         reason[13] |= (0x1 << 14);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED)) {
         reason[13] |= (0x1 << 15);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL)) {
         reason[13] |= (0x1 << 16);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_VFP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_VFP)) {
         reason[13] |= (0x1 << 17);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_IFP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_IFP)) {
         reason[13] |= (0x1 << 18);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER)) {
         reason[13] |= (0x1 << 19);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP)) {
         reason[13] |= (0x1 << 20);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_SVP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_SVP)) {
         reason[13] |= (0x1 << 21);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT)) {
         reason[13] |= (0x1 << 22);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT)) {
         reason[13] |= (0x1 << 23);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED)) {
         reason[13] |= (0x1 << 24);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED)) {
         reason[13] |= (0x1 << 25);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP)) {
         reason[13] |= (0x1 << 26);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED)) {
         reason[13] |= (0x1 << 27);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF)) {
         reason[13] |= (0x1 << 28);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED)) {
         reason[13] |= (0x1 << 29);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED)) {
         reason[13] |= (0x1 << 30);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU)) {
         reason[13] |= (0x1 << 31);
     }
     reason[12] = 0;
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0)) {
         reason[12] |= (0x1 << 0);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1)) {
         reason[12] |= (0x1 << 1);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2)) {
         reason[12] |= (0x1 << 2);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3)) {
         reason[12] |= (0x1 << 3);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4)) {
         reason[12] |= (0x1 << 4);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5)) {
         reason[12] |= (0x1 << 5);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6)) {
         reason[12] |= (0x1 << 6);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7)) {
         reason[12] |= (0x1 << 7);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_DEFAULT)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_DEFAULT)) {
         reason[12] |= (0x1 << 8);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED)) {
         reason[12] |= (0x1 << 9);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED)) {
         reason[12] |= (0x1 << 10);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_SRV6)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_SRV6)) {
         reason[12] |= (0x1 << 11);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR)) {
         reason[12] |= (0x1 << 12);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU)) {
         reason[12] |= (0x1 << 13);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE)) {
         reason[12] |= (0x1 << 14);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP)) {
         reason[12] |= (0x1 << 15);
     }
 }
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_data[] = {
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_flex_field_data[] = {
     {
         .name = "BSCAN_CONTROL_DATA_15_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_BSCAN_CONTROL_DATA_15_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_BSCAN_CONTROL_DATA_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -410,7 +410,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "BSCAN_CONTROL_FLAGS_3_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_BSCAN_CONTROL_FLAGS_3_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_BSCAN_CONTROL_FLAGS_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -475,7 +475,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "DLB_ECMP_DESTINATION_15_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_DLB_ECMP_DESTINATION_15_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_DLB_ECMP_DESTINATION_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -540,7 +540,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "DNAT_CTRL_3_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_DNAT_CTRL_3_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_DNAT_CTRL_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -604,7 +604,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "DROP_CODE_15_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -669,7 +669,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "DVP_15_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_DVP_15_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_DVP_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -734,7 +734,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "EFFECTIVE_TTL_AND_SNAT_CTRL_15_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_AND_SNAT_CTRL_15_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_AND_SNAT_CTRL_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -799,7 +799,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "EM_FT_OPAQUE_OBJ_OR_IFP_OPAQUE_OBJ_15_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_EM_FT_OPAQUE_OBJ_OR_IFP_OPAQUE_OBJ_15_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_EM_FT_OPAQUE_OBJ_OR_IFP_OPAQUE_OBJ_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -850,7 +850,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "ENTROPY_LABEL_HIGH_3_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_HIGH_3_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_HIGH_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -915,7 +915,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "ENTROPY_LABEL_LOW_15_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -980,7 +980,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "EP_NIH_DROP_CODE_OR_IFP_OPAQUE_OBJ_15_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_EP_NIH_DROP_CODE_OR_IFP_OPAQUE_OBJ_15_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_EP_NIH_DROP_CODE_OR_IFP_OPAQUE_OBJ_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1041,7 +1041,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "EP_NIH_HDR_RECIRC_CODE_3_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_RECIRC_CODE_3_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_RECIRC_CODE_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1102,7 +1102,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "EP_NIH_HDR_TIMESTAMP_15_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_15_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1162,7 +1162,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "EP_NIH_HDR_TIMESTAMP_31_16",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_31_16,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_31_16,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1222,7 +1222,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "EVENT_TRACE_VECTOR_15_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_15_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1287,7 +1287,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "EVENT_TRACE_VECTOR_31_16",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_16,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_16,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1352,7 +1352,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "EVENT_TRACE_VECTOR_47_32",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1417,7 +1417,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "FLOW_ID_LSB_15_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_FLOW_ID_LSB_15_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_FLOW_ID_LSB_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1482,7 +1482,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "FLOW_ID_MSB_3_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_FLOW_ID_MSB_3_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_FLOW_ID_MSB_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1547,7 +1547,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "I2E_CLASS_ID_15_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1612,7 +1612,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "IFP_IOAM_GBP_ACTION_3_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_IFP_IOAM_GBP_ACTION_3_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_IFP_IOAM_GBP_ACTION_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1677,7 +1677,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "IFP_TS_CONTROL_ACTION_3_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_IFP_TS_CONTROL_ACTION_3_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_IFP_TS_CONTROL_ACTION_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1742,7 +1742,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "ING_TIMESTAMP_15_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_15_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1807,7 +1807,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "ING_TIMESTAMP_31_16",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_16,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_16,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1872,7 +1872,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "INGRESS_DEVICE_PORT_8_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_INGRESS_DEVICE_PORT_8_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_INGRESS_DEVICE_PORT_8_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1937,7 +1937,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -2002,7 +2002,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "INGRESS_QOS_REMARK_CTRL_3_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -2067,7 +2067,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "INT_PRI_3_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_INT_PRI_3_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_INT_PRI_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -2132,7 +2132,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "L2_IIF_12_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_L2_IIF_12_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_L2_IIF_12_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -2169,7 +2169,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "L2_OIF_12_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_L2_OIF_12_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_L2_OIF_12_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -2234,7 +2234,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "L3_DNAT_INDEX_15_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_L3_DNAT_INDEX_15_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_L3_DNAT_INDEX_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -2298,7 +2298,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "L3_IIF_13_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_L3_IIF_13_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_L3_IIF_13_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -2363,7 +2363,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "L3_OIF_1_13_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -2428,7 +2428,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "L3_SNAT_INDEX_15_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_L3_SNAT_INDEX_15_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_L3_SNAT_INDEX_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -2492,7 +2492,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "MAC_DA_23_20_3_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_MAC_DA_23_20_3_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_MAC_DA_23_20_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -2554,7 +2554,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "MPLS_LABEL_DECAP_COUNT_3_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_MPLS_LABEL_DECAP_COUNT_3_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_MPLS_LABEL_DECAP_COUNT_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -2619,7 +2619,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -2684,7 +2684,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "NHOP_INDEX_1_15_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_15_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -2749,7 +2749,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "PARSER_VHLEN_0_15_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -2814,7 +2814,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "PKT_MISC_CTRL_0_3_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -2879,7 +2879,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "SRV6_DIP_EDIT_CTRL_3_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_SRV6_DIP_EDIT_CTRL_3_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_SRV6_DIP_EDIT_CTRL_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -2942,7 +2942,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "SRV6_EDIT_AND_SL_UPDATE_CTRL_3_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_SRV6_EDIT_AND_SL_UPDATE_CTRL_3_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_SRV6_EDIT_AND_SL_UPDATE_CTRL_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -3005,7 +3005,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "SRV6_NEW_GSID_SI_2_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_SRV6_NEW_GSID_SI_2_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_SRV6_NEW_GSID_SI_2_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -3068,7 +3068,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "SRV6_SID_AND_PREFIX_LEN_ENC_3_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_SRV6_SID_AND_PREFIX_LEN_ENC_3_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_SRV6_SID_AND_PREFIX_LEN_ENC_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -3131,7 +3131,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "SVP_15_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_SVP_15_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_SVP_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -3196,7 +3196,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "SVP_NETWORK_GROUP_BITMAP_3_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -3261,7 +3261,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "SVTAG_CTRL_PKT_INFO_3_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_SVTAG_CTRL_PKT_INFO_3_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_SVTAG_CTRL_PKT_INFO_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -3326,7 +3326,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "SVTAG_SC_INDEX_OR_IFP_OPAQUE_OBJ_15_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_SVTAG_SC_INDEX_OR_IFP_OPAQUE_OBJ_15_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_SVTAG_SC_INDEX_OR_IFP_OPAQUE_OBJ_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -3391,7 +3391,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "SVTAG_SC_INDEX_STR_ALLOW_NAT_3_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_SVTAG_SC_INDEX_STR_ALLOW_NAT_3_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_SVTAG_SC_INDEX_STR_ALLOW_NAT_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -3456,7 +3456,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "SYSTEM_DESTINATION_15_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -3521,7 +3521,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "SYSTEM_OPCODE_3_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -3586,7 +3586,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "SYSTEM_SOURCE_15_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_SYSTEM_SOURCE_15_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_SYSTEM_SOURCE_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -3651,7 +3651,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "TIMESTAMP_CTRL_3_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_TIMESTAMP_CTRL_3_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_TIMESTAMP_CTRL_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -3716,7 +3716,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "TUNNEL_PROCESSING_RESULTS_1_3_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -3781,7 +3781,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "VFI_15_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_VFI_15_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_VFI_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -3846,7 +3846,7 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
     },
     {
         .name = "VLAN_TAG_PRESERVE_CTRL_SVP_MIRROR_ENABLE_3_0",
-        .fid = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_VLAN_TAG_PRESERVE_CTRL_SVP_MIRROR_ENABLE_3_0,
+        .fid = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_VLAN_TAG_PRESERVE_CTRL_SVP_MIRROR_ENABLE_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -3909,20 +3909,25 @@ static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_
         },
         .profile_cnt = 58,
     },
-};static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_data,
 };
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_flex_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_rxpmd_flex_field_data,
+    .profile_bmp_cnt = 2,
+    .profile_bmp[0] = 0xfffffffc,
+    .profile_bmp[1] = 0x3ffffff,
 
-static shr_enum_map_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_reason_names[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_reasons_info_t bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_reasons_info = {
-    .num_reasons = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RXPMD_FLEX_REASON_COUNT,
-    .reason_names = bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_reason_names,
-    .reason_encode = bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_reason_encode,
-    .reason_decode = bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_reason_decode,
+static shr_enum_map_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_flex_reason_names[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT
+};
+
+static bcmpkt_flex_reasons_info_t bcm56890_a0_dna_6_5_31_6_0_rxpmd_flex_reasons_info = {
+    .num_reasons = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RXPMD_FLEX_REASON_COUNT,
+    .reason_names = bcm56890_a0_dna_6_5_31_6_0_rxpmd_flex_reason_names,
+    .reason_encode = bcm56890_a0_dna_6_5_31_6_0_rxpmd_flex_reason_encode,
+    .reason_decode = bcm56890_a0_dna_6_5_31_6_0_rxpmd_flex_reason_decode,
 };
 
 
@@ -4065,7 +4070,7 @@ static int32_t bcmpkt_arp_t_target_ip_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_arp_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ARP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_arp_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_FID_COUNT] = {
     bcmpkt_arp_t_hardware_len_get,
     bcmpkt_arp_t_hardware_type_get,
     bcmpkt_arp_t_operation_get,
@@ -4077,7 +4082,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_arp_t_fget[BCM56890_A0_DNA_6_
     bcmpkt_arp_t_target_ip_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_arp_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ARP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_arp_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_FID_COUNT] = {
     bcmpkt_arp_t_hardware_len_set,
     bcmpkt_arp_t_hardware_type_set,
     bcmpkt_arp_t_operation_set,
@@ -4089,13 +4094,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_arp_t_fset[BCM56890_A0_DNA_6_
     bcmpkt_arp_t_target_ip_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_arp_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_arp_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_arp_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ARP_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_arp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_arp_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ARP_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_arp_t_field_data,
 };
 
 
@@ -4192,7 +4197,7 @@ static int32_t bcmpkt_authen_t_spi_set(uint32_t *data, int profile, uint32_t val
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_authen_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_AUTHEN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_authen_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T_FID_COUNT] = {
     bcmpkt_authen_t_data_get,
     bcmpkt_authen_t_next_header_get,
     bcmpkt_authen_t_payload_len_get,
@@ -4201,7 +4206,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_authen_t_fget[BCM56890_A0_DNA
     bcmpkt_authen_t_spi_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_authen_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_AUTHEN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_authen_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T_FID_COUNT] = {
     bcmpkt_authen_t_data_set,
     bcmpkt_authen_t_next_header_set,
     bcmpkt_authen_t_payload_len_set,
@@ -4210,13 +4215,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_authen_t_fset[BCM56890_A0_DNA
     bcmpkt_authen_t_spi_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_authen_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_AUTHEN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_authen_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_authen_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_AUTHEN_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_authen_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_authen_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_AUTHEN_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_authen_t_field_data,
 };
 
 
@@ -4465,7 +4470,7 @@ static int32_t bcmpkt_bfd_t_version_set(uint32_t *data, int profile, uint32_t va
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_bfd_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_bfd_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_FID_COUNT] = {
     bcmpkt_bfd_t_ap_get,
     bcmpkt_bfd_t_bfd_length_get,
     bcmpkt_bfd_t_cpi_get,
@@ -4484,7 +4489,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_bfd_t_fget[BCM56890_A0_DNA_6_
     bcmpkt_bfd_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_bfd_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_bfd_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_FID_COUNT] = {
     bcmpkt_bfd_t_ap_set,
     bcmpkt_bfd_t_bfd_length_set,
     bcmpkt_bfd_t_cpi_set,
@@ -4503,13 +4508,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_bfd_t_fset[BCM56890_A0_DNA_6_
     bcmpkt_bfd_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_bfd_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_bfd_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_bfd_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_BFD_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_bfd_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_bfd_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_BFD_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_bfd_t_field_data,
 };
 
 
@@ -4543,23 +4548,23 @@ static int32_t bcmpkt_cntag_t_tpid_set(uint32_t *data, int profile, uint32_t val
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_cntag_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CNTAG_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_cntag_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CNTAG_T_FID_COUNT] = {
     bcmpkt_cntag_t_rpid_get,
     bcmpkt_cntag_t_tpid_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_cntag_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CNTAG_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_cntag_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CNTAG_T_FID_COUNT] = {
     bcmpkt_cntag_t_rpid_set,
     bcmpkt_cntag_t_tpid_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_cntag_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CNTAG_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_cntag_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CNTAG_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_cntag_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CNTAG_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_cntag_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_cntag_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CNTAG_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_cntag_t_field_data,
 };
 
 
@@ -4675,7 +4680,7 @@ static int32_t bcmpkt_cpu_composites_0_t_dma_cont6_set(uint32_t *data, int profi
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_cpu_composites_0_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_cpu_composites_0_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
     bcmpkt_cpu_composites_0_t_dma_cont0_get,
     bcmpkt_cpu_composites_0_t_dma_cont1_get,
     bcmpkt_cpu_composites_0_t_dma_cont2_get,
@@ -4685,7 +4690,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_cpu_composites_0_t_fget[BCM56
     bcmpkt_cpu_composites_0_t_dma_cont6_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_cpu_composites_0_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_cpu_composites_0_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
     bcmpkt_cpu_composites_0_t_dma_cont0_set,
     bcmpkt_cpu_composites_0_t_dma_cont1_set,
     bcmpkt_cpu_composites_0_t_dma_cont2_set,
@@ -4695,13 +4700,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_cpu_composites_0_t_fset[BCM56
     bcmpkt_cpu_composites_0_t_dma_cont6_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_cpu_composites_0_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_cpu_composites_0_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_cpu_composites_0_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_cpu_composites_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_cpu_composites_0_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_cpu_composites_0_t_field_data,
 };
 
 
@@ -4881,7 +4886,7 @@ static int32_t bcmpkt_cpu_composites_1_t_dma_cont9_set(uint32_t *data, int profi
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_cpu_composites_1_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_cpu_composites_1_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
     bcmpkt_cpu_composites_1_t_dma_cont10_get,
     bcmpkt_cpu_composites_1_t_dma_cont11_get,
     bcmpkt_cpu_composites_1_t_dma_cont12_get,
@@ -4895,7 +4900,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_cpu_composites_1_t_fget[BCM56
     bcmpkt_cpu_composites_1_t_dma_cont9_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_cpu_composites_1_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_cpu_composites_1_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
     bcmpkt_cpu_composites_1_t_dma_cont10_set,
     bcmpkt_cpu_composites_1_t_dma_cont11_set,
     bcmpkt_cpu_composites_1_t_dma_cont12_set,
@@ -4909,13 +4914,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_cpu_composites_1_t_fset[BCM56
     bcmpkt_cpu_composites_1_t_dma_cont9_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_cpu_composites_1_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_cpu_composites_1_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_cpu_composites_1_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_cpu_composites_1_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_cpu_composites_1_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_cpu_composites_1_t_field_data,
 };
 
 
@@ -4965,25 +4970,25 @@ static int32_t bcmpkt_dest_option_t_option_set(uint32_t *data, int profile, uint
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_dest_option_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_DEST_OPTION_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_dest_option_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_DEST_OPTION_T_FID_COUNT] = {
     bcmpkt_dest_option_t_hdr_ext_len_get,
     bcmpkt_dest_option_t_next_header_get,
     bcmpkt_dest_option_t_option_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_dest_option_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_DEST_OPTION_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_dest_option_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_DEST_OPTION_T_FID_COUNT] = {
     bcmpkt_dest_option_t_hdr_ext_len_set,
     bcmpkt_dest_option_t_next_header_set,
     bcmpkt_dest_option_t_option_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_dest_option_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_DEST_OPTION_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_dest_option_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_DEST_OPTION_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_dest_option_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_DEST_OPTION_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_dest_option_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_dest_option_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_DEST_OPTION_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_dest_option_t_field_data,
 };
 
 
@@ -5169,7 +5174,7 @@ static int32_t bcmpkt_ep_nih_header_t_timestamp_set(uint32_t *data, int profile,
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_ep_nih_header_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_ep_nih_header_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT] = {
     bcmpkt_ep_nih_header_t_header_subtype_get,
     bcmpkt_ep_nih_header_t_header_type_get,
     bcmpkt_ep_nih_header_t_opaque_ctrl_a_get,
@@ -5184,7 +5189,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_ep_nih_header_t_fget[BCM56890
     bcmpkt_ep_nih_header_t_timestamp_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_ep_nih_header_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_ep_nih_header_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT] = {
     bcmpkt_ep_nih_header_t_header_subtype_set,
     bcmpkt_ep_nih_header_t_header_type_set,
     bcmpkt_ep_nih_header_t_opaque_ctrl_a_set,
@@ -5199,13 +5204,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_ep_nih_header_t_fset[BCM56890
     bcmpkt_ep_nih_header_t_timestamp_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_ep_nih_header_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_EP_NIH_HEADER_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_ep_nih_header_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_EP_NIH_HEADER_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_ep_nih_header_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_ep_nih_header_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_ep_nih_header_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_ep_nih_header_t_field_data,
 };
 
 
@@ -5345,7 +5350,7 @@ static int32_t bcmpkt_erspan3_fixed_hdr_t_vlan_set(uint32_t *data, int profile,
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_erspan3_fixed_hdr_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_erspan3_fixed_hdr_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
     bcmpkt_erspan3_fixed_hdr_t_bso_get,
     bcmpkt_erspan3_fixed_hdr_t_cos_get,
     bcmpkt_erspan3_fixed_hdr_t_gbp_sid_get,
@@ -5357,7 +5362,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_erspan3_fixed_hdr_t_fget[BCM5
     bcmpkt_erspan3_fixed_hdr_t_vlan_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_erspan3_fixed_hdr_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_erspan3_fixed_hdr_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
     bcmpkt_erspan3_fixed_hdr_t_bso_set,
     bcmpkt_erspan3_fixed_hdr_t_cos_set,
     bcmpkt_erspan3_fixed_hdr_t_gbp_sid_set,
@@ -5369,13 +5374,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_erspan3_fixed_hdr_t_fset[BCM5
     bcmpkt_erspan3_fixed_hdr_t_vlan_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_erspan3_fixed_hdr_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_erspan3_fixed_hdr_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_erspan3_fixed_hdr_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_erspan3_fixed_hdr_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_erspan3_fixed_hdr_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_erspan3_fixed_hdr_t_field_data,
 };
 
 
@@ -5440,27 +5445,27 @@ static int32_t bcmpkt_erspan3_subhdr_5_t_timestamp_set(uint32_t *data, int profi
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_erspan3_subhdr_5_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_erspan3_subhdr_5_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
     bcmpkt_erspan3_subhdr_5_t_platform_id_get,
     bcmpkt_erspan3_subhdr_5_t_port_id_get,
     bcmpkt_erspan3_subhdr_5_t_switch_id_get,
     bcmpkt_erspan3_subhdr_5_t_timestamp_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_erspan3_subhdr_5_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_erspan3_subhdr_5_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
     bcmpkt_erspan3_subhdr_5_t_platform_id_set,
     bcmpkt_erspan3_subhdr_5_t_port_id_set,
     bcmpkt_erspan3_subhdr_5_t_switch_id_set,
     bcmpkt_erspan3_subhdr_5_t_timestamp_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_erspan3_subhdr_5_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_erspan3_subhdr_5_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_erspan3_subhdr_5_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_erspan3_subhdr_5_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_erspan3_subhdr_5_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_erspan3_subhdr_5_t_field_data,
 };
 
 
@@ -5541,7 +5546,7 @@ static int32_t bcmpkt_esp_t_spi_set(uint32_t *data, int profile, uint32_t val) {
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_esp_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ESP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_esp_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ESP_T_FID_COUNT] = {
     bcmpkt_esp_t_next_header_get,
     bcmpkt_esp_t_pad_get,
     bcmpkt_esp_t_pad_len_get,
@@ -5549,7 +5554,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_esp_t_fget[BCM56890_A0_DNA_6_
     bcmpkt_esp_t_spi_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_esp_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ESP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_esp_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ESP_T_FID_COUNT] = {
     bcmpkt_esp_t_next_header_set,
     bcmpkt_esp_t_pad_set,
     bcmpkt_esp_t_pad_len_set,
@@ -5557,13 +5562,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_esp_t_fset[BCM56890_A0_DNA_6_
     bcmpkt_esp_t_spi_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_esp_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ESP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_esp_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ESP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_esp_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ESP_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_esp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_esp_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ESP_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_esp_t_field_data,
 };
 
 
@@ -5582,21 +5587,21 @@ static int32_t bcmpkt_ethertype_t_type_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_ethertype_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_ethertype_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
     bcmpkt_ethertype_t_type_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_ethertype_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_ethertype_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
     bcmpkt_ethertype_t_type_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_ethertype_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_ethertype_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_ethertype_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ETHERTYPE_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_ethertype_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_ethertype_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ETHERTYPE_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_ethertype_t_field_data,
 };
 
 
@@ -5661,27 +5666,27 @@ static int32_t bcmpkt_frag_t_reserved_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_frag_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_FRAG_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_frag_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_FRAG_T_FID_COUNT] = {
     bcmpkt_frag_t_frag_info_get,
     bcmpkt_frag_t_id_get,
     bcmpkt_frag_t_next_header_get,
     bcmpkt_frag_t_reserved_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_frag_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_FRAG_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_frag_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_FRAG_T_FID_COUNT] = {
     bcmpkt_frag_t_frag_info_set,
     bcmpkt_frag_t_id_set,
     bcmpkt_frag_t_next_header_set,
     bcmpkt_frag_t_reserved_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_frag_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_FRAG_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_frag_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_FRAG_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_frag_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_FRAG_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_frag_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_frag_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_FRAG_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_frag_t_field_data,
 };
 
 
@@ -5775,7 +5780,7 @@ static int32_t bcmpkt_gbp_ethernet_shim_t_ver_set(uint32_t *data, int profile, u
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_gbp_ethernet_shim_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GBP_ETHERNET_SHIM_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_gbp_ethernet_shim_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GBP_ETHERNET_SHIM_T_FID_COUNT] = {
     bcmpkt_gbp_ethernet_shim_t_ethertype_get,
     bcmpkt_gbp_ethernet_shim_t_flags_get,
     bcmpkt_gbp_ethernet_shim_t_reserved_get,
@@ -5784,7 +5789,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_gbp_ethernet_shim_t_fget[BCM5
     bcmpkt_gbp_ethernet_shim_t_ver_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_gbp_ethernet_shim_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GBP_ETHERNET_SHIM_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_gbp_ethernet_shim_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GBP_ETHERNET_SHIM_T_FID_COUNT] = {
     bcmpkt_gbp_ethernet_shim_t_ethertype_set,
     bcmpkt_gbp_ethernet_shim_t_flags_set,
     bcmpkt_gbp_ethernet_shim_t_reserved_set,
@@ -5793,13 +5798,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_gbp_ethernet_shim_t_fset[BCM5
     bcmpkt_gbp_ethernet_shim_t_ver_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_gbp_ethernet_shim_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GBP_ETHERNET_SHIM_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_gbp_ethernet_shim_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GBP_ETHERNET_SHIM_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_gbp_ethernet_shim_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GBP_ETHERNET_SHIM_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_gbp_ethernet_shim_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_gbp_ethernet_shim_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GBP_ETHERNET_SHIM_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_gbp_ethernet_shim_t_field_data,
 };
 
 
@@ -6028,7 +6033,7 @@ static int32_t bcmpkt_generic_loopback_t_start_byte_set(uint32_t *data, int prof
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_generic_loopback_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_generic_loopback_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
     bcmpkt_generic_loopback_t_destination_obj_get,
     bcmpkt_generic_loopback_t_destination_type_get,
     bcmpkt_generic_loopback_t_entropy_obj_get,
@@ -6046,7 +6051,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_generic_loopback_t_fget[BCM56
     bcmpkt_generic_loopback_t_start_byte_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_generic_loopback_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_generic_loopback_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
     bcmpkt_generic_loopback_t_destination_obj_set,
     bcmpkt_generic_loopback_t_destination_type_set,
     bcmpkt_generic_loopback_t_entropy_obj_set,
@@ -6064,13 +6069,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_generic_loopback_t_fset[BCM56
     bcmpkt_generic_loopback_t_start_byte_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_generic_loopback_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_generic_loopback_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_generic_loopback_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_generic_loopback_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_generic_loopback_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_generic_loopback_t_field_data,
 };
 
 
@@ -6149,7 +6154,7 @@ static int32_t bcmpkt_gpe_t_vni_set(uint32_t *data, int profile, uint32_t val) {
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_gpe_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GPE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_gpe_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GPE_T_FID_COUNT] = {
     bcmpkt_gpe_t_flags_get,
     bcmpkt_gpe_t_next_protocol_get,
     bcmpkt_gpe_t_reserved0_get,
@@ -6157,7 +6162,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_gpe_t_fget[BCM56890_A0_DNA_6_
     bcmpkt_gpe_t_vni_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_gpe_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GPE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_gpe_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GPE_T_FID_COUNT] = {
     bcmpkt_gpe_t_flags_set,
     bcmpkt_gpe_t_next_protocol_set,
     bcmpkt_gpe_t_reserved0_set,
@@ -6165,13 +6170,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_gpe_t_fset[BCM56890_A0_DNA_6_
     bcmpkt_gpe_t_vni_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_gpe_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GPE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_gpe_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GPE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_gpe_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GPE_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_gpe_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_gpe_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GPE_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_gpe_t_field_data,
 };
 
 
@@ -6205,23 +6210,23 @@ static int32_t bcmpkt_gre_chksum_t_offset_set(uint32_t *data, int profile, uint3
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_gre_chksum_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_gre_chksum_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT] = {
     bcmpkt_gre_chksum_t_checksum_get,
     bcmpkt_gre_chksum_t_offset_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_gre_chksum_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_gre_chksum_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT] = {
     bcmpkt_gre_chksum_t_checksum_set,
     bcmpkt_gre_chksum_t_offset_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_gre_chksum_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_CHKSUM_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_gre_chksum_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_CHKSUM_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_gre_chksum_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_gre_chksum_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_gre_chksum_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_gre_chksum_t_field_data,
 };
 
 
@@ -6241,21 +6246,21 @@ static int32_t bcmpkt_gre_key_t_key_set(uint32_t *data, int profile, uint32_t va
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_gre_key_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_KEY_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_gre_key_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_KEY_T_FID_COUNT] = {
     bcmpkt_gre_key_t_key_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_gre_key_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_KEY_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_gre_key_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_KEY_T_FID_COUNT] = {
     bcmpkt_gre_key_t_key_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_gre_key_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_KEY_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_gre_key_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_KEY_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_gre_key_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_KEY_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_gre_key_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_gre_key_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_KEY_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_gre_key_t_field_data,
 };
 
 
@@ -6275,21 +6280,21 @@ static int32_t bcmpkt_gre_rout_t_routing_set(uint32_t *data, int profile, uint32
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_gre_rout_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_ROUT_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_gre_rout_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_ROUT_T_FID_COUNT] = {
     bcmpkt_gre_rout_t_routing_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_gre_rout_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_ROUT_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_gre_rout_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_ROUT_T_FID_COUNT] = {
     bcmpkt_gre_rout_t_routing_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_gre_rout_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_ROUT_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_gre_rout_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_ROUT_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_gre_rout_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_ROUT_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_gre_rout_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_gre_rout_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_ROUT_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_gre_rout_t_field_data,
 };
 
 
@@ -6309,21 +6314,21 @@ static int32_t bcmpkt_gre_seq_t_sequence_set(uint32_t *data, int profile, uint32
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_gre_seq_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_SEQ_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_gre_seq_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_SEQ_T_FID_COUNT] = {
     bcmpkt_gre_seq_t_sequence_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_gre_seq_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_SEQ_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_gre_seq_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_SEQ_T_FID_COUNT] = {
     bcmpkt_gre_seq_t_sequence_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_gre_seq_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_SEQ_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_gre_seq_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_SEQ_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_gre_seq_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_SEQ_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_gre_seq_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_gre_seq_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_SEQ_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_gre_seq_t_field_data,
 };
 
 
@@ -6387,27 +6392,27 @@ static int32_t bcmpkt_gre_t_version_set(uint32_t *data, int profile, uint32_t va
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_gre_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_gre_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_T_FID_COUNT] = {
     bcmpkt_gre_t_c_r_k_s_get,
     bcmpkt_gre_t_protocol_get,
     bcmpkt_gre_t_reserved_get,
     bcmpkt_gre_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_gre_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_gre_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_T_FID_COUNT] = {
     bcmpkt_gre_t_c_r_k_s_set,
     bcmpkt_gre_t_protocol_set,
     bcmpkt_gre_t_reserved_set,
     bcmpkt_gre_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_gre_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_gre_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_gre_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_GRE_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_gre_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_gre_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_GRE_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_gre_t_field_data,
 };
 
 
@@ -6606,7 +6611,7 @@ static int32_t bcmpkt_hg3_base_t_version_set(uint32_t *data, int profile, uint32
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_hg3_base_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_hg3_base_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_FID_COUNT] = {
     bcmpkt_hg3_base_t_cn_get,
     bcmpkt_hg3_base_t_cng_get,
     bcmpkt_hg3_base_t_entropy_get,
@@ -6622,7 +6627,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_hg3_base_t_fget[BCM56890_A0_D
     bcmpkt_hg3_base_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_hg3_base_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_hg3_base_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_FID_COUNT] = {
     bcmpkt_hg3_base_t_cn_set,
     bcmpkt_hg3_base_t_cng_set,
     bcmpkt_hg3_base_t_entropy_set,
@@ -6638,13 +6643,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_hg3_base_t_fset[BCM56890_A0_D
     bcmpkt_hg3_base_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_hg3_base_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_hg3_base_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_hg3_base_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_BASE_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_hg3_base_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_hg3_base_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_BASE_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_hg3_base_t_field_data,
 };
 
 
@@ -6738,7 +6743,7 @@ static int32_t bcmpkt_hg3_extension_0_t_svp_set(uint32_t *data, int profile, uin
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_hg3_extension_0_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_hg3_extension_0_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT] = {
     bcmpkt_hg3_extension_0_t_class_id_lsb_get,
     bcmpkt_hg3_extension_0_t_class_id_msb_get,
     bcmpkt_hg3_extension_0_t_dvp_or_l3_iif_get,
@@ -6747,7 +6752,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_hg3_extension_0_t_fget[BCM568
     bcmpkt_hg3_extension_0_t_svp_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_hg3_extension_0_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_hg3_extension_0_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT] = {
     bcmpkt_hg3_extension_0_t_class_id_lsb_set,
     bcmpkt_hg3_extension_0_t_class_id_msb_set,
     bcmpkt_hg3_extension_0_t_dvp_or_l3_iif_set,
@@ -6756,13 +6761,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_hg3_extension_0_t_fset[BCM568
     bcmpkt_hg3_extension_0_t_svp_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_hg3_extension_0_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_EXTENSION_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_hg3_extension_0_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_hg3_extension_0_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_hg3_extension_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_hg3_extension_0_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_hg3_extension_0_t_field_data,
 };
 
 
@@ -6812,25 +6817,25 @@ static int32_t bcmpkt_hop_by_hop_t_option_set(uint32_t *data, int profile, uint3
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_hop_by_hop_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_hop_by_hop_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT] = {
     bcmpkt_hop_by_hop_t_hdr_ext_len_get,
     bcmpkt_hop_by_hop_t_next_header_get,
     bcmpkt_hop_by_hop_t_option_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_hop_by_hop_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_hop_by_hop_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT] = {
     bcmpkt_hop_by_hop_t_hdr_ext_len_set,
     bcmpkt_hop_by_hop_t_next_header_set,
     bcmpkt_hop_by_hop_t_option_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_hop_by_hop_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HOP_BY_HOP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_hop_by_hop_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HOP_BY_HOP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_hop_by_hop_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_hop_by_hop_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_hop_by_hop_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_hop_by_hop_t_field_data,
 };
 
 
@@ -6879,25 +6884,25 @@ static int32_t bcmpkt_icmp_t_icmp_type_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_icmp_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ICMP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_icmp_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ICMP_T_FID_COUNT] = {
     bcmpkt_icmp_t_checksum_get,
     bcmpkt_icmp_t_code_get,
     bcmpkt_icmp_t_icmp_type_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_icmp_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ICMP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_icmp_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ICMP_T_FID_COUNT] = {
     bcmpkt_icmp_t_checksum_set,
     bcmpkt_icmp_t_code_set,
     bcmpkt_icmp_t_icmp_type_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_icmp_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_icmp_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_icmp_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ICMP_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_icmp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_icmp_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ICMP_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_icmp_t_field_data,
 };
 
 
@@ -6976,7 +6981,7 @@ static int32_t bcmpkt_ifa_header_t_ver_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_ifa_header_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_HEADER_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_ifa_header_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_HEADER_T_FID_COUNT] = {
     bcmpkt_ifa_header_t_flags_get,
     bcmpkt_ifa_header_t_gns_get,
     bcmpkt_ifa_header_t_max_length_get,
@@ -6984,7 +6989,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_ifa_header_t_fget[BCM56890_A0
     bcmpkt_ifa_header_t_ver_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_ifa_header_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_HEADER_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_ifa_header_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_HEADER_T_FID_COUNT] = {
     bcmpkt_ifa_header_t_flags_set,
     bcmpkt_ifa_header_t_gns_set,
     bcmpkt_ifa_header_t_max_length_set,
@@ -6992,13 +6997,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_ifa_header_t_fset[BCM56890_A0
     bcmpkt_ifa_header_t_ver_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_ifa_header_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_HEADER_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_ifa_header_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_HEADER_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_ifa_header_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_HEADER_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_ifa_header_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_ifa_header_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_HEADER_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_ifa_header_t_field_data,
 };
 
 
@@ -7092,7 +7097,7 @@ static int32_t bcmpkt_ifa_metadata_a_t_rx_timestamp_sec_set(uint32_t *data, int
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_ifa_metadata_a_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_A_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_ifa_metadata_a_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_A_T_FID_COUNT] = {
     bcmpkt_ifa_metadata_a_t_cn_get,
     bcmpkt_ifa_metadata_a_t_fwd_hdr_ttl_get,
     bcmpkt_ifa_metadata_a_t_lns_device_id_get,
@@ -7101,7 +7106,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_ifa_metadata_a_t_fget[BCM5689
     bcmpkt_ifa_metadata_a_t_rx_timestamp_sec_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_ifa_metadata_a_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_A_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_ifa_metadata_a_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_A_T_FID_COUNT] = {
     bcmpkt_ifa_metadata_a_t_cn_set,
     bcmpkt_ifa_metadata_a_t_fwd_hdr_ttl_set,
     bcmpkt_ifa_metadata_a_t_lns_device_id_set,
@@ -7110,13 +7115,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_ifa_metadata_a_t_fset[BCM5689
     bcmpkt_ifa_metadata_a_t_rx_timestamp_sec_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_ifa_metadata_a_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_A_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_ifa_metadata_a_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_A_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_ifa_metadata_a_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_A_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_ifa_metadata_a_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_ifa_metadata_a_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_A_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_ifa_metadata_a_t_field_data,
 };
 
 
@@ -7230,7 +7235,7 @@ static int32_t bcmpkt_ifa_metadata_b_t_tx_queue_byte_count_set(uint32_t *data, i
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_ifa_metadata_b_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_B_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_ifa_metadata_b_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_B_T_FID_COUNT] = {
     bcmpkt_ifa_metadata_b_t_egress_port_id_get,
     bcmpkt_ifa_metadata_b_t_ingress_port_id_get,
     bcmpkt_ifa_metadata_b_t_mmu_stat_0_get,
@@ -7240,7 +7245,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_ifa_metadata_b_t_fget[BCM5689
     bcmpkt_ifa_metadata_b_t_tx_queue_byte_count_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_ifa_metadata_b_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_B_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_ifa_metadata_b_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_B_T_FID_COUNT] = {
     bcmpkt_ifa_metadata_b_t_egress_port_id_set,
     bcmpkt_ifa_metadata_b_t_ingress_port_id_set,
     bcmpkt_ifa_metadata_b_t_mmu_stat_0_set,
@@ -7250,13 +7255,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_ifa_metadata_b_t_fset[BCM5689
     bcmpkt_ifa_metadata_b_t_tx_queue_byte_count_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_ifa_metadata_b_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_B_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_ifa_metadata_b_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_B_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_ifa_metadata_b_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_B_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_ifa_metadata_b_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_ifa_metadata_b_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_B_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_ifa_metadata_b_t_field_data,
 };
 
 
@@ -7305,25 +7310,25 @@ static int32_t bcmpkt_ifa_metadata_base_t_request_vector_set(uint32_t *data, int
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_ifa_metadata_base_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_BASE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_ifa_metadata_base_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_BASE_T_FID_COUNT] = {
     bcmpkt_ifa_metadata_base_t_action_vector_get,
     bcmpkt_ifa_metadata_base_t_hop_limit_current_length_get,
     bcmpkt_ifa_metadata_base_t_request_vector_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_ifa_metadata_base_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_BASE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_ifa_metadata_base_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_BASE_T_FID_COUNT] = {
     bcmpkt_ifa_metadata_base_t_action_vector_set,
     bcmpkt_ifa_metadata_base_t_hop_limit_current_length_set,
     bcmpkt_ifa_metadata_base_t_request_vector_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_ifa_metadata_base_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_BASE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_ifa_metadata_base_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_BASE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_ifa_metadata_base_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IFA_METADATA_BASE_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_ifa_metadata_base_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_ifa_metadata_base_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IFA_METADATA_BASE_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_ifa_metadata_base_t_field_data,
 };
 
 
@@ -7388,27 +7393,27 @@ static int32_t bcmpkt_igmp_t_max_resp_time_set(uint32_t *data, int profile, uint
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_igmp_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IGMP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_igmp_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IGMP_T_FID_COUNT] = {
     bcmpkt_igmp_t_checksum_get,
     bcmpkt_igmp_t_group_address_get,
     bcmpkt_igmp_t_igmp_type_get,
     bcmpkt_igmp_t_max_resp_time_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_igmp_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IGMP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_igmp_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IGMP_T_FID_COUNT] = {
     bcmpkt_igmp_t_checksum_set,
     bcmpkt_igmp_t_group_address_set,
     bcmpkt_igmp_t_igmp_type_set,
     bcmpkt_igmp_t_max_resp_time_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_igmp_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IGMP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_igmp_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IGMP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_igmp_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IGMP_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_igmp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_igmp_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IGMP_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_igmp_t_field_data,
 };
 
 
@@ -7518,7 +7523,7 @@ static int32_t bcmpkt_ioam_e2e_t_type_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_ioam_e2e_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IOAM_E2E_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_ioam_e2e_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IOAM_E2E_T_FID_COUNT] = {
     bcmpkt_ioam_e2e_t_ioam_e2e_data_get,
     bcmpkt_ioam_e2e_t_ioam_e2e_type_get,
     bcmpkt_ioam_e2e_t_ioam_hdr_len_get,
@@ -7528,7 +7533,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_ioam_e2e_t_fget[BCM56890_A0_D
     bcmpkt_ioam_e2e_t_type_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_ioam_e2e_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IOAM_E2E_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_ioam_e2e_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IOAM_E2E_T_FID_COUNT] = {
     bcmpkt_ioam_e2e_t_ioam_e2e_data_set,
     bcmpkt_ioam_e2e_t_ioam_e2e_type_set,
     bcmpkt_ioam_e2e_t_ioam_hdr_len_set,
@@ -7538,13 +7543,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_ioam_e2e_t_fset[BCM56890_A0_D
     bcmpkt_ioam_e2e_t_type_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_ioam_e2e_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IOAM_E2E_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_ioam_e2e_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IOAM_E2E_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_ioam_e2e_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IOAM_E2E_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_ioam_e2e_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_ioam_e2e_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IOAM_E2E_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_ioam_e2e_t_field_data,
 };
 
 
@@ -7626,7 +7631,7 @@ static int32_t bcmpkt_ipfix_t_version_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_ipfix_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPFIX_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_ipfix_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPFIX_T_FID_COUNT] = {
     bcmpkt_ipfix_t_export_time_get,
     bcmpkt_ipfix_t_length_get,
     bcmpkt_ipfix_t_obs_domain_id_get,
@@ -7634,7 +7639,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_ipfix_t_fget[BCM56890_A0_DNA_
     bcmpkt_ipfix_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_ipfix_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPFIX_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_ipfix_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPFIX_T_FID_COUNT] = {
     bcmpkt_ipfix_t_export_time_set,
     bcmpkt_ipfix_t_length_set,
     bcmpkt_ipfix_t_obs_domain_id_set,
@@ -7642,13 +7647,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_ipfix_t_fset[BCM56890_A0_DNA_
     bcmpkt_ipfix_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_ipfix_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_ipfix_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_ipfix_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPFIX_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_ipfix_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_ipfix_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPFIX_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_ipfix_t_field_data,
 };
 
 
@@ -7820,7 +7825,7 @@ static int32_t bcmpkt_ipv4_t_version_hdr_len_set(uint32_t *data, int profile, ui
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_ipv4_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV4_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_ipv4_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_FID_COUNT] = {
     bcmpkt_ipv4_t_da_get,
     bcmpkt_ipv4_t_flags_frag_offset_get,
     bcmpkt_ipv4_t_hdr_checksum_get,
@@ -7834,7 +7839,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_ipv4_t_fget[BCM56890_A0_DNA_6
     bcmpkt_ipv4_t_version_hdr_len_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_ipv4_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV4_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_ipv4_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_FID_COUNT] = {
     bcmpkt_ipv4_t_da_set,
     bcmpkt_ipv4_t_flags_frag_offset_set,
     bcmpkt_ipv4_t_hdr_checksum_set,
@@ -7848,13 +7853,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_ipv4_t_fset[BCM56890_A0_DNA_6
     bcmpkt_ipv4_t_version_hdr_len_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_ipv4_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_ipv4_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_ipv4_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV4_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_ipv4_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_ipv4_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV4_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_ipv4_t_field_data,
 };
 
 
@@ -7980,7 +7985,7 @@ static int32_t bcmpkt_ipv6_t_version_set(uint32_t *data, int profile, uint32_t v
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_ipv6_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV6_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_ipv6_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_FID_COUNT] = {
     bcmpkt_ipv6_t_da_get,
     bcmpkt_ipv6_t_flow_label_get,
     bcmpkt_ipv6_t_hop_limit_get,
@@ -7991,7 +7996,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_ipv6_t_fget[BCM56890_A0_DNA_6
     bcmpkt_ipv6_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_ipv6_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV6_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_ipv6_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_FID_COUNT] = {
     bcmpkt_ipv6_t_da_set,
     bcmpkt_ipv6_t_flow_label_set,
     bcmpkt_ipv6_t_hop_limit_set,
@@ -8002,13 +8007,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_ipv6_t_fset[BCM56890_A0_DNA_6
     bcmpkt_ipv6_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_ipv6_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_ipv6_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_ipv6_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_IPV6_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_ipv6_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_ipv6_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_IPV6_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_ipv6_t_field_data,
 };
 
 
@@ -8044,23 +8049,23 @@ static int32_t bcmpkt_l2_t_macsa_set(uint32_t *data, int profile, uint32_t val)
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_l2_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_L2_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_l2_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_L2_T_FID_COUNT] = {
     bcmpkt_l2_t_macda_get,
     bcmpkt_l2_t_macsa_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_l2_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_L2_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_l2_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_L2_T_FID_COUNT] = {
     bcmpkt_l2_t_macda_set,
     bcmpkt_l2_t_macsa_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_l2_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_L2_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_l2_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_L2_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_l2_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_L2_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_l2_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_l2_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_L2_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_l2_t_field_data,
 };
 
 
@@ -8080,21 +8085,21 @@ static int32_t bcmpkt_mirror_erspan_sn_t_seq_num_set(uint32_t *data, int profile
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_mirror_erspan_sn_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_mirror_erspan_sn_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
     bcmpkt_mirror_erspan_sn_t_seq_num_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_mirror_erspan_sn_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_mirror_erspan_sn_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
     bcmpkt_mirror_erspan_sn_t_seq_num_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_mirror_erspan_sn_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_mirror_erspan_sn_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_mirror_erspan_sn_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_mirror_erspan_sn_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_mirror_erspan_sn_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_mirror_erspan_sn_t_field_data,
 };
 
 
@@ -8114,21 +8119,21 @@ static int32_t bcmpkt_mirror_transport_t_data_set(uint32_t *data, int profile, u
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_mirror_transport_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_mirror_transport_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
     bcmpkt_mirror_transport_t_data_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_mirror_transport_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_mirror_transport_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
     bcmpkt_mirror_transport_t_data_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_mirror_transport_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_mirror_transport_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_mirror_transport_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_mirror_transport_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_mirror_transport_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_mirror_transport_t_field_data,
 };
 
 
@@ -8192,27 +8197,27 @@ static int32_t bcmpkt_mpls_ach_t_version_set(uint32_t *data, int profile, uint32
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_mpls_ach_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_ACH_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_mpls_ach_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_ACH_T_FID_COUNT] = {
     bcmpkt_mpls_ach_t_channel_type_get,
     bcmpkt_mpls_ach_t_cw_type_get,
     bcmpkt_mpls_ach_t_reserved_get,
     bcmpkt_mpls_ach_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_mpls_ach_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_ACH_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_mpls_ach_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_ACH_T_FID_COUNT] = {
     bcmpkt_mpls_ach_t_channel_type_set,
     bcmpkt_mpls_ach_t_cw_type_set,
     bcmpkt_mpls_ach_t_reserved_set,
     bcmpkt_mpls_ach_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_mpls_ach_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_ACH_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_mpls_ach_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_ACH_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_mpls_ach_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_ACH_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_mpls_ach_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_mpls_ach_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_ACH_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_mpls_ach_t_field_data,
 };
 
 
@@ -8232,21 +8237,21 @@ static int32_t bcmpkt_mpls_bv_t_value_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_mpls_bv_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_BV_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_mpls_bv_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_BV_T_FID_COUNT] = {
     bcmpkt_mpls_bv_t_value_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_mpls_bv_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_BV_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_mpls_bv_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_BV_T_FID_COUNT] = {
     bcmpkt_mpls_bv_t_value_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_mpls_bv_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_BV_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_mpls_bv_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_BV_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_mpls_bv_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_BV_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_mpls_bv_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_mpls_bv_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_BV_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_mpls_bv_t_field_data,
 };
 
 
@@ -8295,25 +8300,25 @@ static int32_t bcmpkt_mpls_cw_t_seq_number_set(uint32_t *data, int profile, uint
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_mpls_cw_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_CW_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_mpls_cw_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_CW_T_FID_COUNT] = {
     bcmpkt_mpls_cw_t_cw_type_get,
     bcmpkt_mpls_cw_t_reserved_get,
     bcmpkt_mpls_cw_t_seq_number_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_mpls_cw_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_CW_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_mpls_cw_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_CW_T_FID_COUNT] = {
     bcmpkt_mpls_cw_t_cw_type_set,
     bcmpkt_mpls_cw_t_reserved_set,
     bcmpkt_mpls_cw_t_seq_number_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_mpls_cw_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_CW_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_mpls_cw_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_CW_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_mpls_cw_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_CW_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_mpls_cw_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_mpls_cw_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_CW_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_mpls_cw_t_field_data,
 };
 
 
@@ -8377,27 +8382,27 @@ static int32_t bcmpkt_mpls_t_ttl_set(uint32_t *data, int profile, uint32_t val)
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_mpls_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_mpls_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_T_FID_COUNT] = {
     bcmpkt_mpls_t_bos_get,
     bcmpkt_mpls_t_exp_get,
     bcmpkt_mpls_t_label_get,
     bcmpkt_mpls_t_ttl_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_mpls_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_mpls_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_T_FID_COUNT] = {
     bcmpkt_mpls_t_bos_set,
     bcmpkt_mpls_t_exp_set,
     bcmpkt_mpls_t_label_set,
     bcmpkt_mpls_t_ttl_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_mpls_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_mpls_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_mpls_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_MPLS_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_mpls_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_mpls_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_MPLS_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_mpls_t_field_data,
 };
 
 
@@ -8614,7 +8619,7 @@ static int32_t bcmpkt_p_1588_t_version_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_p_1588_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_P_1588_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_p_1588_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_FID_COUNT] = {
     bcmpkt_p_1588_t_cntrl_get,
     bcmpkt_p_1588_t_correction_get,
     bcmpkt_p_1588_t_domain_nb_get,
@@ -8631,7 +8636,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_p_1588_t_fget[BCM56890_A0_DNA
     bcmpkt_p_1588_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_p_1588_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_P_1588_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_p_1588_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_FID_COUNT] = {
     bcmpkt_p_1588_t_cntrl_set,
     bcmpkt_p_1588_t_correction_set,
     bcmpkt_p_1588_t_domain_nb_set,
@@ -8648,13 +8653,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_p_1588_t_fset[BCM56890_A0_DNA
     bcmpkt_p_1588_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_p_1588_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_P_1588_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_p_1588_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_p_1588_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_P_1588_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_p_1588_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_p_1588_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_P_1588_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_p_1588_t_field_data,
 };
 
 
@@ -8704,25 +8709,25 @@ static int32_t bcmpkt_prog_ext_hdr_t_option_set(uint32_t *data, int profile, uin
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_prog_ext_hdr_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_prog_ext_hdr_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT] = {
     bcmpkt_prog_ext_hdr_t_hdr_ext_len_get,
     bcmpkt_prog_ext_hdr_t_next_header_get,
     bcmpkt_prog_ext_hdr_t_option_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_prog_ext_hdr_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_prog_ext_hdr_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT] = {
     bcmpkt_prog_ext_hdr_t_hdr_ext_len_set,
     bcmpkt_prog_ext_hdr_t_next_header_set,
     bcmpkt_prog_ext_hdr_t_option_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_prog_ext_hdr_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PROG_EXT_HDR_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_prog_ext_hdr_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PROG_EXT_HDR_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_prog_ext_hdr_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_prog_ext_hdr_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_prog_ext_hdr_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_prog_ext_hdr_t_field_data,
 };
 
 
@@ -8818,7 +8823,7 @@ static int32_t bcmpkt_psamp_0_t_template_id_set(uint32_t *data, int profile, uin
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_psamp_0_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_psamp_0_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T_FID_COUNT] = {
     bcmpkt_psamp_0_t_flowset_get,
     bcmpkt_psamp_0_t_length_get,
     bcmpkt_psamp_0_t_next_hop_index_get,
@@ -8827,7 +8832,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_psamp_0_t_fget[BCM56890_A0_DN
     bcmpkt_psamp_0_t_template_id_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_psamp_0_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_psamp_0_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T_FID_COUNT] = {
     bcmpkt_psamp_0_t_flowset_set,
     bcmpkt_psamp_0_t_length_set,
     bcmpkt_psamp_0_t_next_hop_index_set,
@@ -8836,13 +8841,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_psamp_0_t_fset[BCM56890_A0_DN
     bcmpkt_psamp_0_t_template_id_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_psamp_0_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_psamp_0_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_psamp_0_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_0_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_psamp_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_psamp_0_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_0_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_psamp_0_t_field_data,
 };
 
 
@@ -8951,7 +8956,7 @@ static int32_t bcmpkt_psamp_1_t_variable_flag_set(uint32_t *data, int profile, u
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_psamp_1_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_1_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_psamp_1_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_FID_COUNT] = {
     bcmpkt_psamp_1_t_dlb_id_get,
     bcmpkt_psamp_1_t_egress_port_get,
     bcmpkt_psamp_1_t_epoch_get,
@@ -8961,7 +8966,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_psamp_1_t_fget[BCM56890_A0_DN
     bcmpkt_psamp_1_t_variable_flag_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_psamp_1_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_1_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_psamp_1_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_FID_COUNT] = {
     bcmpkt_psamp_1_t_dlb_id_set,
     bcmpkt_psamp_1_t_egress_port_set,
     bcmpkt_psamp_1_t_epoch_set,
@@ -8971,13 +8976,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_psamp_1_t_fset[BCM56890_A0_DN
     bcmpkt_psamp_1_t_variable_flag_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_psamp_1_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_1_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_psamp_1_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_psamp_1_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_1_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_psamp_1_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_psamp_1_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_1_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_psamp_1_t_field_data,
 };
 
 
@@ -9089,7 +9094,7 @@ static int32_t bcmpkt_psamp_mirror_on_drop_0_t_template_id_set(uint32_t *data, i
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_psamp_mirror_on_drop_0_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_psamp_mirror_on_drop_0_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_0_t_egress_mod_port_get,
     bcmpkt_psamp_mirror_on_drop_0_t_ingress_port_get,
     bcmpkt_psamp_mirror_on_drop_0_t_length_get,
@@ -9099,7 +9104,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_psamp_mirror_on_drop_0_t_fget
     bcmpkt_psamp_mirror_on_drop_0_t_template_id_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_psamp_mirror_on_drop_0_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_psamp_mirror_on_drop_0_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_0_t_egress_mod_port_set,
     bcmpkt_psamp_mirror_on_drop_0_t_ingress_port_set,
     bcmpkt_psamp_mirror_on_drop_0_t_length_set,
@@ -9109,13 +9114,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_psamp_mirror_on_drop_0_t_fset
     bcmpkt_psamp_mirror_on_drop_0_t_template_id_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_psamp_mirror_on_drop_0_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_psamp_mirror_on_drop_0_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_psamp_mirror_on_drop_0_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_psamp_mirror_on_drop_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_psamp_mirror_on_drop_0_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_psamp_mirror_on_drop_0_t_field_data,
 };
 
 
@@ -9224,7 +9229,7 @@ static int32_t bcmpkt_psamp_mirror_on_drop_3_t_var_len_indicator_set(uint32_t *d
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_psamp_mirror_on_drop_3_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_psamp_mirror_on_drop_3_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_3_t_drop_reason_get,
     bcmpkt_psamp_mirror_on_drop_3_t_reserved_0_get,
     bcmpkt_psamp_mirror_on_drop_3_t_sampled_length_get,
@@ -9234,7 +9239,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_psamp_mirror_on_drop_3_t_fget
     bcmpkt_psamp_mirror_on_drop_3_t_var_len_indicator_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_psamp_mirror_on_drop_3_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_psamp_mirror_on_drop_3_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_3_t_drop_reason_set,
     bcmpkt_psamp_mirror_on_drop_3_t_reserved_0_set,
     bcmpkt_psamp_mirror_on_drop_3_t_sampled_length_set,
@@ -9244,13 +9249,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_psamp_mirror_on_drop_3_t_fset
     bcmpkt_psamp_mirror_on_drop_3_t_var_len_indicator_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_psamp_mirror_on_drop_3_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_psamp_mirror_on_drop_3_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_psamp_mirror_on_drop_3_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_psamp_mirror_on_drop_3_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_psamp_mirror_on_drop_3_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_psamp_mirror_on_drop_3_t_field_data,
 };
 
 
@@ -9393,7 +9398,7 @@ static int32_t bcmpkt_rarp_t_target_ip_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_rarp_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RARP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_rarp_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_FID_COUNT] = {
     bcmpkt_rarp_t_hardware_len_get,
     bcmpkt_rarp_t_hardware_type_get,
     bcmpkt_rarp_t_operation_get,
@@ -9405,7 +9410,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_rarp_t_fget[BCM56890_A0_DNA_6
     bcmpkt_rarp_t_target_ip_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_rarp_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RARP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_rarp_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_FID_COUNT] = {
     bcmpkt_rarp_t_hardware_len_set,
     bcmpkt_rarp_t_hardware_type_set,
     bcmpkt_rarp_t_operation_set,
@@ -9417,13 +9422,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_rarp_t_fset[BCM56890_A0_DNA_6
     bcmpkt_rarp_t_target_ip_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rarp_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_rarp_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_rarp_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RARP_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_rarp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_rarp_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RARP_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_rarp_t_field_data,
 };
 
 
@@ -9503,7 +9508,7 @@ static int32_t bcmpkt_routing_t_segments_left_set(uint32_t *data, int profile, u
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_routing_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ROUTING_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_routing_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ROUTING_T_FID_COUNT] = {
     bcmpkt_routing_t_data_get,
     bcmpkt_routing_t_hdr_ext_len_get,
     bcmpkt_routing_t_next_header_get,
@@ -9511,7 +9516,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_routing_t_fget[BCM56890_A0_DN
     bcmpkt_routing_t_segments_left_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_routing_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ROUTING_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_routing_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ROUTING_T_FID_COUNT] = {
     bcmpkt_routing_t_data_set,
     bcmpkt_routing_t_hdr_ext_len_set,
     bcmpkt_routing_t_next_header_set,
@@ -9519,13 +9524,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_routing_t_fset[BCM56890_A0_DN
     bcmpkt_routing_t_segments_left_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_routing_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ROUTING_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_routing_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ROUTING_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_routing_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_ROUTING_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_routing_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_routing_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_ROUTING_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_routing_t_field_data,
 };
 
 
@@ -9559,23 +9564,23 @@ static int32_t bcmpkt_rspan_t_tpid_set(uint32_t *data, int profile, uint32_t val
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_rspan_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RSPAN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_rspan_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RSPAN_T_FID_COUNT] = {
     bcmpkt_rspan_t_tag_get,
     bcmpkt_rspan_t_tpid_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_rspan_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RSPAN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_rspan_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RSPAN_T_FID_COUNT] = {
     bcmpkt_rspan_t_tag_set,
     bcmpkt_rspan_t_tpid_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_rspan_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RSPAN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_rspan_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RSPAN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_rspan_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_RSPAN_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_rspan_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_rspan_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_RSPAN_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_rspan_t_field_data,
 };
 
 
@@ -9684,7 +9689,7 @@ static int32_t bcmpkt_segment_routing_srh_t_tag_set(uint32_t *data, int profile,
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_segment_routing_srh_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_SRH_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_segment_routing_srh_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_SRH_T_FID_COUNT] = {
     bcmpkt_segment_routing_srh_t_flags_get,
     bcmpkt_segment_routing_srh_t_hdr_ext_len_get,
     bcmpkt_segment_routing_srh_t_last_entry_get,
@@ -9694,7 +9699,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_segment_routing_srh_t_fget[BC
     bcmpkt_segment_routing_srh_t_tag_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_segment_routing_srh_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_SRH_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_segment_routing_srh_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_SRH_T_FID_COUNT] = {
     bcmpkt_segment_routing_srh_t_flags_set,
     bcmpkt_segment_routing_srh_t_hdr_ext_len_set,
     bcmpkt_segment_routing_srh_t_last_entry_set,
@@ -9704,13 +9709,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_segment_routing_srh_t_fset[BC
     bcmpkt_segment_routing_srh_t_tag_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_segment_routing_srh_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_SRH_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_segment_routing_srh_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_SRH_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_segment_routing_srh_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_SRH_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_segment_routing_srh_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_segment_routing_srh_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_SRH_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_segment_routing_srh_t_field_data,
 };
 
 
@@ -9820,7 +9825,7 @@ static int32_t bcmpkt_segment_routing_t_tag_set(uint32_t *data, int profile, uin
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_segment_routing_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_segment_routing_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_T_FID_COUNT] = {
     bcmpkt_segment_routing_t_hdr_ext_len_get,
     bcmpkt_segment_routing_t_last_entry_flags_get,
     bcmpkt_segment_routing_t_next_header_get,
@@ -9830,7 +9835,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_segment_routing_t_fget[BCM568
     bcmpkt_segment_routing_t_tag_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_segment_routing_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_segment_routing_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_T_FID_COUNT] = {
     bcmpkt_segment_routing_t_hdr_ext_len_set,
     bcmpkt_segment_routing_t_last_entry_flags_set,
     bcmpkt_segment_routing_t_next_header_set,
@@ -9840,13 +9845,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_segment_routing_t_fset[BCM568
     bcmpkt_segment_routing_t_tag_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_segment_routing_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_segment_routing_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_segment_routing_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SEGMENT_ROUTING_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_segment_routing_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_segment_routing_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SEGMENT_ROUTING_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_segment_routing_t_field_data,
 };
 
 
@@ -9896,25 +9901,25 @@ static int32_t bcmpkt_sflow_shim_0_t_version_set(uint32_t *data, int profile, ui
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_sflow_shim_0_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_sflow_shim_0_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT] = {
     bcmpkt_sflow_shim_0_t_sys_destination_get,
     bcmpkt_sflow_shim_0_t_sys_source_get,
     bcmpkt_sflow_shim_0_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_sflow_shim_0_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_sflow_shim_0_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT] = {
     bcmpkt_sflow_shim_0_t_sys_destination_set,
     bcmpkt_sflow_shim_0_t_sys_source_set,
     bcmpkt_sflow_shim_0_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_sflow_shim_0_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_sflow_shim_0_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_sflow_shim_0_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_sflow_shim_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_sflow_shim_0_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_sflow_shim_0_t_field_data,
 };
 
 
@@ -10038,7 +10043,7 @@ static int32_t bcmpkt_sflow_shim_1_t_sys_opcode_set(uint32_t *data, int profile,
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_sflow_shim_1_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_sflow_shim_1_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT] = {
     bcmpkt_sflow_shim_1_t_flag_dest_sample_get,
     bcmpkt_sflow_shim_1_t_flag_discarded_get,
     bcmpkt_sflow_shim_1_t_flag_flex_sample_get,
@@ -10049,7 +10054,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_sflow_shim_1_t_fget[BCM56890_
     bcmpkt_sflow_shim_1_t_sys_opcode_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_sflow_shim_1_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_sflow_shim_1_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT] = {
     bcmpkt_sflow_shim_1_t_flag_dest_sample_set,
     bcmpkt_sflow_shim_1_t_flag_discarded_set,
     bcmpkt_sflow_shim_1_t_flag_flex_sample_set,
@@ -10060,13 +10065,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_sflow_shim_1_t_fset[BCM56890_
     bcmpkt_sflow_shim_1_t_sys_opcode_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_sflow_shim_1_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_1_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_sflow_shim_1_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_sflow_shim_1_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_sflow_shim_1_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_sflow_shim_1_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_sflow_shim_1_t_field_data,
 };
 
 
@@ -10101,23 +10106,23 @@ static int32_t bcmpkt_sflow_shim_2_t_user_meta_data_set(uint32_t *data, int prof
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_sflow_shim_2_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_sflow_shim_2_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT] = {
     bcmpkt_sflow_shim_2_t_sequence_num_get,
     bcmpkt_sflow_shim_2_t_user_meta_data_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_sflow_shim_2_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_sflow_shim_2_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT] = {
     bcmpkt_sflow_shim_2_t_sequence_num_set,
     bcmpkt_sflow_shim_2_t_user_meta_data_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_sflow_shim_2_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_2_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_sflow_shim_2_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_2_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_sflow_shim_2_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_sflow_shim_2_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_sflow_shim_2_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_sflow_shim_2_t_field_data,
 };
 
 
@@ -10152,23 +10157,23 @@ static int32_t bcmpkt_snap_llc_t_snap_llc_set(uint32_t *data, int profile, uint3
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_snap_llc_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SNAP_LLC_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_snap_llc_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SNAP_LLC_T_FID_COUNT] = {
     bcmpkt_snap_llc_t_length_get,
     bcmpkt_snap_llc_t_snap_llc_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_snap_llc_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SNAP_LLC_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_snap_llc_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SNAP_LLC_T_FID_COUNT] = {
     bcmpkt_snap_llc_t_length_set,
     bcmpkt_snap_llc_t_snap_llc_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_snap_llc_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SNAP_LLC_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_snap_llc_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SNAP_LLC_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_snap_llc_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SNAP_LLC_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_snap_llc_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_snap_llc_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SNAP_LLC_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_snap_llc_t_field_data,
 };
 
 
@@ -10188,21 +10193,21 @@ static int32_t bcmpkt_std_segment_id_t_data_set(uint32_t *data, int profile, uin
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_std_segment_id_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_STD_SEGMENT_ID_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_std_segment_id_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_STD_SEGMENT_ID_T_FID_COUNT] = {
     bcmpkt_std_segment_id_t_data_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_std_segment_id_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_STD_SEGMENT_ID_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_std_segment_id_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_STD_SEGMENT_ID_T_FID_COUNT] = {
     bcmpkt_std_segment_id_t_data_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_std_segment_id_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_STD_SEGMENT_ID_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_std_segment_id_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_STD_SEGMENT_ID_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_std_segment_id_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_STD_SEGMENT_ID_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_std_segment_id_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_std_segment_id_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_STD_SEGMENT_ID_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_std_segment_id_t_field_data,
 };
 
 
@@ -10236,23 +10241,23 @@ static int32_t bcmpkt_svtag_t_data_upr_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_svtag_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SVTAG_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_svtag_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SVTAG_T_FID_COUNT] = {
     bcmpkt_svtag_t_data_lwr_get,
     bcmpkt_svtag_t_data_upr_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_svtag_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SVTAG_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_svtag_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SVTAG_T_FID_COUNT] = {
     bcmpkt_svtag_t_data_lwr_set,
     bcmpkt_svtag_t_data_upr_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_svtag_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SVTAG_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_svtag_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SVTAG_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_svtag_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_SVTAG_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_svtag_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_svtag_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_SVTAG_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_svtag_t_field_data,
 };
 
 
@@ -10286,23 +10291,23 @@ static int32_t bcmpkt_tcp_first_4bytes_t_src_port_set(uint32_t *data, int profil
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_tcp_first_4bytes_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_tcp_first_4bytes_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_first_4bytes_t_dst_port_get,
     bcmpkt_tcp_first_4bytes_t_src_port_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_tcp_first_4bytes_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_tcp_first_4bytes_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_first_4bytes_t_dst_port_set,
     bcmpkt_tcp_first_4bytes_t_src_port_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_tcp_first_4bytes_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_tcp_first_4bytes_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_tcp_first_4bytes_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_tcp_first_4bytes_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_tcp_first_4bytes_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_tcp_first_4bytes_t_field_data,
 };
 
 
@@ -10398,7 +10403,7 @@ static int32_t bcmpkt_tcp_last_16bytes_t_win_size_set(uint32_t *data, int profil
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_tcp_last_16bytes_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_tcp_last_16bytes_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_last_16bytes_t_ack_num_get,
     bcmpkt_tcp_last_16bytes_t_checksum_get,
     bcmpkt_tcp_last_16bytes_t_hdr_len_and_flags_get,
@@ -10407,7 +10412,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_tcp_last_16bytes_t_fget[BCM56
     bcmpkt_tcp_last_16bytes_t_win_size_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_tcp_last_16bytes_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_tcp_last_16bytes_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_last_16bytes_t_ack_num_set,
     bcmpkt_tcp_last_16bytes_t_checksum_set,
     bcmpkt_tcp_last_16bytes_t_hdr_len_and_flags_set,
@@ -10416,13 +10421,13 @@ bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_tcp_last_16bytes_t_fset[BCM56
     bcmpkt_tcp_last_16bytes_t_win_size_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_tcp_last_16bytes_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_tcp_last_16bytes_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_tcp_last_16bytes_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_tcp_last_16bytes_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_tcp_last_16bytes_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_tcp_last_16bytes_t_field_data,
 };
 
 
@@ -10486,27 +10491,27 @@ static int32_t bcmpkt_udp_t_udp_length_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_udp_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UDP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_udp_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UDP_T_FID_COUNT] = {
     bcmpkt_udp_t_checksum_get,
     bcmpkt_udp_t_dst_port_get,
     bcmpkt_udp_t_src_port_get,
     bcmpkt_udp_t_udp_length_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_udp_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UDP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_udp_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UDP_T_FID_COUNT] = {
     bcmpkt_udp_t_checksum_set,
     bcmpkt_udp_t_dst_port_set,
     bcmpkt_udp_t_src_port_set,
     bcmpkt_udp_t_udp_length_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_udp_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_udp_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_udp_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UDP_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_udp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_udp_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UDP_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_udp_t_field_data,
 };
 
 
@@ -10542,23 +10547,23 @@ static int32_t bcmpkt_unknown_l3_t_next_16bytes_of_l3_payload_set(uint32_t *data
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_unknown_l3_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_unknown_l3_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
     bcmpkt_unknown_l3_t_first_16bytes_of_l3_payload_get,
     bcmpkt_unknown_l3_t_next_16bytes_of_l3_payload_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_unknown_l3_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_unknown_l3_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
     bcmpkt_unknown_l3_t_first_16bytes_of_l3_payload_set,
     bcmpkt_unknown_l3_t_next_16bytes_of_l3_payload_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_unknown_l3_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_unknown_l3_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_unknown_l3_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_unknown_l3_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_unknown_l3_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_unknown_l3_t_field_data,
 };
 
 
@@ -10578,21 +10583,21 @@ static int32_t bcmpkt_unknown_l4_t_first_4bytes_of_l4_payload_set(uint32_t *data
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_unknown_l4_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_unknown_l4_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
     bcmpkt_unknown_l4_t_first_4bytes_of_l4_payload_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_unknown_l4_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_unknown_l4_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
     bcmpkt_unknown_l4_t_first_4bytes_of_l4_payload_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_unknown_l4_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_unknown_l4_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_unknown_l4_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_unknown_l4_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_unknown_l4_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_unknown_l4_t_field_data,
 };
 
 
@@ -10657,27 +10662,27 @@ static int32_t bcmpkt_unknown_l5_t_l5_bytes_8_9_set(uint32_t *data, int profile,
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_unknown_l5_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_unknown_l5_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
     bcmpkt_unknown_l5_t_l5_bytes_0_1_get,
     bcmpkt_unknown_l5_t_l5_bytes_2_3_get,
     bcmpkt_unknown_l5_t_l5_bytes_4_7_get,
     bcmpkt_unknown_l5_t_l5_bytes_8_9_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_unknown_l5_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_unknown_l5_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
     bcmpkt_unknown_l5_t_l5_bytes_0_1_set,
     bcmpkt_unknown_l5_t_l5_bytes_2_3_set,
     bcmpkt_unknown_l5_t_l5_bytes_4_7_set,
     bcmpkt_unknown_l5_t_l5_bytes_8_9_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_unknown_l5_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_unknown_l5_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_unknown_l5_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_unknown_l5_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_unknown_l5_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_unknown_l5_t_field_data,
 };
 
 
@@ -10741,27 +10746,27 @@ static int32_t bcmpkt_vlan_t_vid_set(uint32_t *data, int profile, uint32_t val)
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_vlan_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_VLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_vlan_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_VLAN_T_FID_COUNT] = {
     bcmpkt_vlan_t_cfi_get,
     bcmpkt_vlan_t_pcp_get,
     bcmpkt_vlan_t_tpid_get,
     bcmpkt_vlan_t_vid_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_vlan_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_VLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_vlan_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_VLAN_T_FID_COUNT] = {
     bcmpkt_vlan_t_cfi_set,
     bcmpkt_vlan_t_pcp_set,
     bcmpkt_vlan_t_tpid_set,
     bcmpkt_vlan_t_vid_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_vlan_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_vlan_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_vlan_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_VLAN_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_vlan_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_vlan_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_VLAN_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_vlan_t_field_data,
 };
 
 
@@ -10811,25 +10816,25 @@ static int32_t bcmpkt_vxlan_t_vn_id_set(uint32_t *data, int profile, uint32_t va
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_vxlan_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_VXLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_vxlan_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_VXLAN_T_FID_COUNT] = {
     bcmpkt_vxlan_t_flags_reserved_1_get,
     bcmpkt_vxlan_t_reserved2_get,
     bcmpkt_vxlan_t_vn_id_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_vxlan_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_VXLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_vxlan_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_VXLAN_T_FID_COUNT] = {
     bcmpkt_vxlan_t_flags_reserved_1_set,
     bcmpkt_vxlan_t_reserved2_set,
     bcmpkt_vxlan_t_vn_id_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_vxlan_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_vxlan_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_vxlan_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_VXLAN_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_vxlan_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_vxlan_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_VXLAN_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_vxlan_t_field_data,
 };
 
 
@@ -10941,7 +10946,7 @@ static int32_t bcmpkt_wesp_t_wesp_iv_set(uint32_t *data, int profile, uint32_t v
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_wesp_t_fget[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_WESP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_31_6_0_wesp_t_fget[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_FID_COUNT] = {
     bcmpkt_wesp_t_flags_get,
     bcmpkt_wesp_t_header_len_get,
     bcmpkt_wesp_t_next_header_get,
@@ -10951,7 +10956,7 @@ bcmpkt_flex_field_get_f bcm56890_a0_dna_6_5_30_8_0_wesp_t_fget[BCM56890_A0_DNA_6
     bcmpkt_wesp_t_wesp_iv_get,
 };
 
-bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_wesp_t_fset[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_WESP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_31_6_0_wesp_t_fset[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_FID_COUNT] = {
     bcmpkt_wesp_t_flags_set,
     bcmpkt_wesp_t_header_len_set,
     bcmpkt_wesp_t_next_header_set,
@@ -10961,513 +10966,513 @@ bcmpkt_flex_field_set_f bcm56890_a0_dna_6_5_30_8_0_wesp_t_fset[BCM56890_A0_DNA_6
     bcmpkt_wesp_t_wesp_iv_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_30_8_0_wesp_t_field_data[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_WESP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm56890_a0_dna_6_5_31_6_0_wesp_t_field_data[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_30_8_0_wesp_t_field_info = {
-    .num_fields = BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_WESP_T_FID_COUNT,
-    .info = bcm56890_a0_dna_6_5_30_8_0_wesp_t_field_data,
+static bcmpkt_flex_field_info_t bcm56890_a0_dna_6_5_31_6_0_wesp_t_field_info = {
+    .num_fields = BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_WESP_T_FID_COUNT,
+    .info = bcm56890_a0_dna_6_5_31_6_0_wesp_t_field_data,
 };
 
-static bcmpkt_flex_pmd_info_t bcm56890_a0_dna_6_5_30_8_0_flexhdr_info_list[BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_FLEXHDR_COUNT] = {
+static bcmpkt_flex_pmd_info_t bcm56890_a0_dna_6_5_31_6_0_flexhdr_info_list[BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_FLEXHDR_COUNT] = {
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_arp_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_arp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_arp_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_arp_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_arp_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_arp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_authen_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_authen_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_authen_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_authen_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_authen_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_authen_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_bfd_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_bfd_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_bfd_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_bfd_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_bfd_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_bfd_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_cntag_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_cntag_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_cntag_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_cntag_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_cntag_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_cntag_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_cpu_composites_0_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_cpu_composites_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_cpu_composites_0_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_cpu_composites_0_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_cpu_composites_0_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_cpu_composites_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_cpu_composites_1_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_cpu_composites_1_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_cpu_composites_1_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_cpu_composites_1_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_cpu_composites_1_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_cpu_composites_1_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_dest_option_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_dest_option_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_dest_option_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_dest_option_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_dest_option_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_dest_option_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_ep_nih_header_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_ep_nih_header_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_ep_nih_header_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_ep_nih_header_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_ep_nih_header_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_ep_nih_header_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_erspan3_fixed_hdr_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_erspan3_fixed_hdr_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_erspan3_fixed_hdr_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_erspan3_fixed_hdr_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_erspan3_fixed_hdr_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_erspan3_fixed_hdr_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_erspan3_subhdr_5_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_erspan3_subhdr_5_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_erspan3_subhdr_5_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_erspan3_subhdr_5_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_erspan3_subhdr_5_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_erspan3_subhdr_5_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_esp_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_esp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_esp_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_esp_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_esp_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_esp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_ethertype_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_ethertype_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_ethertype_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_ethertype_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_ethertype_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_ethertype_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_frag_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_frag_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_frag_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_frag_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_frag_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_frag_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_gbp_ethernet_shim_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_gbp_ethernet_shim_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_gbp_ethernet_shim_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_gbp_ethernet_shim_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_gbp_ethernet_shim_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_gbp_ethernet_shim_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_generic_loopback_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_generic_loopback_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_generic_loopback_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_generic_loopback_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_generic_loopback_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_generic_loopback_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_gpe_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_gpe_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_gpe_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_gpe_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_gpe_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_gpe_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_gre_chksum_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_gre_chksum_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_gre_chksum_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_gre_chksum_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_gre_chksum_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_gre_chksum_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_gre_key_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_gre_key_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_gre_key_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_gre_key_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_gre_key_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_gre_key_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_gre_rout_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_gre_rout_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_gre_rout_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_gre_rout_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_gre_rout_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_gre_rout_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_gre_seq_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_gre_seq_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_gre_seq_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_gre_seq_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_gre_seq_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_gre_seq_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_gre_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_gre_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_gre_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_gre_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_gre_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_gre_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_hg3_base_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_hg3_base_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_hg3_base_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_hg3_base_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_hg3_base_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_hg3_base_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_hg3_extension_0_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_hg3_extension_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_hg3_extension_0_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_hg3_extension_0_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_hg3_extension_0_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_hg3_extension_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_hop_by_hop_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_hop_by_hop_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_hop_by_hop_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_hop_by_hop_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_hop_by_hop_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_hop_by_hop_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_icmp_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_icmp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_icmp_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_icmp_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_icmp_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_icmp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_ifa_header_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_ifa_header_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_ifa_header_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_ifa_header_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_ifa_header_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_ifa_header_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_ifa_metadata_a_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_ifa_metadata_a_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_ifa_metadata_a_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_ifa_metadata_a_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_ifa_metadata_a_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_ifa_metadata_a_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_ifa_metadata_b_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_ifa_metadata_b_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_ifa_metadata_b_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_ifa_metadata_b_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_ifa_metadata_b_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_ifa_metadata_b_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_ifa_metadata_base_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_ifa_metadata_base_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_ifa_metadata_base_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_ifa_metadata_base_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_ifa_metadata_base_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_ifa_metadata_base_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_igmp_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_igmp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_igmp_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_igmp_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_igmp_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_igmp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_ioam_e2e_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_ioam_e2e_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_ioam_e2e_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_ioam_e2e_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_ioam_e2e_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_ioam_e2e_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_ipfix_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_ipfix_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_ipfix_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_ipfix_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_ipfix_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_ipfix_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_ipv4_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_ipv4_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_ipv4_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_ipv4_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_ipv4_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_ipv4_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_ipv6_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_ipv6_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_ipv6_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_ipv6_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_ipv6_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_ipv6_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_l2_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_l2_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_l2_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_l2_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_l2_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_l2_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_mirror_erspan_sn_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_mirror_erspan_sn_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_mirror_erspan_sn_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_mirror_erspan_sn_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_mirror_erspan_sn_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_mirror_erspan_sn_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_mirror_transport_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_mirror_transport_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_mirror_transport_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_mirror_transport_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_mirror_transport_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_mirror_transport_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_mpls_ach_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_mpls_ach_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_mpls_ach_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_mpls_ach_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_mpls_ach_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_mpls_ach_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_mpls_bv_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_mpls_bv_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_mpls_bv_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_mpls_bv_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_mpls_bv_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_mpls_bv_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_mpls_cw_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_mpls_cw_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_mpls_cw_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_mpls_cw_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_mpls_cw_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_mpls_cw_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_mpls_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_mpls_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_mpls_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_mpls_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_mpls_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_mpls_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_p_1588_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_p_1588_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_p_1588_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_p_1588_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_p_1588_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_p_1588_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_prog_ext_hdr_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_prog_ext_hdr_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_prog_ext_hdr_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_prog_ext_hdr_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_prog_ext_hdr_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_prog_ext_hdr_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_psamp_0_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_psamp_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_psamp_0_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_psamp_0_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_psamp_0_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_psamp_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_psamp_1_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_psamp_1_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_psamp_1_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_psamp_1_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_psamp_1_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_psamp_1_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_psamp_mirror_on_drop_0_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_psamp_mirror_on_drop_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_psamp_mirror_on_drop_0_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_psamp_mirror_on_drop_0_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_psamp_mirror_on_drop_0_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_psamp_mirror_on_drop_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_psamp_mirror_on_drop_3_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_psamp_mirror_on_drop_3_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_psamp_mirror_on_drop_3_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_psamp_mirror_on_drop_3_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_psamp_mirror_on_drop_3_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_psamp_mirror_on_drop_3_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_rarp_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_rarp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_rarp_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_rarp_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_rarp_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_rarp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_routing_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_routing_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_routing_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_routing_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_routing_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_routing_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_rspan_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_rspan_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_rspan_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_rspan_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_rspan_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_rspan_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_segment_routing_srh_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_segment_routing_srh_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_segment_routing_srh_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_segment_routing_srh_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_segment_routing_srh_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_segment_routing_srh_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_segment_routing_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_segment_routing_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_segment_routing_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_segment_routing_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_segment_routing_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_segment_routing_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_sflow_shim_0_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_sflow_shim_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_sflow_shim_0_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_sflow_shim_0_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_sflow_shim_0_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_sflow_shim_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_sflow_shim_1_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_sflow_shim_1_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_sflow_shim_1_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_sflow_shim_1_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_sflow_shim_1_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_sflow_shim_1_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_sflow_shim_2_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_sflow_shim_2_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_sflow_shim_2_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_sflow_shim_2_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_sflow_shim_2_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_sflow_shim_2_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_snap_llc_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_snap_llc_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_snap_llc_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_snap_llc_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_snap_llc_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_snap_llc_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_std_segment_id_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_std_segment_id_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_std_segment_id_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_std_segment_id_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_std_segment_id_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_std_segment_id_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_svtag_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_svtag_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_svtag_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_svtag_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_svtag_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_svtag_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_tcp_first_4bytes_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_tcp_first_4bytes_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_tcp_first_4bytes_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_tcp_first_4bytes_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_tcp_first_4bytes_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_tcp_first_4bytes_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_tcp_last_16bytes_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_tcp_last_16bytes_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_tcp_last_16bytes_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_tcp_last_16bytes_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_tcp_last_16bytes_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_tcp_last_16bytes_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_udp_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_udp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_udp_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_udp_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_udp_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_udp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_unknown_l3_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_unknown_l3_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_unknown_l3_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_unknown_l3_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_unknown_l3_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_unknown_l3_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_unknown_l4_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_unknown_l4_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_unknown_l4_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_unknown_l4_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_unknown_l4_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_unknown_l4_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_unknown_l5_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_unknown_l5_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_unknown_l5_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_unknown_l5_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_unknown_l5_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_unknown_l5_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_vlan_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_vlan_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_vlan_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_vlan_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_vlan_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_vlan_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_vxlan_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_vxlan_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_vxlan_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_vxlan_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_vxlan_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_vxlan_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_wesp_t_field_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_wesp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56890_a0_dna_6_5_30_8_0_wesp_t_fget,
-        .flex_fset = bcm56890_a0_dna_6_5_30_8_0_wesp_t_fset,
+        .flex_fget = bcm56890_a0_dna_6_5_31_6_0_wesp_t_fget,
+        .flex_fset = bcm56890_a0_dna_6_5_31_6_0_wesp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_field_info,
-        .reasons_info = &bcm56890_a0_dna_6_5_30_8_0_rxpmd_flex_reasons_info,
+        .field_info = &bcm56890_a0_dna_6_5_31_6_0_rxpmd_flex_field_info,
+        .reasons_info = &bcm56890_a0_dna_6_5_31_6_0_rxpmd_flex_reasons_info,
         .flex_common_fget = bcm56890_a0_rxpmd_flex_fget,
         .flex_common_fset = bcm56890_a0_rxpmd_flex_fset,
     },
 };
 
-static shr_enum_map_t bcm56890_a0_dna_6_5_30_8_0_flexhdr_id_map[] = {
-    BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_FLEXHDR_NAME_MAP_INIT
+static shr_enum_map_t bcm56890_a0_dna_6_5_31_6_0_flexhdr_id_map[] = {
+    BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_FLEXHDR_NAME_MAP_INIT
 };
 
-shr_enum_map_t * bcm56890_a0_dna_6_5_30_8_0_flexhdr_map_get(void)
+shr_enum_map_t * bcm56890_a0_dna_6_5_31_6_0_flexhdr_map_get(void)
 {
-    return bcm56890_a0_dna_6_5_30_8_0_flexhdr_id_map;
+    return bcm56890_a0_dna_6_5_31_6_0_flexhdr_id_map;
 }
 
-bcmpkt_flex_pmd_info_t * bcm56890_a0_dna_6_5_30_8_0_flex_pmd_info_get(uint32_t hid)
+bcmpkt_flex_pmd_info_t * bcm56890_a0_dna_6_5_31_6_0_flex_pmd_info_get(uint32_t hid)
 {
-    if (hid >= BCM56890_A0_DNA_6_5_30_8_0_BCMPKT_FLEXHDR_COUNT) {
+    if (hid >= BCM56890_A0_DNA_6_5_31_6_0_BCMPKT_FLEXHDR_COUNT) {
         return NULL;
     }
 
-    return &bcm56890_a0_dna_6_5_30_8_0_flexhdr_info_list[hid];
+    return &bcm56890_a0_dna_6_5_31_6_0_flexhdr_info_list[hid];
 }
 
-int bcm56890_a0_dna_6_5_30_8_0_flexhdr_variant_support_map[BCMPKT_PMD_COUNT] = {
+int bcm56890_a0_dna_6_5_31_6_0_flexhdr_variant_support_map[BCMPKT_PMD_COUNT] = {
     14,
     21,
     22,
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_bcmpkt_rxpmd_match_id.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_bcmpkt_rxpmd_match_id.c
similarity index 66%
rename from platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_bcmpkt_rxpmd_match_id.c
rename to platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_bcmpkt_rxpmd_match_id.c
index 2f34751f8ff6..e4cc51821349 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_bcmpkt_rxpmd_match_id.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_bcmpkt_rxpmd_match_id.c
@@ -2,8 +2,8 @@
  *
  * DO NOT EDIT THIS FILE!
  * This file is auto-generated by xfc_map_parser
- * from the NPL output file(s) bcm78800_a0_dna_6_5_30_3_1_sf_match_id_info.yml
- * for device bcm78800_a0 and variant dna_6_5_30_3_1.
+ * from the NPL output file(s) bcm78800_a0_dna_6_5_31_5_0_sf_match_id_info.yml
+ * for device bcm78800_a0 and variant dna_6_5_31_5_0.
  * Edits to this file will be lost when it is regenerated.
  *
  * $Id: $
@@ -29,39 +29,39 @@
 
 
 #include <bcmpkt/bcmpkt_rxpmd_match_id.h>
-#include <bcmpkt/xfcr/bcm78800_a0/dna_6_5_30_3_1/bcm78800_a0_dna_6_5_30_3_1_bcmpkt_rxpmd_match_id_defs.h>
+#include <bcmpkt/xfcr/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_bcmpkt_rxpmd_match_id_defs.h>
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l2_hdr_cntag[1] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_cntag[1] =
 {
     0x366c,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l2_hdr_itag[1] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_itag[1] =
 {
     0x78f0,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l2_hdr_l2[1] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_l2[1] =
 {
     0x1fffe,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l2_hdr_otag[1] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_otag[1] =
 {
     0xff00,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l2_hdr_snap_or_llc[1] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_snap_or_llc[1] =
 {
     0x1e4c8,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_arp[1] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_arp[1] =
 {
     0x4,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_auth_ext_1[39] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_auth_ext_1[39] =
 {
     0x10,
     0x400000,
@@ -104,7 +104,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x777f7,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_auth_ext_2[55] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_auth_ext_2[55] =
 {
     0x0,
     0x0,
@@ -163,7 +163,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0xeef0,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_bfd[57] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_bfd[57] =
 {
     0x0,
     0x0,
@@ -224,7 +224,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x80080200,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_dest_opt_ext_1[42] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_dest_opt_ext_1[42] =
 {
     0x0,
     0x0,
@@ -270,7 +270,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x1ddfdd,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_dest_opt_ext_2[55] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_dest_opt_ext_2[55] =
 {
     0x0,
     0x0,
@@ -329,7 +329,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0xeef0000,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_esp_ext[55] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_esp_ext[55] =
 {
     0x0,
     0x0,
@@ -388,7 +388,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x10000000,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ethertype[29] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ethertype[29] =
 {
     0x1e,
     0x400000,
@@ -421,7 +421,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x1bbbfb,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_frag_ext_1[45] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_frag_ext_1[45] =
 {
     0x0,
     0x0,
@@ -470,7 +470,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x777,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_frag_ext_2[56] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_frag_ext_2[56] =
 {
     0x0,
     0x0,
@@ -530,7 +530,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x1dd,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_hop_by_hop_ext_1[48] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_hop_by_hop_ext_1[48] =
 {
     0x0,
     0x0,
@@ -582,7 +582,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0xeef,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_hop_by_hop_ext_2[56] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_hop_by_hop_ext_2[56] =
 {
     0x0,
     0x0,
@@ -642,7 +642,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x1dde00,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_icmp[57] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_icmp[57] =
 {
     0x0,
     0x400000,
@@ -703,7 +703,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x2000008,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ifa_header[48] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ifa_header[48] =
 {
     0x0,
     0x0,
@@ -755,7 +755,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x15e000,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ifa_metadata_base[48] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ifa_metadata_base[48] =
 {
     0x0,
     0x0,
@@ -807,7 +807,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x110000,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_igmp[36] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_igmp[36] =
 {
     0x0,
     0x0,
@@ -847,7 +847,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x10000,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ipv4[36] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ipv4[36] =
 {
     0x18,
     0x400000,
@@ -887,7 +887,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x1000e,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ipv6[58] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ipv6[58] =
 {
     0x0,
     0x0,
@@ -949,7 +949,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0xe,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_p_1588[58] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_p_1588[58] =
 {
     0x0,
     0x0,
@@ -1011,7 +1011,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x2,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_prog_ext_1[51] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_prog_ext_1[51] =
 {
     0x0,
     0x0,
@@ -1066,7 +1066,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0xeefeef,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_prog_ext_2[57] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_prog_ext_2[57] =
 {
     0x0,
     0x0,
@@ -1127,7 +1127,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x3,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rarp[29] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rarp[29] =
 {
     0x0,
     0x0,
@@ -1160,7 +1160,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x80000,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rout_ext_1[54] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rout_ext_1[54] =
 {
     0x0,
     0x0,
@@ -1218,7 +1218,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x1ddfddf,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rout_ext_2[57] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rout_ext_2[57] =
 {
     0x0,
     0x0,
@@ -1279,7 +1279,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x3bbc,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_tcp_first_4bytes[57] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_tcp_first_4bytes[57] =
 {
     0x0,
     0x0,
@@ -1340,7 +1340,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x2c02c0b0,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_tcp_last_16bytes[57] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_tcp_last_16bytes[57] =
 {
     0x0,
     0x0,
@@ -1401,7 +1401,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x280280a0,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_udp[58] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_udp[58] =
 {
     0x0,
     0x0,
@@ -1463,7 +1463,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x6,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l3[29] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l3[29] =
 {
     0x0,
     0x0,
@@ -1496,7 +1496,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x100000,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l4[58] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l4[58] =
 {
     0x0,
     0x0,
@@ -1558,7 +1558,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x8,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l5[58] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l5[58] =
 {
     0x0,
     0x0,
@@ -1620,7 +1620,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0x4,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_wesp_ext_1[58] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_wesp_ext_1[58] =
 {
     0x0,
     0x0,
@@ -1682,7 +1682,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0xe,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_wesp_ext_2[58] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_wesp_ext_2[58] =
 {
     0x0,
     0x0,
@@ -1744,66 +1744,66 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr
     0xe,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l2_hdr_cntag[2] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_cntag[2] =
 {
     0xcc066330,
     0x66330198,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l2_hdr_gbp_ethernet_shim[2] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_gbp_ethernet_shim[2] =
 {
     0x10088440,
     0x88440221,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l2_hdr_hg3_base[3] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_hg3_base[3] =
 {
     0xff800000,
     0xffffffff,
     0x7,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l2_hdr_hg3_ext_0[3] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_hg3_ext_0[3] =
 {
     0x0,
     0xffffe000,
     0x7,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l2_hdr_itag[3] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_itag[3] =
 {
     0xe01f0f80,
     0xf0f807c3,
     0x1,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l2_hdr_l2[3] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_l2[3] =
 {
     0xfffffffe,
     0xffffffff,
     0x7,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l2_hdr_otag[3] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_otag[3] =
 {
     0x3ff000,
     0xff000ffc,
     0x3,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l2_hdr_snap_or_llc[3] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_snap_or_llc[3] =
 {
     0x88744a20,
     0x44a21d12,
     0x7,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_arp[1] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_arp[1] =
 {
     0x4,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_auth_ext_1[15] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_auth_ext_1[15] =
 {
     0x10,
     0x0,
@@ -1822,7 +1822,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0xf7,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_auth_ext_2[37] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_auth_ext_2[37] =
 {
     0x0,
     0x0,
@@ -1855,15 +1855,15 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x3dfbc000,
-    0x0,
+    0x1efde000,
     0x0,
     0x0,
     0x0,
-    0xf7ef000,
+    0xf0000000,
+    0xf7e,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_bfd[42] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_bfd[41] =
 {
     0x0,
     0x0,
@@ -1896,20 +1896,19 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x100008,
     0x200010,
     0x80020,
-    0x200008,
-    0x400020,
-    0x800040,
-    0x200080,
-    0x100020,
-    0x80004,
     0x100008,
     0x200010,
-    0x80020,
-    0x44400008,
-    0x4444,
+    0x400020,
+    0x100040,
+    0x40010,
+    0x80008,
+    0x100010,
+    0x200020,
+    0x80008,
+    0x44444440,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_dcn[41] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_dcn[40] =
 {
     0x0,
     0x0,
@@ -1942,19 +1941,18 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x200010,
     0x400020,
     0x100040,
-    0x400010,
-    0x800040,
-    0x1000080,
-    0x400100,
-    0x200040,
-    0x100008,
     0x200010,
     0x400020,
-    0x100040,
-    0x10,
+    0x800040,
+    0x200080,
+    0x80020,
+    0x100010,
+    0x200020,
+    0x400040,
+    0x100010,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_dest_opt_ext_1[19] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_dest_opt_ext_1[19] =
 {
     0x0,
     0x0,
@@ -1977,7 +1975,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x3df,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_dest_opt_ext_2[38] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_dest_opt_ext_2[37] =
 {
     0x0,
     0x0,
@@ -2010,16 +2008,15 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0xf7e,
     0x0,
     0x0,
-    0xc0000000,
-    0x3dfb,
+    0xe0000000,
+    0x1efd,
     0x0,
     0x0,
     0x0,
-    0xf0000000,
-    0xf7e,
+    0xf7ef000,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_esp_ext[38] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_esp_ext[37] =
 {
     0x0,
     0x0,
@@ -2053,15 +2050,14 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x4000,
-    0x0,
+    0x2000,
     0x0,
     0x0,
     0x0,
-    0x1000,
+    0x10000000,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ethertype[42] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ethertype[42] =
 {
     0x1e,
     0x0,
@@ -2094,20 +2090,20 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0xfefdff7e,
     0xfdfbfefd,
     0xff7efdfb,
-    0xfdfbff7e,
-    0xfbf7fdfb,
-    0xf7effbf7,
-    0xfdfbf7ef,
-    0x7efdfdfb,
-    0xff7effbf,
     0xfefdff7e,
     0xfdfbfefd,
-    0xff7efdfb,
-    0xffffef7e,
-    0x7ffff,
+    0xfbf7fdfb,
+    0xfefdfbf7,
+    0xffbf7efd,
+    0xff7eff7e,
+    0xfefdfefd,
+    0xfdfbfdfb,
+    0xef7eff7e,
+    0xffffffff,
+    0x7,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_frag_ext_1[22] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_frag_ext_1[22] =
 {
     0x0,
     0x0,
@@ -2133,7 +2129,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0xf7eff7e,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_frag_ext_2[38] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_frag_ext_2[38] =
 {
     0x0,
     0x0,
@@ -2167,15 +2163,15 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x7bf78000,
-    0x0,
+    0x3dfbc000,
     0x0,
     0x0,
     0x0,
-    0x1efde000,
+    0xe0000000,
+    0x1efd,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gpe[41] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gpe[40] =
 {
     0x0,
     0x0,
@@ -2208,19 +2204,18 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0xc00060,
     0x18000c0,
     0x600180,
-    0x1800060,
-    0x3000180,
-    0x6000300,
-    0x1800600,
-    0xc00180,
-    0x600030,
     0xc00060,
     0x18000c0,
-    0x600180,
-    0x60,
+    0x3000180,
+    0xc00300,
+    0x3000c0,
+    0x600060,
+    0xc000c0,
+    0x1800180,
+    0x600060,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre[23] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre[23] =
 {
     0x0,
     0x0,
@@ -2247,7 +2242,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x7ffffff,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_chksum[23] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_chksum[23] =
 {
     0x0,
     0x0,
@@ -2274,7 +2269,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x3fff,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_key[23] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_key[23] =
 {
     0x0,
     0x0,
@@ -2301,7 +2296,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x3fc07f,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_rout[23] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_rout[23] =
 {
     0x0,
     0x0,
@@ -2328,7 +2323,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x6333366,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_seq[23] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_seq[23] =
 {
     0x0,
     0x0,
@@ -2355,7 +2350,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x7bc3c78,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_hop_by_hop_ext_1[27] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_hop_by_hop_ext_1[27] =
 {
     0x0,
     0x0,
@@ -2386,7 +2381,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0xf7eff7e,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_hop_by_hop_ext_2[39] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_hop_by_hop_ext_2[38] =
 {
     0x0,
     0x0,
@@ -2420,16 +2415,15 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x1efd,
     0x0,
     0x0,
-    0x80000000,
-    0x7bf7,
+    0xc0000000,
+    0x3dfb,
     0x0,
     0x0,
     0x0,
-    0xe0000000,
-    0x1efd,
+    0x1efde000,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_icmp[40] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_icmp[40] =
 {
     0x0,
     0x0,
@@ -2462,18 +2456,18 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x40004000,
     0x8000a000,
     0x20000000,
-    0x80008000,
-    0x10000,
-    0x28001,
-    0x80000002,
-    0x0,
-    0x20002000,
     0x40004000,
-    0x8000a000,
+    0x80008000,
+    0x14000,
+    0x40000001,
     0x20000000,
+    0x40002000,
+    0xa0004000,
+    0x8000,
+    0x2000,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ifa_header[28] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ifa_header[28] =
 {
     0x0,
     0x0,
@@ -2505,7 +2499,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x85,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ifa_metadata_base[28] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ifa_metadata_base[28] =
 {
     0x0,
     0x0,
@@ -2537,7 +2531,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x81,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_igmp[11] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_igmp[11] =
 {
     0x0,
     0x0,
@@ -2552,7 +2546,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x20,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ioam_e2e[41] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ioam_e2e[40] =
 {
     0x0,
     0x0,
@@ -2585,19 +2579,18 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x800040,
     0x1000080,
     0x400100,
-    0x1000040,
-    0x2000100,
-    0x4000200,
-    0x1000400,
-    0x800100,
-    0x400020,
     0x800040,
     0x1000080,
-    0x400100,
-    0x40,
+    0x2000100,
+    0x800200,
+    0x200080,
+    0x400040,
+    0x800080,
+    0x1000100,
+    0x400040,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ipv4[11] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ipv4[11] =
 {
     0x18,
     0x0,
@@ -2612,7 +2605,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x20,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ipv6[41] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ipv6[40] =
 {
     0x0,
     0x0,
@@ -2645,19 +2638,18 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0xfefdff7e,
     0xfdfbfefd,
     0xff7efdfb,
-    0xfdfbff7e,
-    0xfbf7fdfb,
-    0xf7effbf7,
-    0xfdfbf7ef,
-    0x7efdfdfb,
-    0xff7effbf,
     0xfefdff7e,
     0xfdfbfefd,
-    0xff7efdfb,
-    0xf7e,
+    0xfbf7fdfb,
+    0xfefdfbf7,
+    0xffbf7efd,
+    0xff7eff7e,
+    0xfefdfefd,
+    0xfdfbfdfb,
+    0xf7eff7e,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls0[42] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls0[41] =
 {
     0x0,
     0x0,
@@ -2698,12 +2690,11 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x0,
-    0xffffe000,
-    0xffff,
+    0xe0000000,
+    0xffffffff,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls1[42] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls1[41] =
 {
     0x0,
     0x0,
@@ -2744,12 +2735,11 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x0,
-    0xffffc000,
-    0xfff,
+    0xc0000000,
+    0xfffffff,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls2[42] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls2[41] =
 {
     0x0,
     0x0,
@@ -2790,12 +2780,11 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x0,
-    0xffff8000,
-    0xff,
+    0x80000000,
+    0xffffff,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls3[42] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls3[41] =
 {
     0x0,
     0x0,
@@ -2837,11 +2826,10 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0xffff0000,
-    0xf,
+    0xfffff,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls4[41] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls4[41] =
 {
     0x0,
     0x0,
@@ -2883,10 +2871,10 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0xfffe0000,
+    0xfffe,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls5[41] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls5[41] =
 {
     0x0,
     0x0,
@@ -2928,10 +2916,10 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0xffc0000,
+    0xffc,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls6[41] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls6[41] =
 {
     0x0,
     0x0,
@@ -2973,10 +2961,10 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0xf80000,
+    0xf8,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls_ach[42] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls_ach[41] =
 {
     0x0,
     0x0,
@@ -3018,11 +3006,10 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x66600000,
-    0x6666,
+    0x66666660,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls_cw[42] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls_cw[41] =
 {
     0x0,
     0x0,
@@ -3064,11 +3051,10 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x88800000,
-    0x8888,
+    0x88888880,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_p_1588[42] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_p_1588[42] =
 {
     0x0,
     0x0,
@@ -3101,20 +3087,20 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x2000100,
     0x4000200,
     0x1000400,
-    0x4000100,
-    0x8000400,
-    0x10000800,
-    0x4001000,
-    0x2000400,
-    0x1000080,
     0x2000100,
     0x4000200,
-    0x1000400,
-    0x100,
-    0x10000,
+    0x8000400,
+    0x2000800,
+    0x800200,
+    0x1000100,
+    0x2000200,
+    0x4000400,
+    0x1000100,
+    0x0,
+    0x1,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_prog_ext_1[32] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_prog_ext_1[32] =
 {
     0x0,
     0x0,
@@ -3150,7 +3136,7 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0xf7e,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_prog_ext_2[39] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_prog_ext_2[39] =
 {
     0x0,
     0x0,
@@ -3185,15 +3171,15 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0xf7ef0000,
-    0x0,
+    0x7bf78000,
     0x0,
     0x0,
     0x0,
-    0x3dfbc000,
+    0xc0000000,
+    0x3dfb,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rarp[42] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rarp[42] =
 {
     0x0,
     0x0,
@@ -3236,10 +3222,10 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x20000,
+    0x2,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rout_ext_1[36] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rout_ext_1[36] =
 {
     0x0,
     0x0,
@@ -3272,14 +3258,14 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0xfdfbe000,
+    0xfefdf000,
+    0xfdfbfefd,
     0xfbf7fdfb,
-    0xf7effbf7,
-    0xfdfbf7ef,
-    0x3dfb,
+    0xfefdfbf7,
+    0x1efd,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rout_ext_2[40] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rout_ext_2[39] =
 {
     0x0,
     0x0,
@@ -3314,56 +3300,15 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x3dfb,
     0x0,
     0x0,
-    0x0,
-    0xf7ef,
-    0x0,
-    0x0,
-    0x0,
-    0xc0000000,
-    0x3dfb,
-};
-
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_seg_rout_ext_1[36] =
-{
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
-    0x0,
+    0x80000000,
+    0x7bf7,
     0x0,
     0x0,
     0x0,
-    0x1efdc000,
+    0x3dfbc000,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_tcp_first_4bytes[41] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_tcp_first_4bytes[40] =
 {
     0x0,
     0x0,
@@ -3396,19 +3341,18 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x80058002,
     0xb0005,
     0xc002c00b,
-    0xb0002,
-    0x16000b,
-    0x2c0016,
-    0xb002c,
-    0x6005800b,
-    0xc002c001,
     0x80058002,
     0xb0005,
-    0xc002c00b,
-    0x2,
+    0x16000b,
+    0x80058016,
+    0xc0016005,
+    0x8002c002,
+    0x58005,
+    0xc00b000b,
+    0x2c002,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_tcp_last_16bytes[41] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_tcp_last_16bytes[40] =
 {
     0x0,
     0x0,
@@ -3441,19 +3385,18 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x50002,
     0xa0005,
     0x8002800a,
-    0xa0002,
-    0x14000a,
-    0x280014,
-    0xa0028,
-    0x4005000a,
-    0x80028001,
     0x50002,
     0xa0005,
-    0x8002800a,
-    0x2,
+    0x14000a,
+    0x50014,
+    0x80014005,
+    0x28002,
+    0x50005,
+    0x800a000a,
+    0x28002,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_udp[41] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_udp[40] =
 {
     0x0,
     0x0,
@@ -3486,19 +3429,18 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0xef8077c,
     0x1df00ef8,
     0x77c1df0,
-    0x1df0077c,
-    0x3be01df0,
-    0x77c03be0,
-    0x1df077c0,
-    0xef81df0,
-    0x77c03be,
     0xef8077c,
     0x1df00ef8,
-    0x77c1df0,
-    0x77c,
+    0x3be01df0,
+    0xef83be0,
+    0x3be0ef8,
+    0x77c077c,
+    0xef80ef8,
+    0x1df01df0,
+    0x77c077c,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l3[42] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l3[42] =
 {
     0x0,
     0x0,
@@ -3541,10 +3483,10 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x40000,
+    0x4,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l4[41] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l4[40] =
 {
     0x0,
     0x0,
@@ -3577,19 +3519,18 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x10000800,
     0x20001000,
     0x8002000,
-    0x20000800,
-    0x40002000,
-    0x80004000,
-    0x20008000,
-    0x10002000,
-    0x8000400,
     0x10000800,
     0x20001000,
-    0x8002000,
-    0x800,
+    0x40002000,
+    0x10004000,
+    0x4001000,
+    0x8000800,
+    0x10001000,
+    0x20002000,
+    0x8000800,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l5[41] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l5[40] =
 {
     0x0,
     0x0,
@@ -3622,19 +3563,18 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x4040202,
     0x8080404,
     0x2020808,
-    0x8080202,
-    0x10100808,
-    0x20201010,
-    0x8082020,
-    0x4040808,
-    0x2020101,
     0x4040202,
     0x8080404,
-    0x2020808,
-    0x202,
+    0x10100808,
+    0x4041010,
+    0x1010404,
+    0x2020202,
+    0x4040404,
+    0x8080808,
+    0x2020202,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_vxlan[41] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_vxlan[40] =
 {
     0x0,
     0x0,
@@ -3667,19 +3607,18 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x8000400,
     0x10000800,
     0x4001000,
-    0x10000400,
-    0x20001000,
-    0x40002000,
-    0x10004000,
-    0x8001000,
-    0x4000200,
     0x8000400,
     0x10000800,
-    0x4001000,
-    0x400,
+    0x20001000,
+    0x8002000,
+    0x2000800,
+    0x4000400,
+    0x8000800,
+    0x10001000,
+    0x4000400,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_wesp_ext_1[41] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_wesp_ext_1[40] =
 {
     0x0,
     0x0,
@@ -3716,16 +3655,15 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0x0,
     0x0,
     0x0,
-    0x0,
-    0xff7ef800,
-    0xfefdff7e,
-    0xfdfbfefd,
-    0xff7efdfb,
-    0xf7e,
-};
-
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_wesp_ext_2[41] =
-{
+    0xf8000000,
+    0xff7eff7e,
+    0xfefdfefd,
+    0xfdfbfdfb,
+    0xf7eff7e,
+};
+
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_wesp_ext_2[40] =
+{
     0x0,
     0x0,
     0x0,
@@ -3760,884 +3698,869 @@ static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr
     0xf7e,
     0x0,
     0x0,
-    0xc0000000,
-    0x3dfb,
+    0xe0000000,
+    0x1efd,
     0x0,
     0x0,
     0x0,
-    0xf0000000,
-    0xf7e,
+    0xf7ef000,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_sys_hdr_ep_nih[1] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_sys_hdr_ep_nih[1] =
 {
     0x4,
 };
 
-static uint32_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_sys_hdr_loopback[1] =
+static uint32_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_sys_hdr_loopback[1] =
 {
     0x8,
 };
 
 
 static bcmpkt_rxpmd_match_id_db_t
-bcm78800_a0_dna_6_5_30_3_1_rxpmd_match_id_db[BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_COUNT] = {
+bcm78800_a0_dna_6_5_31_5_0_rxpmd_match_id_db[BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_COUNT] = {
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_CNTAG */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_CNTAG */
         .name         = "EGRESS_PKT_FWD_L2_HDR_CNTAG",
         .match        = 0x80,
         .match_mask   = 0xc0,
-        .match_maxbit = 35,
-        .match_minbit = 28,
+        .match_maxbit = 36,
+        .match_minbit = 29,
         .maxbit       = 7,
         .minbit       = 6,
         .value        = 0x2,
-        .pmaxbit      = 35,
-        .pminbit      = 28,
+        .pmaxbit      = 36,
+        .pminbit      = 29,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_GBP_ETHERNET_SHIM */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_GBP_ETHERNET_SHIM */
         .name         = "EGRESS_PKT_FWD_L2_HDR_GBP_ETHERNET_SHIM",
         .match        = 0x40,
         .match_mask   = 0xc0,
-        .match_maxbit = 35,
-        .match_minbit = 28,
+        .match_maxbit = 36,
+        .match_minbit = 29,
         .maxbit       = 7,
         .minbit       = 6,
         .value        = 0x1,
-        .pmaxbit      = 35,
-        .pminbit      = 28,
+        .pmaxbit      = 36,
+        .pminbit      = 29,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_BASE */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_BASE */
         .name         = "EGRESS_PKT_FWD_L2_HDR_HG3_BASE",
         .match        = 0x2,
         .match_mask   = 0x2,
-        .match_maxbit = 35,
-        .match_minbit = 28,
+        .match_maxbit = 36,
+        .match_minbit = 29,
         .maxbit       = 1,
         .minbit       = 1,
         .value        = 0x1,
-        .pmaxbit      = 35,
-        .pminbit      = 28,
+        .pmaxbit      = 36,
+        .pminbit      = 29,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0 */
         .name         = "EGRESS_PKT_FWD_L2_HDR_HG3_EXT_0",
         .match        = 0x8,
         .match_mask   = 0x8,
-        .match_maxbit = 35,
-        .match_minbit = 28,
+        .match_maxbit = 36,
+        .match_minbit = 29,
         .maxbit       = 3,
         .minbit       = 3,
         .value        = 0x1,
-        .pmaxbit      = 35,
-        .pminbit      = 28,
+        .pmaxbit      = 36,
+        .pminbit      = 29,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_ITAG */
         .name         = "EGRESS_PKT_FWD_L2_HDR_ITAG",
         .match        = 0x20,
         .match_mask   = 0x20,
-        .match_maxbit = 35,
-        .match_minbit = 28,
+        .match_maxbit = 36,
+        .match_minbit = 29,
         .maxbit       = 5,
         .minbit       = 5,
         .value        = 0x1,
-        .pmaxbit      = 35,
-        .pminbit      = 28,
+        .pmaxbit      = 36,
+        .pminbit      = 29,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_L2 */
         .name         = "EGRESS_PKT_FWD_L2_HDR_L2",
         .match        = 0x1,
         .match_mask   = 0x1,
-        .match_maxbit = 35,
-        .match_minbit = 28,
+        .match_maxbit = 36,
+        .match_minbit = 29,
         .maxbit       = 0,
         .minbit       = 0,
         .value        = 0x1,
-        .pmaxbit      = 35,
-        .pminbit      = 28,
+        .pmaxbit      = 36,
+        .pminbit      = 29,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_NONE */
         .name         = "EGRESS_PKT_FWD_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0xff,
-        .match_maxbit = 35,
-        .match_minbit = 28,
+        .match_maxbit = 36,
+        .match_minbit = 29,
         .maxbit       = 7,
         .minbit       = 0,
         .value        = 0x0,
-        .pmaxbit      = 35,
-        .pminbit      = 28,
+        .pmaxbit      = 36,
+        .pminbit      = 29,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_OTAG */
         .name         = "EGRESS_PKT_FWD_L2_HDR_OTAG",
         .match        = 0x10,
         .match_mask   = 0x10,
-        .match_maxbit = 35,
-        .match_minbit = 28,
+        .match_maxbit = 36,
+        .match_minbit = 29,
         .maxbit       = 4,
         .minbit       = 4,
         .value        = 0x1,
-        .pmaxbit      = 35,
-        .pminbit      = 28,
+        .pmaxbit      = 36,
+        .pminbit      = 29,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC */
         .name         = "EGRESS_PKT_FWD_L2_HDR_SNAP_OR_LLC",
         .match        = 0x4,
         .match_mask   = 0x4,
-        .match_maxbit = 35,
-        .match_minbit = 28,
+        .match_maxbit = 36,
+        .match_minbit = 29,
         .maxbit       = 2,
         .minbit       = 2,
         .value        = 0x1,
-        .pmaxbit      = 35,
-        .pminbit      = 28,
+        .pmaxbit      = 36,
+        .pminbit      = 29,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ARP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ARP",
         .match        = 0x4000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match_mask   = 0x7c006,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_1",
-        .match        = 0x24000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match        = 0x10000,
+        .match_mask   = 0x1c000,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x9,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x4,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_AUTH_EXT_2",
         .match        = 0x140,
         .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x5,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_BFD */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_BFD",
         .match        = 0x3000,
         .match_mask   = 0x3800,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x6,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DCN */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DCN */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_DCN",
-        .match        = 0x818,
+        .match        = 0x810,
         .match_mask   = 0x3c18,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_1 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_1",
-        .match        = 0x2c000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match        = 0xc004,
+        .match_mask   = 0x1c406,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0xb,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x3,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_2 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_DEST_OPT_EXT_2",
         .match        = 0x200,
         .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x8,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ESP_EXT",
         .match        = 0x40,
         .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 0,
         .minbit       = 0,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_1",
-        .match        = 0x30000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match        = 0x18000,
+        .match_mask   = 0x1c000,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0xc,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x6,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_FRAG_EXT_2",
         .match        = 0x240,
         .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x9,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GPE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GPE",
-        .match        = 0x38,
+        .match        = 0x30,
         .match_mask   = 0x438,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 5,
         .minbit       = 5,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE",
-        .match        = 0x10,
-        .match_mask   = 0x418,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 4,
-        .minbit       = 3,
-        .value        = 0x2,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .match        = 0x40000,
+        .match_mask   = 0x40000,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 18,
+        .minbit       = 18,
+        .value        = 0x1,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE_CHKSUM",
         .match        = 0x80,
         .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x2,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE_KEY",
         .match        = 0x1800,
         .match_mask   = 0x3800,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x3,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE_ROUT",
-        .match        = 0x10000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match        = 0x44000,
+        .match_mask   = 0x5c000,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x4,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x1,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_GRE_SEQ",
-        .match        = 0x30,
-        .match_mask   = 0x438,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match        = 0x40020,
+        .match_mask   = 0x40020,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 5,
         .minbit       = 5,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_1 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_1",
-        .match        = 0x8000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match        = 0x4004,
+        .match_mask   = 0x7c406,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x2,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x1,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_2 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_HOP_BY_HOP_EXT_2",
         .match        = 0xc0,
         .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x3,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ICMP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ICMP",
         .match        = 0x800,
         .match_mask   = 0x3818,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_HEADER */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_HEADER */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IFA_HEADER",
-        .match        = 0x2c0,
-        .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 9,
-        .minbit       = 6,
-        .value        = 0xb,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .match        = 0x20000,
+        .match_mask   = 0x20000,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 17,
+        .minbit       = 17,
+        .value        = 0x1,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA_BASE */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA_BASE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IFA_METADATA_BASE",
-        .match        = 0xc000,
+        .match        = 0x24000,
         .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x3,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x1,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IGMP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IGMP",
         .match        = 0x100,
         .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x4,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IOAM_E2E */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IOAM_E2E */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IOAM_E2E",
         .match        = 0x1000,
         .match_mask   = 0x3800,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x2,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV4 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IPV4",
         .match        = 0x2,
         .match_mask   = 0x406,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 2,
         .minbit       = 1,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_IPV6 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_IPV6",
         .match        = 0x4,
         .match_mask   = 0x406,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 2,
         .minbit       = 1,
         .value        = 0x2,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS0 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS0",
         .match        = 0x400,
         .match_mask   = 0x400,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 10,
         .minbit       = 10,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS1",
         .match        = 0x402,
         .match_mask   = 0x402,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 1,
         .minbit       = 1,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS2",
         .match        = 0x404,
         .match_mask   = 0x404,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 2,
         .minbit       = 2,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS3 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS3",
         .match        = 0x408,
         .match_mask   = 0x408,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 3,
         .minbit       = 3,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS4 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS4",
         .match        = 0x410,
         .match_mask   = 0x410,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 4,
         .minbit       = 4,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS5 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS5",
         .match        = 0x420,
         .match_mask   = 0x420,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 5,
         .minbit       = 5,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS6 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS6",
         .match        = 0x440,
         .match_mask   = 0x440,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 6,
         .minbit       = 6,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS_ACH",
         .match        = 0x480,
         .match_mask   = 0x480,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 7,
         .minbit       = 7,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_MPLS_CW",
         .match        = 0x500,
         .match_mask   = 0x500,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 8,
         .minbit       = 8,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_NONE */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_NONE",
         .match        = 0x0,
-        .match_mask   = 0x3ffff,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match_mask   = 0x7ffff,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 18,
         .minbit       = 0,
         .value        = 0x0,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_P_1588 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_P_1588",
         .match        = 0x2800,
         .match_mask   = 0x3800,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x5,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_1 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_1",
-        .match        = 0x34000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match        = 0x1c000,
+        .match_mask   = 0x1c000,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0xd,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x7,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_2 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_PROG_EXT_2",
         .match        = 0x280,
         .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0xa,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_RARP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_RARP",
-        .match        = 0x14000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match        = 0x8000,
+        .match_mask   = 0x1c006,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x5,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x2,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_1 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_1",
-        .match        = 0x20000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match        = 0x8004,
+        .match_mask   = 0x1c406,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x8,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x2,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_2 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_ROUT_EXT_2",
         .match        = 0x1c0,
         .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x7,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
-
-    },
-    {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_SEG_ROUT_EXT_1 */
-        .name         = "EGRESS_PKT_FWD_L3_L4_HDR_SEG_ROUT_EXT_1",
-        .match        = 0x18000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
-        .minbit       = 14,
-        .value        = 0x6,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x8,
         .match_mask   = 0x418,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 4,
         .minbit       = 3,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x28,
         .match_mask   = 0x438,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 5,
         .minbit       = 5,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UDP */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UDP",
-        .match        = 0x18,
+        .match        = 0x10,
         .match_mask   = 0x418,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 4,
         .minbit       = 3,
-        .value        = 0x3,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x2,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L3",
-        .match        = 0x1c000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match        = 0xc000,
+        .match_mask   = 0x1c006,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x7,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x3,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x2000,
         .match_mask   = 0x3818,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x4,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x3800,
         .match_mask   = 0x3800,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x7,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_VXLAN */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_VXLAN",
-        .match        = 0x2018,
+        .match        = 0x2010,
         .match_mask   = 0x3c18,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x4,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_1 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_1 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_1",
-        .match        = 0x28000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match        = 0x14000,
+        .match_mask   = 0x1c000,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0xa,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x5,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_2 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_2 */
         .name         = "EGRESS_PKT_FWD_L3_L4_HDR_WESP_EXT_2",
         .match        = 0x180,
         .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x6,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_EP_NIH */
         .name         = "EGRESS_PKT_SYS_HDR_EP_NIH",
         .match        = 0x2,
         .match_mask   = 0x3,
@@ -4651,7 +4574,7 @@ bcm78800_a0_dna_6_5_30_3_1_rxpmd_match_id_db[BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MA
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_LOOPBACK */
         .name         = "EGRESS_PKT_SYS_HDR_LOOPBACK",
         .match        = 0x1,
         .match_mask   = 0x3,
@@ -4665,7 +4588,7 @@ bcm78800_a0_dna_6_5_30_3_1_rxpmd_match_id_db[BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MA
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_SYS_HDR_NONE */
         .name         = "EGRESS_PKT_SYS_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3,
@@ -4679,7 +4602,7 @@ bcm78800_a0_dna_6_5_30_3_1_rxpmd_match_id_db[BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MA
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_CNTAG */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_CNTAG */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_CNTAG",
         .match        = 0x80,
         .match_mask   = 0xc0,
@@ -4693,7 +4616,7 @@ bcm78800_a0_dna_6_5_30_3_1_rxpmd_match_id_db[BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MA
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_GBP_ETHERNET_SHIM */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_GBP_ETHERNET_SHIM */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_GBP_ETHERNET_SHIM",
         .match        = 0x40,
         .match_mask   = 0xc0,
@@ -4707,7 +4630,7 @@ bcm78800_a0_dna_6_5_30_3_1_rxpmd_match_id_db[BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MA
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_HG3_BASE",
         .match        = 0x2,
         .match_mask   = 0x2,
@@ -4721,7 +4644,7 @@ bcm78800_a0_dna_6_5_30_3_1_rxpmd_match_id_db[BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MA
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0 */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_HG3_EXT_0",
         .match        = 0x8,
         .match_mask   = 0x8,
@@ -4735,7 +4658,7 @@ bcm78800_a0_dna_6_5_30_3_1_rxpmd_match_id_db[BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MA
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_ITAG */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_ITAG",
         .match        = 0x20,
         .match_mask   = 0x20,
@@ -4749,7 +4672,7 @@ bcm78800_a0_dna_6_5_30_3_1_rxpmd_match_id_db[BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MA
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_L2 */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_L2",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -4763,7 +4686,7 @@ bcm78800_a0_dna_6_5_30_3_1_rxpmd_match_id_db[BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MA
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_NONE */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0xff,
@@ -4777,7 +4700,7 @@ bcm78800_a0_dna_6_5_30_3_1_rxpmd_match_id_db[BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MA
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_OTAG */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_OTAG",
         .match        = 0x10,
         .match_mask   = 0x10,
@@ -4791,7 +4714,7 @@ bcm78800_a0_dna_6_5_30_3_1_rxpmd_match_id_db[BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MA
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC */
         .name         = "EGRESS_PKT_TUNNEL_L2_HDR_SNAP_OR_LLC",
         .match        = 0x4,
         .match_mask   = 0x4,
@@ -4805,1433 +4728,1419 @@ bcm78800_a0_dna_6_5_30_3_1_rxpmd_match_id_db[BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MA
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ARP",
         .match        = 0x4000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match_mask   = 0x7c006,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_1",
-        .match        = 0x24000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0x10000,
+        .match_mask   = 0x1c000,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x9,
-        .pmaxbit      = 27,
+        .value        = 0x4,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_AUTH_EXT_2",
         .match        = 0x140,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x5,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_BFD",
         .match        = 0x3000,
         .match_mask   = 0x3800,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x6,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DCN */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DCN */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_DCN",
-        .match        = 0x818,
+        .match        = 0x810,
         .match_mask   = 0x3c18,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_1 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_1",
-        .match        = 0x2c000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0xc004,
+        .match_mask   = 0x1c406,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0xb,
-        .pmaxbit      = 27,
+        .value        = 0x3,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_2 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_DEST_OPT_EXT_2",
         .match        = 0x200,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x8,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ESP_EXT",
         .match        = 0x40,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 0,
         .minbit       = 0,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_1",
-        .match        = 0x30000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0x18000,
+        .match_mask   = 0x1c000,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0xc,
-        .pmaxbit      = 27,
+        .value        = 0x6,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_FRAG_EXT_2",
         .match        = 0x240,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x9,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GPE",
-        .match        = 0x38,
+        .match        = 0x30,
         .match_mask   = 0x438,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 5,
         .minbit       = 5,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE",
-        .match        = 0x10,
-        .match_mask   = 0x418,
-        .match_maxbit = 27,
+        .match        = 0x40000,
+        .match_mask   = 0x40000,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 4,
-        .minbit       = 3,
-        .value        = 0x2,
-        .pmaxbit      = 27,
+        .maxbit       = 18,
+        .minbit       = 18,
+        .value        = 0x1,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_CHKSUM",
         .match        = 0x80,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x2,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_KEY",
         .match        = 0x1800,
         .match_mask   = 0x3800,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x3,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_ROUT",
-        .match        = 0x10000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0x44000,
+        .match_mask   = 0x5c000,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x4,
-        .pmaxbit      = 27,
+        .value        = 0x1,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_GRE_SEQ",
-        .match        = 0x30,
-        .match_mask   = 0x438,
-        .match_maxbit = 27,
+        .match        = 0x40020,
+        .match_mask   = 0x40020,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 5,
         .minbit       = 5,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_1 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_1",
-        .match        = 0x8000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0x4004,
+        .match_mask   = 0x7c406,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x2,
-        .pmaxbit      = 27,
+        .value        = 0x1,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_2 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_HOP_BY_HOP_EXT_2",
         .match        = 0xc0,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x3,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ICMP",
         .match        = 0x800,
         .match_mask   = 0x3818,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_HEADER */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_HEADER */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_HEADER",
-        .match        = 0x2c0,
-        .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match        = 0x20000,
+        .match_mask   = 0x20000,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 9,
-        .minbit       = 6,
-        .value        = 0xb,
-        .pmaxbit      = 27,
+        .maxbit       = 17,
+        .minbit       = 17,
+        .value        = 0x1,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA_BASE */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA_BASE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IFA_METADATA_BASE",
-        .match        = 0xc000,
+        .match        = 0x24000,
         .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x3,
-        .pmaxbit      = 27,
+        .value        = 0x1,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IGMP",
         .match        = 0x100,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x4,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IOAM_E2E */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IOAM_E2E */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IOAM_E2E",
         .match        = 0x1000,
         .match_mask   = 0x3800,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x2,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV4",
         .match        = 0x2,
         .match_mask   = 0x406,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 2,
         .minbit       = 1,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_IPV6",
         .match        = 0x4,
         .match_mask   = 0x406,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 2,
         .minbit       = 1,
         .value        = 0x2,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS0",
         .match        = 0x400,
         .match_mask   = 0x400,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 10,
         .minbit       = 10,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS1",
         .match        = 0x402,
         .match_mask   = 0x402,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 1,
         .minbit       = 1,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS2",
         .match        = 0x404,
         .match_mask   = 0x404,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 2,
         .minbit       = 2,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS3",
         .match        = 0x408,
         .match_mask   = 0x408,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 3,
         .minbit       = 3,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS4",
         .match        = 0x410,
         .match_mask   = 0x410,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 4,
         .minbit       = 4,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS5",
         .match        = 0x420,
         .match_mask   = 0x420,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 5,
         .minbit       = 5,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS6",
         .match        = 0x440,
         .match_mask   = 0x440,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 6,
         .minbit       = 6,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_ACH",
         .match        = 0x480,
         .match_mask   = 0x480,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 7,
         .minbit       = 7,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_MPLS_CW",
         .match        = 0x500,
         .match_mask   = 0x500,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 8,
         .minbit       = 8,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_NONE",
         .match        = 0x0,
-        .match_mask   = 0x3ffff,
-        .match_maxbit = 27,
+        .match_mask   = 0x7ffff,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 18,
         .minbit       = 0,
         .value        = 0x0,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_P_1588",
         .match        = 0x2800,
         .match_mask   = 0x3800,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x5,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_1 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_1",
-        .match        = 0x34000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0x1c000,
+        .match_mask   = 0x1c000,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0xd,
-        .pmaxbit      = 27,
+        .value        = 0x7,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_2 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_PROG_EXT_2",
         .match        = 0x280,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0xa,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_RARP",
-        .match        = 0x14000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0x8000,
+        .match_mask   = 0x1c006,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x5,
-        .pmaxbit      = 27,
+        .value        = 0x2,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_1 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_1",
-        .match        = 0x20000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0x8004,
+        .match_mask   = 0x1c406,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x8,
-        .pmaxbit      = 27,
+        .value        = 0x2,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_2 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_ROUT_EXT_2",
         .match        = 0x1c0,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x7,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_SEG_ROUT_EXT_1 */
-        .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_SEG_ROUT_EXT_1",
-        .match        = 0x18000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
-        .match_minbit = 10,
-        .maxbit       = 17,
-        .minbit       = 14,
-        .value        = 0x6,
-        .pmaxbit      = 27,
-        .pminbit      = 10,
-
-    },
-    {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x8,
         .match_mask   = 0x418,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 4,
         .minbit       = 3,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x28,
         .match_mask   = 0x438,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 5,
         .minbit       = 5,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UDP",
-        .match        = 0x18,
+        .match        = 0x10,
         .match_mask   = 0x418,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 4,
         .minbit       = 3,
-        .value        = 0x3,
-        .pmaxbit      = 27,
+        .value        = 0x2,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L3",
-        .match        = 0x1c000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0xc000,
+        .match_mask   = 0x1c006,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x7,
-        .pmaxbit      = 27,
+        .value        = 0x3,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x2000,
         .match_mask   = 0x3818,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x4,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x3800,
         .match_mask   = 0x3800,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x7,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_VXLAN",
-        .match        = 0x2018,
+        .match        = 0x2010,
         .match_mask   = 0x3c18,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x4,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_1 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_1 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_1",
-        .match        = 0x28000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0x14000,
+        .match_mask   = 0x1c000,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0xa,
-        .pmaxbit      = 27,
+        .value        = 0x5,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_2 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_2 */
         .name         = "EGRESS_PKT_TUNNEL_L3_L4_HDR_WESP_EXT_2",
         .match        = 0x180,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x6,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_CNTAG */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_CNTAG */
         .name         = "INGRESS_PKT_INNER_L2_HDR_CNTAG",
         .match        = 0x80,
         .match_mask   = 0xc0,
-        .match_maxbit = 35,
-        .match_minbit = 28,
+        .match_maxbit = 36,
+        .match_minbit = 29,
         .maxbit       = 7,
         .minbit       = 6,
         .value        = 0x2,
-        .pmaxbit      = 35,
-        .pminbit      = 28,
+        .pmaxbit      = 36,
+        .pminbit      = 29,
         .zone_minbit  = 20,
         .arc_id_mask  = 0x1f00000,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l2_hdr_cntag,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_cntag,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_ITAG */
         .name         = "INGRESS_PKT_INNER_L2_HDR_ITAG",
         .match        = 0x20,
         .match_mask   = 0x20,
-        .match_maxbit = 35,
-        .match_minbit = 28,
+        .match_maxbit = 36,
+        .match_minbit = 29,
         .maxbit       = 5,
         .minbit       = 5,
         .value        = 0x1,
-        .pmaxbit      = 35,
-        .pminbit      = 28,
+        .pmaxbit      = 36,
+        .pminbit      = 29,
         .zone_minbit  = 20,
         .arc_id_mask  = 0x1f00000,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l2_hdr_itag,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_itag,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_L2 */
         .name         = "INGRESS_PKT_INNER_L2_HDR_L2",
         .match        = 0x1,
         .match_mask   = 0x1,
-        .match_maxbit = 35,
-        .match_minbit = 28,
+        .match_maxbit = 36,
+        .match_minbit = 29,
         .maxbit       = 0,
         .minbit       = 0,
         .value        = 0x1,
-        .pmaxbit      = 35,
-        .pminbit      = 28,
+        .pmaxbit      = 36,
+        .pminbit      = 29,
         .zone_minbit  = 20,
         .arc_id_mask  = 0x1f00000,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l2_hdr_l2,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_l2,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_NONE */
         .name         = "INGRESS_PKT_INNER_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0xff,
-        .match_maxbit = 35,
-        .match_minbit = 28,
+        .match_maxbit = 36,
+        .match_minbit = 29,
         .maxbit       = 7,
         .minbit       = 0,
         .value        = 0x0,
-        .pmaxbit      = 35,
-        .pminbit      = 28,
+        .pmaxbit      = 36,
+        .pminbit      = 29,
         .zone_minbit  = 20,
         .arc_id_mask  = 0x1f00000,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_OTAG */
         .name         = "INGRESS_PKT_INNER_L2_HDR_OTAG",
         .match        = 0x10,
         .match_mask   = 0x10,
-        .match_maxbit = 35,
-        .match_minbit = 28,
+        .match_maxbit = 36,
+        .match_minbit = 29,
         .maxbit       = 4,
         .minbit       = 4,
         .value        = 0x1,
-        .pmaxbit      = 35,
-        .pminbit      = 28,
+        .pmaxbit      = 36,
+        .pminbit      = 29,
         .zone_minbit  = 20,
         .arc_id_mask  = 0x1f00000,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l2_hdr_otag,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_otag,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC */
         .name         = "INGRESS_PKT_INNER_L2_HDR_SNAP_OR_LLC",
         .match        = 0x4,
         .match_mask   = 0x4,
-        .match_maxbit = 35,
-        .match_minbit = 28,
+        .match_maxbit = 36,
+        .match_minbit = 29,
         .maxbit       = 2,
         .minbit       = 2,
         .value        = 0x1,
-        .pmaxbit      = 35,
-        .pminbit      = 28,
+        .pmaxbit      = 36,
+        .pminbit      = 29,
         .zone_minbit  = 20,
         .arc_id_mask  = 0x1f00000,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l2_hdr_snap_or_llc,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l2_hdr_snap_or_llc,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ARP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ARP",
         .match        = 0x4000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match_mask   = 0x7c006,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_arp,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_arp,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_1",
-        .match        = 0x24000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match        = 0x10000,
+        .match_mask   = 0x1c000,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x9,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x4,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 39,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_auth_ext_1,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_auth_ext_1,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_AUTH_EXT_2",
         .match        = 0x140,
         .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x5,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 55,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_auth_ext_2,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_auth_ext_2,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_BFD */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_BFD",
         .match        = 0x3000,
         .match_mask   = 0x3800,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x6,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 57,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_bfd,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_bfd,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_1 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_1 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_1",
-        .match        = 0x2c000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match        = 0xc004,
+        .match_mask   = 0x1c406,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0xb,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x3,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 42,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_dest_opt_ext_1,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_dest_opt_ext_1,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_2 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_2 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_DEST_OPT_EXT_2",
         .match        = 0x200,
         .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x8,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 55,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_dest_opt_ext_2,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_dest_opt_ext_2,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ESP_EXT",
         .match        = 0x40,
         .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 55,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_esp_ext,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_esp_ext,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 0,
         .minbit       = 0,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 29,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ethertype,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ethertype,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_1",
-        .match        = 0x30000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match        = 0x18000,
+        .match_mask   = 0x1c000,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0xc,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x6,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 45,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_frag_ext_1,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_frag_ext_1,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_FRAG_EXT_2",
         .match        = 0x240,
         .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x9,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 56,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_frag_ext_2,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_frag_ext_2,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_1 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_1 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_1",
-        .match        = 0x8000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match        = 0x4004,
+        .match_mask   = 0x7c406,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x2,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x1,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 48,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_hop_by_hop_ext_1,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_hop_by_hop_ext_1,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_2 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_2 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_HOP_BY_HOP_EXT_2",
         .match        = 0xc0,
         .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x3,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 56,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_hop_by_hop_ext_2,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_hop_by_hop_ext_2,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ICMP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ICMP",
         .match        = 0x800,
         .match_mask   = 0x3818,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 57,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_icmp,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_icmp,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_HEADER */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_HEADER */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_IFA_HEADER",
-        .match        = 0x2c0,
-        .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 9,
-        .minbit       = 6,
-        .value        = 0xb,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .match        = 0x20000,
+        .match_mask   = 0x20000,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 17,
+        .minbit       = 17,
+        .value        = 0x1,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 48,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ifa_header,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ifa_header,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA_BASE */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA_BASE */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_IFA_METADATA_BASE",
-        .match        = 0xc000,
+        .match        = 0x24000,
         .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x3,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x1,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 48,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ifa_metadata_base,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ifa_metadata_base,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IGMP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_IGMP",
         .match        = 0x100,
         .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x4,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 36,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_igmp,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_igmp,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV4 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_IPV4",
         .match        = 0x2,
         .match_mask   = 0x406,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 2,
         .minbit       = 1,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 36,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ipv4,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ipv4,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_IPV6 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_IPV6",
         .match        = 0x4,
         .match_mask   = 0x406,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 2,
         .minbit       = 1,
         .value        = 0x2,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 58,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ipv6,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_ipv6,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_NONE */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_NONE",
         .match        = 0x0,
-        .match_mask   = 0x3ffff,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match_mask   = 0x7ffff,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 18,
         .minbit       = 0,
         .value        = 0x0,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_P_1588 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_P_1588",
         .match        = 0x2800,
         .match_mask   = 0x3800,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x5,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 58,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_p_1588,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_p_1588,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_1 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_1 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_1",
-        .match        = 0x34000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match        = 0x1c000,
+        .match_mask   = 0x1c000,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0xd,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x7,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 51,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_prog_ext_1,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_prog_ext_1,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_2 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_2 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_PROG_EXT_2",
         .match        = 0x280,
         .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0xa,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 57,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_prog_ext_2,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_prog_ext_2,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_RARP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_RARP",
-        .match        = 0x14000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match        = 0x8000,
+        .match_mask   = 0x1c006,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x5,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x2,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 29,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rarp,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rarp,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_1 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_1 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_1",
-        .match        = 0x20000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match        = 0x8004,
+        .match_mask   = 0x1c406,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x8,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x2,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 54,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rout_ext_1,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rout_ext_1,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_2 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_2 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_ROUT_EXT_2",
         .match        = 0x1c0,
         .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x7,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 57,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rout_ext_2,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_rout_ext_2,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x8,
         .match_mask   = 0x418,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 4,
         .minbit       = 3,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 57,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_tcp_first_4bytes,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_tcp_first_4bytes,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x28,
         .match_mask   = 0x438,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 5,
         .minbit       = 5,
         .value        = 0x1,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 57,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_tcp_last_16bytes,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_tcp_last_16bytes,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UDP */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UDP",
-        .match        = 0x18,
+        .match        = 0x10,
         .match_mask   = 0x418,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 4,
         .minbit       = 3,
-        .value        = 0x3,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x2,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 58,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_udp,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_udp,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L3",
-        .match        = 0x1c000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match        = 0xc000,
+        .match_mask   = 0x1c006,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x7,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x3,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 29,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l3,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l3,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x2000,
         .match_mask   = 0x3818,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x4,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 58,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l4,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l4,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x3800,
         .match_mask   = 0x3800,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x7,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 58,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l5,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_unknown_l5,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_1 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_1 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_1",
-        .match        = 0x28000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 53,
-        .match_minbit = 36,
-        .maxbit       = 17,
+        .match        = 0x14000,
+        .match_mask   = 0x1c000,
+        .match_maxbit = 55,
+        .match_minbit = 37,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0xa,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .value        = 0x5,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 58,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_wesp_ext_1,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_wesp_ext_1,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_2 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_2 */
         .name         = "INGRESS_PKT_INNER_L3_L4_HDR_WESP_EXT_2",
         .match        = 0x180,
         .match_mask   = 0x7c0,
-        .match_maxbit = 53,
-        .match_minbit = 36,
+        .match_maxbit = 55,
+        .match_minbit = 37,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x6,
-        .pmaxbit      = 53,
-        .pminbit      = 36,
+        .pmaxbit      = 55,
+        .pminbit      = 37,
         .zone_minbit  = 25,
         .arc_id_mask  = 0xffe000000,
         .num_zone_bmp_words = 58,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_wesp_ext_2,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_inner_l3_l4_hdr_wesp_ext_2,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_CNTAG */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_CNTAG */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_CNTAG",
         .match        = 0x80,
         .match_mask   = 0xc0,
@@ -6245,11 +6154,11 @@ bcm78800_a0_dna_6_5_30_3_1_rxpmd_match_id_db[BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MA
         .zone_minbit  = 2,
         .arc_id_mask  = 0x1fc,
         .num_zone_bmp_words = 2,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l2_hdr_cntag,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_cntag,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_GBP_ETHERNET_SHIM */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_GBP_ETHERNET_SHIM */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_GBP_ETHERNET_SHIM",
         .match        = 0x40,
         .match_mask   = 0xc0,
@@ -6263,11 +6172,11 @@ bcm78800_a0_dna_6_5_30_3_1_rxpmd_match_id_db[BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MA
         .zone_minbit  = 2,
         .arc_id_mask  = 0x1fc,
         .num_zone_bmp_words = 2,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l2_hdr_gbp_ethernet_shim,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_gbp_ethernet_shim,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_BASE */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_BASE */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_HG3_BASE",
         .match        = 0x2,
         .match_mask   = 0x2,
@@ -6281,11 +6190,11 @@ bcm78800_a0_dna_6_5_30_3_1_rxpmd_match_id_db[BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MA
         .zone_minbit  = 2,
         .arc_id_mask  = 0x1fc,
         .num_zone_bmp_words = 3,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l2_hdr_hg3_base,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_hg3_base,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0 */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_HG3_EXT_0",
         .match        = 0x8,
         .match_mask   = 0x8,
@@ -6299,11 +6208,11 @@ bcm78800_a0_dna_6_5_30_3_1_rxpmd_match_id_db[BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MA
         .zone_minbit  = 2,
         .arc_id_mask  = 0x1fc,
         .num_zone_bmp_words = 3,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l2_hdr_hg3_ext_0,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_hg3_ext_0,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_ITAG */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_ITAG",
         .match        = 0x20,
         .match_mask   = 0x20,
@@ -6317,11 +6226,11 @@ bcm78800_a0_dna_6_5_30_3_1_rxpmd_match_id_db[BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MA
         .zone_minbit  = 2,
         .arc_id_mask  = 0x1fc,
         .num_zone_bmp_words = 3,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l2_hdr_itag,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_itag,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_L2 */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_L2",
         .match        = 0x1,
         .match_mask   = 0x1,
@@ -6335,11 +6244,11 @@ bcm78800_a0_dna_6_5_30_3_1_rxpmd_match_id_db[BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MA
         .zone_minbit  = 2,
         .arc_id_mask  = 0x1fc,
         .num_zone_bmp_words = 3,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l2_hdr_l2,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_l2,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_NONE */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0xff,
@@ -6355,7 +6264,7 @@ bcm78800_a0_dna_6_5_30_3_1_rxpmd_match_id_db[BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MA
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_OTAG */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_OTAG",
         .match        = 0x10,
         .match_mask   = 0x10,
@@ -6369,11 +6278,11 @@ bcm78800_a0_dna_6_5_30_3_1_rxpmd_match_id_db[BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MA
         .zone_minbit  = 2,
         .arc_id_mask  = 0x1fc,
         .num_zone_bmp_words = 3,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l2_hdr_otag,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_otag,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC */
         .name         = "INGRESS_PKT_OUTER_L2_HDR_SNAP_OR_LLC",
         .match        = 0x4,
         .match_mask   = 0x4,
@@ -6387,945 +6296,927 @@ bcm78800_a0_dna_6_5_30_3_1_rxpmd_match_id_db[BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MA
         .zone_minbit  = 2,
         .arc_id_mask  = 0x1fc,
         .num_zone_bmp_words = 3,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l2_hdr_snap_or_llc,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l2_hdr_snap_or_llc,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ARP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ARP",
         .match        = 0x4000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match_mask   = 0x7c006,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_arp,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_arp,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_1",
-        .match        = 0x24000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0x10000,
+        .match_mask   = 0x1c000,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x9,
-        .pmaxbit      = 27,
+        .value        = 0x4,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 15,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_auth_ext_1,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_auth_ext_1,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_AUTH_EXT_2",
         .match        = 0x140,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x5,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 37,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_auth_ext_2,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_auth_ext_2,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_BFD */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_BFD",
         .match        = 0x3000,
         .match_mask   = 0x3800,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x6,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
-        .num_zone_bmp_words = 42,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_bfd,
+        .num_zone_bmp_words = 41,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_bfd,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DCN */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DCN */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_DCN",
-        .match        = 0x818,
+        .match        = 0x810,
         .match_mask   = 0x3c18,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
-        .num_zone_bmp_words = 41,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_dcn,
+        .num_zone_bmp_words = 40,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_dcn,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_1 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_1",
-        .match        = 0x2c000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0xc004,
+        .match_mask   = 0x1c406,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0xb,
-        .pmaxbit      = 27,
+        .value        = 0x3,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 19,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_dest_opt_ext_1,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_dest_opt_ext_1,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_2 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_DEST_OPT_EXT_2",
         .match        = 0x200,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x8,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
-        .num_zone_bmp_words = 38,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_dest_opt_ext_2,
+        .num_zone_bmp_words = 37,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_dest_opt_ext_2,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ESP_EXT",
         .match        = 0x40,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
-        .num_zone_bmp_words = 38,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_esp_ext,
+        .num_zone_bmp_words = 37,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_esp_ext,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ETHERTYPE",
         .match        = 0x1,
         .match_mask   = 0x1,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 0,
         .minbit       = 0,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 42,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ethertype,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ethertype,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_1",
-        .match        = 0x30000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0x18000,
+        .match_mask   = 0x1c000,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0xc,
-        .pmaxbit      = 27,
+        .value        = 0x6,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 22,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_frag_ext_1,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_frag_ext_1,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_FRAG_EXT_2",
         .match        = 0x240,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x9,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 38,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_frag_ext_2,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_frag_ext_2,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GPE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GPE",
-        .match        = 0x38,
+        .match        = 0x30,
         .match_mask   = 0x438,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 5,
         .minbit       = 5,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
-        .num_zone_bmp_words = 41,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gpe,
+        .num_zone_bmp_words = 40,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gpe,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE",
-        .match        = 0x10,
-        .match_mask   = 0x418,
-        .match_maxbit = 27,
+        .match        = 0x40000,
+        .match_mask   = 0x40000,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 4,
-        .minbit       = 3,
-        .value        = 0x2,
-        .pmaxbit      = 27,
+        .maxbit       = 18,
+        .minbit       = 18,
+        .value        = 0x1,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 23,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE_CHKSUM",
         .match        = 0x80,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x2,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 23,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_chksum,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_chksum,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE_KEY",
         .match        = 0x1800,
         .match_mask   = 0x3800,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x3,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 23,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_key,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_key,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE_ROUT",
-        .match        = 0x10000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0x44000,
+        .match_mask   = 0x5c000,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x4,
-        .pmaxbit      = 27,
+        .value        = 0x1,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 23,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_rout,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_rout,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_GRE_SEQ",
-        .match        = 0x30,
-        .match_mask   = 0x438,
-        .match_maxbit = 27,
+        .match        = 0x40020,
+        .match_mask   = 0x40020,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 5,
         .minbit       = 5,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 23,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_seq,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_gre_seq,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_1 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_1",
-        .match        = 0x8000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0x4004,
+        .match_mask   = 0x7c406,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x2,
-        .pmaxbit      = 27,
+        .value        = 0x1,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 27,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_hop_by_hop_ext_1,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_hop_by_hop_ext_1,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_2 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_HOP_BY_HOP_EXT_2",
         .match        = 0xc0,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x3,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
-        .num_zone_bmp_words = 39,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_hop_by_hop_ext_2,
+        .num_zone_bmp_words = 38,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_hop_by_hop_ext_2,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ICMP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ICMP",
         .match        = 0x800,
         .match_mask   = 0x3818,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 40,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_icmp,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_icmp,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_HEADER */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_HEADER */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IFA_HEADER",
-        .match        = 0x2c0,
-        .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match        = 0x20000,
+        .match_mask   = 0x20000,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 9,
-        .minbit       = 6,
-        .value        = 0xb,
-        .pmaxbit      = 27,
+        .maxbit       = 17,
+        .minbit       = 17,
+        .value        = 0x1,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 28,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ifa_header,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ifa_header,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA_BASE */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA_BASE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IFA_METADATA_BASE",
-        .match        = 0xc000,
+        .match        = 0x24000,
         .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x3,
-        .pmaxbit      = 27,
+        .value        = 0x1,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 28,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ifa_metadata_base,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ifa_metadata_base,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IGMP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IGMP",
         .match        = 0x100,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x4,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 11,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_igmp,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_igmp,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IOAM_E2E */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IOAM_E2E */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IOAM_E2E",
         .match        = 0x1000,
         .match_mask   = 0x3800,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x2,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
-        .num_zone_bmp_words = 41,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ioam_e2e,
+        .num_zone_bmp_words = 40,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ioam_e2e,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV4 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IPV4",
         .match        = 0x2,
         .match_mask   = 0x406,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 2,
         .minbit       = 1,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 11,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ipv4,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ipv4,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_IPV6 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_IPV6",
         .match        = 0x4,
         .match_mask   = 0x406,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 2,
         .minbit       = 1,
         .value        = 0x2,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
-        .num_zone_bmp_words = 41,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ipv6,
+        .num_zone_bmp_words = 40,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_ipv6,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS0",
         .match        = 0x400,
         .match_mask   = 0x400,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 10,
         .minbit       = 10,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
-        .num_zone_bmp_words = 42,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls0,
+        .num_zone_bmp_words = 41,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls0,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS1",
         .match        = 0x402,
         .match_mask   = 0x402,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 1,
         .minbit       = 1,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
-        .num_zone_bmp_words = 42,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls1,
+        .num_zone_bmp_words = 41,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls1,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS2",
         .match        = 0x404,
         .match_mask   = 0x404,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 2,
         .minbit       = 2,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
-        .num_zone_bmp_words = 42,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls2,
+        .num_zone_bmp_words = 41,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls2,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS3",
         .match        = 0x408,
         .match_mask   = 0x408,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 3,
         .minbit       = 3,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
-        .num_zone_bmp_words = 42,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls3,
+        .num_zone_bmp_words = 41,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls3,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS4",
         .match        = 0x410,
         .match_mask   = 0x410,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 4,
         .minbit       = 4,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 41,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls4,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls4,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS5",
         .match        = 0x420,
         .match_mask   = 0x420,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 5,
         .minbit       = 5,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 41,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls5,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls5,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS6",
         .match        = 0x440,
         .match_mask   = 0x440,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 6,
         .minbit       = 6,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 41,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls6,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls6,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_ACH",
         .match        = 0x480,
         .match_mask   = 0x480,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 7,
         .minbit       = 7,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
-        .num_zone_bmp_words = 42,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls_ach,
+        .num_zone_bmp_words = 41,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls_ach,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_MPLS_CW",
         .match        = 0x500,
         .match_mask   = 0x500,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 8,
         .minbit       = 8,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
-        .num_zone_bmp_words = 42,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls_cw,
+        .num_zone_bmp_words = 41,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_mpls_cw,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_NONE */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_NONE",
         .match        = 0x0,
-        .match_mask   = 0x3ffff,
-        .match_maxbit = 27,
+        .match_mask   = 0x7ffff,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 18,
         .minbit       = 0,
         .value        = 0x0,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_P_1588 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_P_1588",
         .match        = 0x2800,
         .match_mask   = 0x3800,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x5,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 42,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_p_1588,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_p_1588,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_1 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_1",
-        .match        = 0x34000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0x1c000,
+        .match_mask   = 0x1c000,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0xd,
-        .pmaxbit      = 27,
+        .value        = 0x7,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 32,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_prog_ext_1,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_prog_ext_1,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_2 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_PROG_EXT_2",
         .match        = 0x280,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0xa,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 39,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_prog_ext_2,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_prog_ext_2,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_RARP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_RARP",
-        .match        = 0x14000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0x8000,
+        .match_mask   = 0x1c006,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x5,
-        .pmaxbit      = 27,
+        .value        = 0x2,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 42,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rarp,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rarp,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_1 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_1",
-        .match        = 0x20000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0x8004,
+        .match_mask   = 0x1c406,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x8,
-        .pmaxbit      = 27,
+        .value        = 0x2,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 36,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rout_ext_1,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rout_ext_1,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_2 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_ROUT_EXT_2",
         .match        = 0x1c0,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x7,
-        .pmaxbit      = 27,
-        .pminbit      = 10,
-        .zone_minbit  = 9,
-        .arc_id_mask  = 0xffe00,
-        .num_zone_bmp_words = 40,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rout_ext_2,
-
-    },
-    {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_SEG_ROUT_EXT_1 */
-        .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_SEG_ROUT_EXT_1",
-        .match        = 0x18000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
-        .match_minbit = 10,
-        .maxbit       = 17,
-        .minbit       = 14,
-        .value        = 0x6,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
-        .num_zone_bmp_words = 36,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_seg_rout_ext_1,
+        .num_zone_bmp_words = 39,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_rout_ext_2,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_TCP_FIRST_4BYTES",
         .match        = 0x8,
         .match_mask   = 0x418,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 4,
         .minbit       = 3,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
-        .num_zone_bmp_words = 41,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_tcp_first_4bytes,
+        .num_zone_bmp_words = 40,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_tcp_first_4bytes,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_TCP_LAST_16BYTES",
         .match        = 0x28,
         .match_mask   = 0x438,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 5,
         .minbit       = 5,
         .value        = 0x1,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
-        .num_zone_bmp_words = 41,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_tcp_last_16bytes,
+        .num_zone_bmp_words = 40,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_tcp_last_16bytes,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UDP */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UDP",
-        .match        = 0x18,
+        .match        = 0x10,
         .match_mask   = 0x418,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 4,
         .minbit       = 3,
-        .value        = 0x3,
-        .pmaxbit      = 27,
+        .value        = 0x2,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
-        .num_zone_bmp_words = 41,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_udp,
+        .num_zone_bmp_words = 40,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_udp,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L3",
-        .match        = 0x1c000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0xc000,
+        .match_mask   = 0x1c006,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0x7,
-        .pmaxbit      = 27,
+        .value        = 0x3,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
         .num_zone_bmp_words = 42,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l3,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l3,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L4",
         .match        = 0x2000,
         .match_mask   = 0x3818,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x4,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
-        .num_zone_bmp_words = 41,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l4,
+        .num_zone_bmp_words = 40,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l4,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_UNKNOWN_L5",
         .match        = 0x3800,
         .match_mask   = 0x3800,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x7,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
-        .num_zone_bmp_words = 41,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l5,
+        .num_zone_bmp_words = 40,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_unknown_l5,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_VXLAN",
-        .match        = 0x2018,
+        .match        = 0x2010,
         .match_mask   = 0x3c18,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 13,
         .minbit       = 11,
         .value        = 0x4,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
-        .num_zone_bmp_words = 41,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_vxlan,
+        .num_zone_bmp_words = 40,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_vxlan,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_1 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_1 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_1",
-        .match        = 0x28000,
-        .match_mask   = 0x3c000,
-        .match_maxbit = 27,
+        .match        = 0x14000,
+        .match_mask   = 0x1c000,
+        .match_maxbit = 28,
         .match_minbit = 10,
-        .maxbit       = 17,
+        .maxbit       = 16,
         .minbit       = 14,
-        .value        = 0xa,
-        .pmaxbit      = 27,
+        .value        = 0x5,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
-        .num_zone_bmp_words = 41,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_wesp_ext_1,
+        .num_zone_bmp_words = 40,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_wesp_ext_1,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_2 */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_2 */
         .name         = "INGRESS_PKT_OUTER_L3_L4_HDR_WESP_EXT_2",
         .match        = 0x180,
         .match_mask   = 0x7c0,
-        .match_maxbit = 27,
+        .match_maxbit = 28,
         .match_minbit = 10,
         .maxbit       = 9,
         .minbit       = 6,
         .value        = 0x6,
-        .pmaxbit      = 27,
+        .pmaxbit      = 28,
         .pminbit      = 10,
         .zone_minbit  = 9,
         .arc_id_mask  = 0xffe00,
-        .num_zone_bmp_words = 41,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_wesp_ext_2,
+        .num_zone_bmp_words = 40,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_outer_l3_l4_hdr_wesp_ext_2,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_EP_NIH */
         .name         = "INGRESS_PKT_SYS_HDR_EP_NIH",
         .match        = 0x2,
         .match_mask   = 0x3,
@@ -7339,11 +7230,11 @@ bcm78800_a0_dna_6_5_30_3_1_rxpmd_match_id_db[BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MA
         .zone_minbit  = 0,
         .arc_id_mask  = 0x3,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_sys_hdr_ep_nih,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_sys_hdr_ep_nih,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_LOOPBACK */
         .name         = "INGRESS_PKT_SYS_HDR_LOOPBACK",
         .match        = 0x1,
         .match_mask   = 0x3,
@@ -7357,11 +7248,11 @@ bcm78800_a0_dna_6_5_30_3_1_rxpmd_match_id_db[BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MA
         .zone_minbit  = 0,
         .arc_id_mask  = 0x3,
         .num_zone_bmp_words = 1,
-        .zone_bmp = bcm78800_a0_dna_6_5_30_3_1_rxpmd_arc_ingress_pkt_sys_hdr_loopback,
+        .zone_bmp = bcm78800_a0_dna_6_5_31_5_0_rxpmd_arc_ingress_pkt_sys_hdr_loopback,
 
     },
     {
-        /* BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE */
+        /* BCM78800_A0_DNA_6_5_31_5_0_RXPMD_MATCH_ID_INGRESS_PKT_SYS_HDR_NONE */
         .name         = "INGRESS_PKT_SYS_HDR_NONE",
         .match        = 0x0,
         .match_mask   = 0x3,
@@ -7378,23 +7269,23 @@ bcm78800_a0_dna_6_5_30_3_1_rxpmd_match_id_db[BCM78800_A0_DNA_6_5_30_3_1_RXPMD_MA
     },
 };
 
-static bcmpkt_rxpmd_match_id_db_info_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_match_id_db_info = {
-    .num_entries = 228,
-    .db = bcm78800_a0_dna_6_5_30_3_1_rxpmd_match_id_db
+static bcmpkt_rxpmd_match_id_db_info_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_match_id_db_info = {
+    .num_entries = 225,
+    .db = bcm78800_a0_dna_6_5_31_5_0_rxpmd_match_id_db
 };
-bcmpkt_rxpmd_match_id_db_info_t * bcm78800_a0_dna_6_5_30_3_1_rxpmd_match_id_db_info_get(void) {
-    return &bcm78800_a0_dna_6_5_30_3_1_rxpmd_match_id_db_info;
+bcmpkt_rxpmd_match_id_db_info_t * bcm78800_a0_dna_6_5_31_5_0_rxpmd_match_id_db_info_get(void) {
+    return &bcm78800_a0_dna_6_5_31_5_0_rxpmd_match_id_db_info;
 }
 
-static shr_enum_map_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_match_id_map[] = {
-    BCM78800_A0_DNA_6_5_30_3_1_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT
+static shr_enum_map_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_match_id_map[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_MATCH_ID_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_rxpmd_match_id_map_info_t bcm78800_a0_dna_6_5_30_3_1_rxpmd_match_id_map_info = {
-    .num_entries = 228,
-    .map = bcm78800_a0_dna_6_5_30_3_1_rxpmd_match_id_map
+static bcmpkt_rxpmd_match_id_map_info_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_match_id_map_info = {
+    .num_entries = 225,
+    .map = bcm78800_a0_dna_6_5_31_5_0_rxpmd_match_id_map
 };
 
-bcmpkt_rxpmd_match_id_map_info_t * bcm78800_a0_dna_6_5_30_3_1_rxpmd_match_id_map_info_get(void) {
-    return &bcm78800_a0_dna_6_5_30_3_1_rxpmd_match_id_map_info;
+bcmpkt_rxpmd_match_id_map_info_t * bcm78800_a0_dna_6_5_31_5_0_rxpmd_match_id_map_info_get(void) {
+    return &bcm78800_a0_dna_6_5_31_5_0_rxpmd_match_id_map_info;
 }
diff --git a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_pkt_flexhdr.c b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_pkt_flexhdr.c
similarity index 70%
rename from platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_pkt_flexhdr.c
rename to platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_pkt_flexhdr.c
index 7ef51b03e9c3..d82ee212b8b4 100644
--- a/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_pkt_flexhdr.c
+++ b/platform/broadcom/saibcm-modules/sdklt/bcmpkt/xfcr/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_pkt_flexhdr.c
@@ -3,7 +3,7 @@
  * DO NOT EDIT THIS FILE!
  * This file is auto-generated by xfc_map_parser
  * from the NPL output file(s) map.yml
- * for device bcm56690_a0 and variant dna_6_5_29_0_1.
+ * for device bcm78800_a0 and variant dna_6_5_31_5_0.
  * Edits to this file will be lost when it is regenerated.
  *
  * $Id: $
@@ -30,322 +30,369 @@
 #include <sal/sal_types.h>
 #include <shr/shr_error.h>
 #include <bcmpkt/bcmpkt_flexhdr.h>
-#include <bcmpkt/chip/bcm56690_a0/bcmpkt_bcm56690_a0_rxpmd.h>
-#include <bcmpkt/xfcr/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_bcmpkt_flexhdr.h>
-#include <bcmpkt/xfcr/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_bcmpkt_flexhdr_data.h>
-#include <bcmpkt/xfcr/bcm56690_a0/dna_6_5_29_0_1/bcm56690_a0_dna_6_5_29_0_1_bcmpkt_rxpmd_flex_data.h>
+#include <bcmpkt/chip/bcm78800_a0/bcmpkt_bcm78800_a0_rxpmd.h>
+#include <bcmpkt/xfcr/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_bcmpkt_flexhdr.h>
+#include <bcmpkt/xfcr/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_bcmpkt_flexhdr_data.h>
+#include <bcmpkt/xfcr/bcm78800_a0/dna_6_5_31_5_0/bcm78800_a0_dna_6_5_31_5_0_bcmpkt_rxpmd_flex_data.h>
 
 #define MASK(_bn) (((uint32_t)0x1<<(_bn))-1)
 #define WORD_FIELD_GET(_d,_s,_l) (((_d) >> (_s)) & MASK(_l))
 #define WORD_FIELD_SET(_d,_s,_l,_v) (_d)=(((_d) & ~(MASK(_l) << (_s))) | (((_v) & MASK(_l)) << (_s)))
 #define WORD_FIELD_MASK(_d,_s,_l) (_d)=((_d) | (MASK(_l) << (_s)))
 
-static void bcm56690_a0_dna_6_5_29_0_1_rxpmd_flex_reason_decode(uint32_t *data, bcmpkt_bitmap_t *reasons)
+static void bcm78800_a0_dna_6_5_31_5_0_rxpmd_flex_reason_decode(uint32_t *data, bcmpkt_bitmap_t *reasons)
 {
     uint32_t *reason = data + 0;
 
     if (reason[13] & (0x1 << 0)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU);
     }
     if (reason[13] & (0x1 << 1)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS);
     }
     if (reason[13] & (0x1 << 2)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE);
     }
     if (reason[13] & (0x1 << 3)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_EM_FT_HPAE_MISS);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE);
     }
     if (reason[13] & (0x1 << 4)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD);
     }
     if (reason[13] & (0x1 << 5)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED);
     }
     if (reason[13] & (0x1 << 6)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT);
     }
     if (reason[13] & (0x1 << 7)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED);
     }
     if (reason[13] & (0x1 << 8)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED);
     }
     if (reason[13] & (0x1 << 9)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS);
     }
     if (reason[13] & (0x1 << 10)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP);
     }
     if (reason[13] & (0x1 << 11)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS);
     }
     if (reason[13] & (0x1 << 12)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP);
     }
     if (reason[13] & (0x1 << 13)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR);
     }
     if (reason[13] & (0x1 << 14)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR);
     }
     if (reason[13] & (0x1 << 15)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED);
     }
     if (reason[13] & (0x1 << 16)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL);
     }
     if (reason[13] & (0x1 << 17)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_VFP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_VFP);
     }
     if (reason[13] & (0x1 << 18)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_IFP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_IFP);
     }
     if (reason[13] & (0x1 << 19)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_IFP_METER);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER);
     }
     if (reason[13] & (0x1 << 20)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_DST_FP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP);
     }
     if (reason[13] & (0x1 << 21)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_SVP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_SVP);
     }
     if (reason[13] & (0x1 << 22)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_EM_FT);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT);
     }
     if (reason[13] & (0x1 << 23)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_IVXLT);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT);
     }
     if (reason[13] & (0x1 << 24)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED);
     }
     if (reason[13] & (0x1 << 25)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED);
     }
     if (reason[13] & (0x1 << 26)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_SER_DROP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP);
     }
     if (reason[13] & (0x1 << 27)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED);
     }
     if (reason[13] & (0x1 << 28)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF);
     }
     if (reason[13] & (0x1 << 29)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED);
     }
     if (reason[13] & (0x1 << 30)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED);
     }
     if (reason[13] & (0x1 << 31)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU);
     }
     if (reason[12] & (0x1 << 0)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0);
     }
     if (reason[12] & (0x1 << 1)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1);
     }
     if (reason[12] & (0x1 << 2)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2);
     }
     if (reason[12] & (0x1 << 3)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3);
     }
     if (reason[12] & (0x1 << 4)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4);
     }
     if (reason[12] & (0x1 << 5)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5);
     }
     if (reason[12] & (0x1 << 6)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6);
     }
     if (reason[12] & (0x1 << 7)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7);
     }
     if (reason[12] & (0x1 << 8)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_DEFAULT);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_IDEV_CONFIG_TO_CPU);
     }
     if (reason[12] & (0x1 << 9)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED);
     }
     if (reason[12] & (0x1 << 10)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED);
     }
     if (reason[12] & (0x1 << 11)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_SRV6);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_SRV6);
     }
     if (reason[12] & (0x1 << 12)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR);
     }
     if (reason[12] & (0x1 << 13)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU);
-    }
-    if (reason[12] & (0x1 << 14)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU);
     }
     if (reason[12] & (0x1 << 15)) {
-        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP);
+        BCMPKT_RXPMD_FLEX_REASON_SET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP);
     }
 }
 
-static void bcm56690_a0_dna_6_5_29_0_1_rxpmd_flex_reason_encode(bcmpkt_bitmap_t *reasons, uint32_t *data)
+static void bcm78800_a0_dna_6_5_31_5_0_rxpmd_flex_reason_encode(bcmpkt_bitmap_t *reasons, uint32_t *data)
 {
     uint32_t *reason = data + 0;
 
     reason[13] = 0;
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_NO_COPY_TO_CPU)) {
         reason[13] |= (0x1 << 0);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_CML_FLAGS)) {
         reason[13] |= (0x1 << 1);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_L2_SRC_STATIC_MOVE)) {
         reason[13] |= (0x1 << 2);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_EM_FT_HPAE_MISS)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE)) {
         reason[13] |= (0x1 << 3);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MACSA_MULTICAST_RSVD)) {
         reason[13] |= (0x1 << 4);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_PKT_INTEGRITY_CHECK_FAILED)) {
         reason[13] |= (0x1 << 5);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_PROTOCOL_PKT)) {
         reason[13] |= (0x1 << 6);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED_RSVD)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MEMBERSHIP_CHECK_FAILED)) {
         reason[13] |= (0x1 << 7);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED_RSVD)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_SPANNING_TREE_CHECK_FAILED)) {
         reason[13] |= (0x1 << 8);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP_MISS)) {
         reason[13] |= (0x1 << 9);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_L2_DST_LOOKUP)) {
         reason[13] |= (0x1 << 10);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP_MISS)) {
         reason[13] |= (0x1 << 11);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_L3_DST_LOOKUP)) {
         reason[13] |= (0x1 << 12);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_L3_HDR_ERROR)) {
         reason[13] |= (0x1 << 13);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_L3_TTL_ERROR)) {
         reason[13] |= (0x1 << 14);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_IPMC_L3_IIF_OR_RPA_ID_CHECK_FAILED)) {
         reason[13] |= (0x1 << 15);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_LEARN_CACHE_FULL)) {
         reason[13] |= (0x1 << 16);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_VFP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_VFP)) {
         reason[13] |= (0x1 << 17);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_IFP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_IFP)) {
         reason[13] |= (0x1 << 18);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_IFP_METER)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_IFP_METER)) {
         reason[13] |= (0x1 << 19);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_DST_FP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_DST_FP)) {
         reason[13] |= (0x1 << 20);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_SVP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_SVP)) {
         reason[13] |= (0x1 << 21);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_EM_FT)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_EM_FT)) {
         reason[13] |= (0x1 << 22);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_IVXLT)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_IVXLT)) {
         reason[13] |= (0x1 << 23);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_SAMPLED)) {
         reason[13] |= (0x1 << 24);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MIRROR_SAMPLER_EGR_SAMPLED)) {
         reason[13] |= (0x1 << 25);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_SER_DROP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_SER_DROP)) {
         reason[13] |= (0x1 << 26);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_URPF_CHECK_FAILED)) {
         reason[13] |= (0x1 << 27);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_L3_IIF_EQ_L3_OIF)) {
         reason[13] |= (0x1 << 28);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_MONITOR_EN_OR_MEMBER_REASSINED)) {
         reason[13] |= (0x1 << 29);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_MONITOR_EN_OR_MEMBER_REASSINED)) {
         reason[13] |= (0x1 << 30);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MPLS_CTRL_PKT_TO_CPU)) {
         reason[13] |= (0x1 << 31);
     }
     reason[12] = 0;
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_0)) {
         reason[12] |= (0x1 << 0);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_1)) {
         reason[12] |= (0x1 << 1);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_2)) {
         reason[12] |= (0x1 << 2);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_3)) {
         reason[12] |= (0x1 << 3);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_4)) {
         reason[12] |= (0x1 << 4);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_5)) {
         reason[12] |= (0x1 << 5);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_6)) {
         reason[12] |= (0x1 << 6);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_MATCHED_RULE_BIT_7)) {
         reason[12] |= (0x1 << 7);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_DEFAULT)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_IDEV_CONFIG_TO_CPU)) {
         reason[12] |= (0x1 << 8);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_DLB_ECMP_PKT_SAMPLED)) {
         reason[12] |= (0x1 << 9);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_DLB_LAG_PKT_SAMPLED)) {
         reason[12] |= (0x1 << 10);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_SRV6)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_SRV6)) {
         reason[12] |= (0x1 << 11);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_MIRROR)) {
         reason[12] |= (0x1 << 12);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DO_NOT_COPY_TO_CPU)) {
         reason[12] |= (0x1 << 13);
     }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_CB_STATION_MOVE)) {
-        reason[12] |= (0x1 << 14);
-    }
-    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP)) {
+    if (BCMPKT_RXPMD_FLEX_REASON_GET(*reasons, BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_TRACE_DOP)) {
         reason[12] |= (0x1 << 15);
     }
 }
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_flex_field_data[] = {
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_flex_field_data[] = {
+    {
+        .name = "ALLOW_NAT_3_0",
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_ALLOW_NAT_3_0,
+        .profile = {
+            { -1, -1 }, /* Profile 0. */
+            { -1, -1 }, /* Profile 1. */
+            { 412, 415 }, /* Profile 2. */
+            { 412, 415 }, /* Profile 3. */
+            { 412, 415 }, /* Profile 4. */
+            { 412, 415 }, /* Profile 5. */
+            { 412, 415 }, /* Profile 6. */
+            { 412, 415 }, /* Profile 7. */
+            { 412, 415 }, /* Profile 8. */
+            { 412, 415 }, /* Profile 9. */
+            { 408, 411 }, /* Profile 10. */
+            { 408, 411 }, /* Profile 11. */
+            { 408, 411 }, /* Profile 12. */
+            { 412, 415 }, /* Profile 13. */
+            { 412, 415 }, /* Profile 14. */
+            { 412, 415 }, /* Profile 15. */
+            { 412, 415 }, /* Profile 16. */
+            { 412, 415 }, /* Profile 17. */
+            { 412, 415 }, /* Profile 18. */
+            { 412, 415 }, /* Profile 19. */
+            { 412, 415 }, /* Profile 20. */
+            { 408, 411 }, /* Profile 21. */
+            { 408, 411 }, /* Profile 22. */
+            { 408, 411 }, /* Profile 23. */
+            { 412, 415 }, /* Profile 24. */
+            { 412, 415 }, /* Profile 25. */
+            { 412, 415 }, /* Profile 26. */
+            { 412, 415 }, /* Profile 27. */
+            { 412, 415 }, /* Profile 28. */
+            { 412, 415 }, /* Profile 29. */
+            { 412, 415 }, /* Profile 30. */
+            { 412, 415 }, /* Profile 31. */
+            { 408, 411 }, /* Profile 32. */
+            { 408, 411 }, /* Profile 33. */
+            { 408, 411 }, /* Profile 34. */
+            { 412, 415 }, /* Profile 35. */
+            { 412, 415 }, /* Profile 36. */
+            { 412, 415 }, /* Profile 37. */
+            { 412, 415 }, /* Profile 38. */
+            { 412, 415 }, /* Profile 39. */
+            { 412, 415 }, /* Profile 40. */
+            { 412, 415 }, /* Profile 41. */
+            { 412, 415 }, /* Profile 42. */
+            { 408, 411 }, /* Profile 43. */
+            { 408, 411 }, /* Profile 44. */
+            { 408, 411 }, /* Profile 45. */
+        },
+        .profile_cnt = 46,
+    },
     {
         .name = "DLB_ECMP_DESTINATION_15_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_DLB_ECMP_DESTINATION_15_0,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_DLB_ECMP_DESTINATION_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -360,17 +407,17 @@ static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_flex_field_
             { -1, -1 }, /* Profile 10. */
             { -1, -1 }, /* Profile 11. */
             { -1, -1 }, /* Profile 12. */
-            { 288, 303 }, /* Profile 13. */
-            { 320, 335 }, /* Profile 14. */
-            { 320, 335 }, /* Profile 15. */
-            { 320, 335 }, /* Profile 16. */
-            { 288, 303 }, /* Profile 17. */
-            { 320, 335 }, /* Profile 18. */
-            { 320, 335 }, /* Profile 19. */
-            { 320, 335 }, /* Profile 20. */
-            { 288, 303 }, /* Profile 21. */
-            { 320, 335 }, /* Profile 22. */
-            { 320, 335 }, /* Profile 23. */
+            { 256, 271 }, /* Profile 13. */
+            { 256, 271 }, /* Profile 14. */
+            { 256, 271 }, /* Profile 15. */
+            { 256, 271 }, /* Profile 16. */
+            { 256, 271 }, /* Profile 17. */
+            { 256, 271 }, /* Profile 18. */
+            { 256, 271 }, /* Profile 19. */
+            { 256, 271 }, /* Profile 20. */
+            { 256, 271 }, /* Profile 21. */
+            { 256, 271 }, /* Profile 22. */
+            { 256, 271 }, /* Profile 23. */
             { -1, -1 }, /* Profile 24. */
             { -1, -1 }, /* Profile 25. */
             { -1, -1 }, /* Profile 26. */
@@ -382,65 +429,65 @@ static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_flex_field_
             { -1, -1 }, /* Profile 32. */
             { -1, -1 }, /* Profile 33. */
             { -1, -1 }, /* Profile 34. */
-            { 288, 303 }, /* Profile 35. */
-            { 320, 335 }, /* Profile 36. */
-            { 320, 335 }, /* Profile 37. */
-            { 320, 335 }, /* Profile 38. */
-            { 288, 303 }, /* Profile 39. */
-            { 320, 335 }, /* Profile 40. */
-            { 320, 335 }, /* Profile 41. */
-            { 320, 335 }, /* Profile 42. */
-            { 288, 303 }, /* Profile 43. */
-            { 320, 335 }, /* Profile 44. */
-            { 320, 335 }, /* Profile 45. */
+            { 272, 287 }, /* Profile 35. */
+            { 272, 287 }, /* Profile 36. */
+            { 272, 287 }, /* Profile 37. */
+            { 272, 287 }, /* Profile 38. */
+            { 272, 287 }, /* Profile 39. */
+            { 272, 287 }, /* Profile 40. */
+            { 272, 287 }, /* Profile 41. */
+            { 272, 287 }, /* Profile 42. */
+            { 272, 287 }, /* Profile 43. */
+            { 272, 287 }, /* Profile 44. */
+            { 272, 287 }, /* Profile 45. */
         },
         .profile_cnt = 46,
     },
     {
         .name = "DNAT_CTRL_3_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_DNAT_CTRL_3_0,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_DNAT_CTRL_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { -1, -1 }, /* Profile 2. */
-            { 368, 371 }, /* Profile 3. */
+            { 372, 375 }, /* Profile 3. */
             { -1, -1 }, /* Profile 4. */
             { -1, -1 }, /* Profile 5. */
             { -1, -1 }, /* Profile 6. */
-            { 368, 371 }, /* Profile 7. */
+            { 372, 375 }, /* Profile 7. */
             { -1, -1 }, /* Profile 8. */
             { -1, -1 }, /* Profile 9. */
             { -1, -1 }, /* Profile 10. */
             { 368, 371 }, /* Profile 11. */
             { -1, -1 }, /* Profile 12. */
             { -1, -1 }, /* Profile 13. */
-            { 368, 371 }, /* Profile 14. */
+            { 372, 375 }, /* Profile 14. */
             { -1, -1 }, /* Profile 15. */
             { -1, -1 }, /* Profile 16. */
             { -1, -1 }, /* Profile 17. */
-            { 368, 371 }, /* Profile 18. */
+            { 372, 375 }, /* Profile 18. */
             { -1, -1 }, /* Profile 19. */
             { -1, -1 }, /* Profile 20. */
             { -1, -1 }, /* Profile 21. */
             { 368, 371 }, /* Profile 22. */
             { -1, -1 }, /* Profile 23. */
             { -1, -1 }, /* Profile 24. */
-            { 368, 371 }, /* Profile 25. */
+            { 372, 375 }, /* Profile 25. */
             { -1, -1 }, /* Profile 26. */
             { -1, -1 }, /* Profile 27. */
             { -1, -1 }, /* Profile 28. */
-            { 368, 371 }, /* Profile 29. */
+            { 372, 375 }, /* Profile 29. */
             { -1, -1 }, /* Profile 30. */
             { -1, -1 }, /* Profile 31. */
             { -1, -1 }, /* Profile 32. */
             { 368, 371 }, /* Profile 33. */
             { -1, -1 }, /* Profile 34. */
             { -1, -1 }, /* Profile 35. */
-            { 368, 371 }, /* Profile 36. */
+            { 372, 375 }, /* Profile 36. */
             { -1, -1 }, /* Profile 37. */
             { -1, -1 }, /* Profile 38. */
             { -1, -1 }, /* Profile 39. */
-            { 368, 371 }, /* Profile 40. */
+            { 372, 375 }, /* Profile 40. */
             { -1, -1 }, /* Profile 41. */
             { -1, -1 }, /* Profile 42. */
             { -1, -1 }, /* Profile 43. */
@@ -450,7 +497,7 @@ static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_flex_field_
     },
     {
         .name = "DROP_CODE_15_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_DROP_CODE_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -503,127 +550,127 @@ static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_flex_field_
     },
     {
         .name = "DVP_15_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_DVP_15_0,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_DVP_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 176, 191 }, /* Profile 2. */
-            { 176, 191 }, /* Profile 3. */
-            { 208, 223 }, /* Profile 4. */
-            { 208, 223 }, /* Profile 5. */
-            { 176, 191 }, /* Profile 6. */
-            { 176, 191 }, /* Profile 7. */
-            { 208, 223 }, /* Profile 8. */
-            { 208, 223 }, /* Profile 9. */
-            { 176, 191 }, /* Profile 10. */
-            { 176, 191 }, /* Profile 11. */
-            { 208, 223 }, /* Profile 12. */
-            { 176, 191 }, /* Profile 13. */
-            { 176, 191 }, /* Profile 14. */
-            { 208, 223 }, /* Profile 15. */
-            { 208, 223 }, /* Profile 16. */
-            { 176, 191 }, /* Profile 17. */
-            { 176, 191 }, /* Profile 18. */
-            { 208, 223 }, /* Profile 19. */
-            { 208, 223 }, /* Profile 20. */
-            { 176, 191 }, /* Profile 21. */
-            { 176, 191 }, /* Profile 22. */
-            { 208, 223 }, /* Profile 23. */
-            { 192, 207 }, /* Profile 24. */
-            { 192, 207 }, /* Profile 25. */
-            { 224, 239 }, /* Profile 26. */
-            { 224, 239 }, /* Profile 27. */
-            { 192, 207 }, /* Profile 28. */
-            { 192, 207 }, /* Profile 29. */
-            { 224, 239 }, /* Profile 30. */
-            { 224, 239 }, /* Profile 31. */
-            { 192, 207 }, /* Profile 32. */
-            { 192, 207 }, /* Profile 33. */
-            { 224, 239 }, /* Profile 34. */
-            { 192, 207 }, /* Profile 35. */
-            { 192, 207 }, /* Profile 36. */
-            { 224, 239 }, /* Profile 37. */
-            { 224, 239 }, /* Profile 38. */
-            { 192, 207 }, /* Profile 39. */
-            { 192, 207 }, /* Profile 40. */
-            { 224, 239 }, /* Profile 41. */
-            { 224, 239 }, /* Profile 42. */
-            { 192, 207 }, /* Profile 43. */
-            { 192, 207 }, /* Profile 44. */
-            { 224, 239 }, /* Profile 45. */
+            { 160, 175 }, /* Profile 2. */
+            { 160, 175 }, /* Profile 3. */
+            { 160, 175 }, /* Profile 4. */
+            { 160, 175 }, /* Profile 5. */
+            { 160, 175 }, /* Profile 6. */
+            { 160, 175 }, /* Profile 7. */
+            { 160, 175 }, /* Profile 8. */
+            { 160, 175 }, /* Profile 9. */
+            { 160, 175 }, /* Profile 10. */
+            { 160, 175 }, /* Profile 11. */
+            { 160, 175 }, /* Profile 12. */
+            { 160, 175 }, /* Profile 13. */
+            { 160, 175 }, /* Profile 14. */
+            { 160, 175 }, /* Profile 15. */
+            { 160, 175 }, /* Profile 16. */
+            { 160, 175 }, /* Profile 17. */
+            { 160, 175 }, /* Profile 18. */
+            { 160, 175 }, /* Profile 19. */
+            { 160, 175 }, /* Profile 20. */
+            { 160, 175 }, /* Profile 21. */
+            { 160, 175 }, /* Profile 22. */
+            { 160, 175 }, /* Profile 23. */
+            { 176, 191 }, /* Profile 24. */
+            { 176, 191 }, /* Profile 25. */
+            { 176, 191 }, /* Profile 26. */
+            { 176, 191 }, /* Profile 27. */
+            { 176, 191 }, /* Profile 28. */
+            { 176, 191 }, /* Profile 29. */
+            { 176, 191 }, /* Profile 30. */
+            { 176, 191 }, /* Profile 31. */
+            { 176, 191 }, /* Profile 32. */
+            { 176, 191 }, /* Profile 33. */
+            { 176, 191 }, /* Profile 34. */
+            { 176, 191 }, /* Profile 35. */
+            { 176, 191 }, /* Profile 36. */
+            { 176, 191 }, /* Profile 37. */
+            { 176, 191 }, /* Profile 38. */
+            { 176, 191 }, /* Profile 39. */
+            { 176, 191 }, /* Profile 40. */
+            { 176, 191 }, /* Profile 41. */
+            { 176, 191 }, /* Profile 42. */
+            { 176, 191 }, /* Profile 43. */
+            { 176, 191 }, /* Profile 44. */
+            { 176, 191 }, /* Profile 45. */
         },
         .profile_cnt = 46,
     },
     {
         .name = "EFFECTIVE_TTL_AND_SNAT_CTRL_15_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_AND_SNAT_CTRL_15_0,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_EFFECTIVE_TTL_AND_SNAT_CTRL_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 144, 159 }, /* Profile 2. */
-            { 144, 159 }, /* Profile 3. */
-            { 176, 191 }, /* Profile 4. */
-            { 176, 191 }, /* Profile 5. */
-            { 144, 159 }, /* Profile 6. */
-            { 144, 159 }, /* Profile 7. */
-            { 176, 191 }, /* Profile 8. */
-            { 176, 191 }, /* Profile 9. */
-            { 144, 159 }, /* Profile 10. */
-            { 144, 159 }, /* Profile 11. */
-            { 176, 191 }, /* Profile 12. */
-            { 144, 159 }, /* Profile 13. */
-            { 144, 159 }, /* Profile 14. */
-            { 176, 191 }, /* Profile 15. */
-            { 176, 191 }, /* Profile 16. */
-            { 144, 159 }, /* Profile 17. */
-            { 144, 159 }, /* Profile 18. */
-            { 176, 191 }, /* Profile 19. */
-            { 176, 191 }, /* Profile 20. */
-            { 144, 159 }, /* Profile 21. */
-            { 144, 159 }, /* Profile 22. */
-            { 176, 191 }, /* Profile 23. */
-            { 160, 175 }, /* Profile 24. */
-            { 160, 175 }, /* Profile 25. */
-            { 192, 207 }, /* Profile 26. */
-            { 192, 207 }, /* Profile 27. */
-            { 160, 175 }, /* Profile 28. */
-            { 160, 175 }, /* Profile 29. */
-            { 192, 207 }, /* Profile 30. */
-            { 192, 207 }, /* Profile 31. */
-            { 160, 175 }, /* Profile 32. */
-            { 160, 175 }, /* Profile 33. */
-            { 192, 207 }, /* Profile 34. */
-            { 160, 175 }, /* Profile 35. */
-            { 160, 175 }, /* Profile 36. */
-            { 192, 207 }, /* Profile 37. */
-            { 192, 207 }, /* Profile 38. */
-            { 160, 175 }, /* Profile 39. */
-            { 160, 175 }, /* Profile 40. */
-            { 192, 207 }, /* Profile 41. */
-            { 192, 207 }, /* Profile 42. */
-            { 160, 175 }, /* Profile 43. */
-            { 160, 175 }, /* Profile 44. */
-            { 192, 207 }, /* Profile 45. */
+            { 80, 95 }, /* Profile 2. */
+            { 80, 95 }, /* Profile 3. */
+            { 80, 95 }, /* Profile 4. */
+            { 80, 95 }, /* Profile 5. */
+            { 80, 95 }, /* Profile 6. */
+            { 80, 95 }, /* Profile 7. */
+            { 80, 95 }, /* Profile 8. */
+            { 80, 95 }, /* Profile 9. */
+            { 80, 95 }, /* Profile 10. */
+            { 80, 95 }, /* Profile 11. */
+            { 80, 95 }, /* Profile 12. */
+            { 80, 95 }, /* Profile 13. */
+            { 80, 95 }, /* Profile 14. */
+            { 80, 95 }, /* Profile 15. */
+            { 80, 95 }, /* Profile 16. */
+            { 80, 95 }, /* Profile 17. */
+            { 80, 95 }, /* Profile 18. */
+            { 80, 95 }, /* Profile 19. */
+            { 80, 95 }, /* Profile 20. */
+            { 80, 95 }, /* Profile 21. */
+            { 80, 95 }, /* Profile 22. */
+            { 80, 95 }, /* Profile 23. */
+            { 80, 95 }, /* Profile 24. */
+            { 80, 95 }, /* Profile 25. */
+            { 80, 95 }, /* Profile 26. */
+            { 80, 95 }, /* Profile 27. */
+            { 80, 95 }, /* Profile 28. */
+            { 80, 95 }, /* Profile 29. */
+            { 80, 95 }, /* Profile 30. */
+            { 80, 95 }, /* Profile 31. */
+            { 80, 95 }, /* Profile 32. */
+            { 80, 95 }, /* Profile 33. */
+            { 80, 95 }, /* Profile 34. */
+            { 80, 95 }, /* Profile 35. */
+            { 80, 95 }, /* Profile 36. */
+            { 80, 95 }, /* Profile 37. */
+            { 80, 95 }, /* Profile 38. */
+            { 80, 95 }, /* Profile 39. */
+            { 80, 95 }, /* Profile 40. */
+            { 80, 95 }, /* Profile 41. */
+            { 80, 95 }, /* Profile 42. */
+            { 80, 95 }, /* Profile 43. */
+            { 80, 95 }, /* Profile 44. */
+            { 80, 95 }, /* Profile 45. */
         },
         .profile_cnt = 46,
     },
     {
         .name = "EM_FT_OPAQUE_OBJ_OR_IFP_OPAQUE_OBJ_15_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_EM_FT_OPAQUE_OBJ_OR_IFP_OPAQUE_OBJ_15_0,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_EM_FT_OPAQUE_OBJ_OR_IFP_OPAQUE_OBJ_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 288, 303 }, /* Profile 2. */
-            { 320, 335 }, /* Profile 3. */
-            { 320, 335 }, /* Profile 4. */
-            { 320, 335 }, /* Profile 5. */
-            { 288, 303 }, /* Profile 6. */
-            { 320, 335 }, /* Profile 7. */
-            { 320, 335 }, /* Profile 8. */
-            { 320, 335 }, /* Profile 9. */
-            { 288, 303 }, /* Profile 10. */
-            { 320, 335 }, /* Profile 11. */
-            { 320, 335 }, /* Profile 12. */
+            { 256, 271 }, /* Profile 2. */
+            { 256, 271 }, /* Profile 3. */
+            { 256, 271 }, /* Profile 4. */
+            { 256, 271 }, /* Profile 5. */
+            { 256, 271 }, /* Profile 6. */
+            { 256, 271 }, /* Profile 7. */
+            { 256, 271 }, /* Profile 8. */
+            { 256, 271 }, /* Profile 9. */
+            { 256, 271 }, /* Profile 10. */
+            { 256, 271 }, /* Profile 11. */
+            { 256, 271 }, /* Profile 12. */
             { -1, -1 }, /* Profile 13. */
             { -1, -1 }, /* Profile 14. */
             { -1, -1 }, /* Profile 15. */
@@ -635,129 +682,129 @@ static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_flex_field_
             { -1, -1 }, /* Profile 21. */
             { -1, -1 }, /* Profile 22. */
             { -1, -1 }, /* Profile 23. */
-            { 288, 303 }, /* Profile 24. */
-            { 320, 335 }, /* Profile 25. */
-            { 320, 335 }, /* Profile 26. */
-            { 320, 335 }, /* Profile 27. */
-            { 288, 303 }, /* Profile 28. */
-            { 320, 335 }, /* Profile 29. */
-            { 320, 335 }, /* Profile 30. */
-            { 320, 335 }, /* Profile 31. */
-            { 288, 303 }, /* Profile 32. */
-            { 320, 335 }, /* Profile 33. */
-            { 320, 335 }, /* Profile 34. */
+            { 272, 287 }, /* Profile 24. */
+            { 272, 287 }, /* Profile 25. */
+            { 272, 287 }, /* Profile 26. */
+            { 272, 287 }, /* Profile 27. */
+            { 272, 287 }, /* Profile 28. */
+            { 272, 287 }, /* Profile 29. */
+            { 272, 287 }, /* Profile 30. */
+            { 272, 287 }, /* Profile 31. */
+            { 272, 287 }, /* Profile 32. */
+            { 272, 287 }, /* Profile 33. */
+            { 272, 287 }, /* Profile 34. */
         },
         .profile_cnt = 35,
     },
     {
         .name = "ENTROPY_LABEL_HIGH_3_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_HIGH_3_0,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_HIGH_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 372, 375 }, /* Profile 2. */
+            { 380, 383 }, /* Profile 2. */
             { 384, 387 }, /* Profile 3. */
             { 380, 383 }, /* Profile 4. */
             { 380, 383 }, /* Profile 5. */
-            { 372, 375 }, /* Profile 6. */
+            { 380, 383 }, /* Profile 6. */
             { 384, 387 }, /* Profile 7. */
             { 380, 383 }, /* Profile 8. */
             { 380, 383 }, /* Profile 9. */
-            { 372, 375 }, /* Profile 10. */
-            { 384, 387 }, /* Profile 11. */
-            { 380, 383 }, /* Profile 12. */
-            { 372, 375 }, /* Profile 13. */
-            { 384, 387 }, /* Profile 14. */
-            { 380, 383 }, /* Profile 15. */
-            { 380, 383 }, /* Profile 16. */
-            { 372, 375 }, /* Profile 17. */
+            { 376, 379 }, /* Profile 10. */
+            { 380, 383 }, /* Profile 11. */
+            { 376, 379 }, /* Profile 12. */
+            { 380, 383 }, /* Profile 13. */
+            { 384, 387 }, /* Profile 14. */
+            { 380, 383 }, /* Profile 15. */
+            { 380, 383 }, /* Profile 16. */
+            { 380, 383 }, /* Profile 17. */
             { 384, 387 }, /* Profile 18. */
             { 380, 383 }, /* Profile 19. */
             { 380, 383 }, /* Profile 20. */
-            { 372, 375 }, /* Profile 21. */
-            { 384, 387 }, /* Profile 22. */
-            { 380, 383 }, /* Profile 23. */
-            { 372, 375 }, /* Profile 24. */
+            { 376, 379 }, /* Profile 21. */
+            { 380, 383 }, /* Profile 22. */
+            { 376, 379 }, /* Profile 23. */
+            { 380, 383 }, /* Profile 24. */
             { 384, 387 }, /* Profile 25. */
             { 380, 383 }, /* Profile 26. */
             { 380, 383 }, /* Profile 27. */
-            { 372, 375 }, /* Profile 28. */
+            { 380, 383 }, /* Profile 28. */
             { 384, 387 }, /* Profile 29. */
             { 380, 383 }, /* Profile 30. */
             { 380, 383 }, /* Profile 31. */
-            { 372, 375 }, /* Profile 32. */
-            { 384, 387 }, /* Profile 33. */
-            { 380, 383 }, /* Profile 34. */
-            { 372, 375 }, /* Profile 35. */
+            { 376, 379 }, /* Profile 32. */
+            { 380, 383 }, /* Profile 33. */
+            { 376, 379 }, /* Profile 34. */
+            { 380, 383 }, /* Profile 35. */
             { 384, 387 }, /* Profile 36. */
             { 380, 383 }, /* Profile 37. */
             { 380, 383 }, /* Profile 38. */
-            { 372, 375 }, /* Profile 39. */
+            { 380, 383 }, /* Profile 39. */
             { 384, 387 }, /* Profile 40. */
             { 380, 383 }, /* Profile 41. */
             { 380, 383 }, /* Profile 42. */
-            { 372, 375 }, /* Profile 43. */
-            { 384, 387 }, /* Profile 44. */
-            { 380, 383 }, /* Profile 45. */
+            { 376, 379 }, /* Profile 43. */
+            { 380, 383 }, /* Profile 44. */
+            { 376, 379 }, /* Profile 45. */
         },
         .profile_cnt = 46,
     },
     {
         .name = "ENTROPY_LABEL_LOW_15_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_ENTROPY_LABEL_LOW_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 80, 95 }, /* Profile 2. */
-            { 80, 95 }, /* Profile 3. */
-            { 80, 95 }, /* Profile 4. */
-            { 80, 95 }, /* Profile 5. */
-            { 80, 95 }, /* Profile 6. */
-            { 80, 95 }, /* Profile 7. */
-            { 80, 95 }, /* Profile 8. */
-            { 80, 95 }, /* Profile 9. */
-            { 80, 95 }, /* Profile 10. */
-            { 80, 95 }, /* Profile 11. */
-            { 80, 95 }, /* Profile 12. */
-            { 80, 95 }, /* Profile 13. */
-            { 80, 95 }, /* Profile 14. */
-            { 80, 95 }, /* Profile 15. */
-            { 80, 95 }, /* Profile 16. */
-            { 80, 95 }, /* Profile 17. */
-            { 80, 95 }, /* Profile 18. */
-            { 80, 95 }, /* Profile 19. */
-            { 80, 95 }, /* Profile 20. */
-            { 80, 95 }, /* Profile 21. */
-            { 80, 95 }, /* Profile 22. */
-            { 80, 95 }, /* Profile 23. */
-            { 80, 95 }, /* Profile 24. */
-            { 80, 95 }, /* Profile 25. */
-            { 80, 95 }, /* Profile 26. */
-            { 80, 95 }, /* Profile 27. */
-            { 80, 95 }, /* Profile 28. */
-            { 80, 95 }, /* Profile 29. */
-            { 80, 95 }, /* Profile 30. */
-            { 80, 95 }, /* Profile 31. */
-            { 80, 95 }, /* Profile 32. */
-            { 80, 95 }, /* Profile 33. */
-            { 80, 95 }, /* Profile 34. */
-            { 80, 95 }, /* Profile 35. */
-            { 80, 95 }, /* Profile 36. */
-            { 80, 95 }, /* Profile 37. */
-            { 80, 95 }, /* Profile 38. */
-            { 80, 95 }, /* Profile 39. */
-            { 80, 95 }, /* Profile 40. */
-            { 80, 95 }, /* Profile 41. */
-            { 80, 95 }, /* Profile 42. */
-            { 80, 95 }, /* Profile 43. */
-            { 80, 95 }, /* Profile 44. */
-            { 80, 95 }, /* Profile 45. */
+            { 96, 111 }, /* Profile 2. */
+            { 96, 111 }, /* Profile 3. */
+            { 96, 111 }, /* Profile 4. */
+            { 96, 111 }, /* Profile 5. */
+            { 96, 111 }, /* Profile 6. */
+            { 96, 111 }, /* Profile 7. */
+            { 96, 111 }, /* Profile 8. */
+            { 96, 111 }, /* Profile 9. */
+            { 96, 111 }, /* Profile 10. */
+            { 96, 111 }, /* Profile 11. */
+            { 96, 111 }, /* Profile 12. */
+            { 96, 111 }, /* Profile 13. */
+            { 96, 111 }, /* Profile 14. */
+            { 96, 111 }, /* Profile 15. */
+            { 96, 111 }, /* Profile 16. */
+            { 96, 111 }, /* Profile 17. */
+            { 96, 111 }, /* Profile 18. */
+            { 96, 111 }, /* Profile 19. */
+            { 96, 111 }, /* Profile 20. */
+            { 96, 111 }, /* Profile 21. */
+            { 96, 111 }, /* Profile 22. */
+            { 96, 111 }, /* Profile 23. */
+            { 96, 111 }, /* Profile 24. */
+            { 96, 111 }, /* Profile 25. */
+            { 96, 111 }, /* Profile 26. */
+            { 96, 111 }, /* Profile 27. */
+            { 96, 111 }, /* Profile 28. */
+            { 96, 111 }, /* Profile 29. */
+            { 96, 111 }, /* Profile 30. */
+            { 96, 111 }, /* Profile 31. */
+            { 96, 111 }, /* Profile 32. */
+            { 96, 111 }, /* Profile 33. */
+            { 96, 111 }, /* Profile 34. */
+            { 96, 111 }, /* Profile 35. */
+            { 96, 111 }, /* Profile 36. */
+            { 96, 111 }, /* Profile 37. */
+            { 96, 111 }, /* Profile 38. */
+            { 96, 111 }, /* Profile 39. */
+            { 96, 111 }, /* Profile 40. */
+            { 96, 111 }, /* Profile 41. */
+            { 96, 111 }, /* Profile 42. */
+            { 96, 111 }, /* Profile 43. */
+            { 96, 111 }, /* Profile 44. */
+            { 96, 111 }, /* Profile 45. */
         },
         .profile_cnt = 46,
     },
     {
         .name = "EP_NIH_DROP_CODE_OR_IFP_OPAQUE_OBJ_15_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_EP_NIH_DROP_CODE_OR_IFP_OPAQUE_OBJ_15_0,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_EP_NIH_DROP_CODE_OR_IFP_OPAQUE_OBJ_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -807,155 +854,155 @@ static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_flex_field_
     },
     {
         .name = "EP_NIH_HDR_RECIRC_CODE_3_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_RECIRC_CODE_3_0,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_RECIRC_CODE_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 376, 379 }, /* Profile 2. */
-            { 388, 391 }, /* Profile 3. */
-            { 384, 387 }, /* Profile 4. */
-            { 384, 387 }, /* Profile 5. */
-            { 376, 379 }, /* Profile 6. */
-            { 388, 391 }, /* Profile 7. */
-            { 384, 387 }, /* Profile 8. */
-            { 384, 387 }, /* Profile 9. */
+            { 368, 371 }, /* Profile 2. */
+            { 368, 371 }, /* Profile 3. */
+            { 368, 371 }, /* Profile 4. */
+            { 368, 371 }, /* Profile 5. */
+            { 368, 371 }, /* Profile 6. */
+            { 368, 371 }, /* Profile 7. */
+            { 368, 371 }, /* Profile 8. */
+            { 368, 371 }, /* Profile 9. */
             { -1, -1 }, /* Profile 10. */
             { -1, -1 }, /* Profile 11. */
             { -1, -1 }, /* Profile 12. */
-            { 376, 379 }, /* Profile 13. */
-            { 388, 391 }, /* Profile 14. */
-            { 384, 387 }, /* Profile 15. */
-            { 384, 387 }, /* Profile 16. */
-            { 376, 379 }, /* Profile 17. */
-            { 388, 391 }, /* Profile 18. */
-            { 384, 387 }, /* Profile 19. */
-            { 384, 387 }, /* Profile 20. */
+            { 368, 371 }, /* Profile 13. */
+            { 368, 371 }, /* Profile 14. */
+            { 368, 371 }, /* Profile 15. */
+            { 368, 371 }, /* Profile 16. */
+            { 368, 371 }, /* Profile 17. */
+            { 368, 371 }, /* Profile 18. */
+            { 368, 371 }, /* Profile 19. */
+            { 368, 371 }, /* Profile 20. */
             { -1, -1 }, /* Profile 21. */
             { -1, -1 }, /* Profile 22. */
             { -1, -1 }, /* Profile 23. */
-            { 376, 379 }, /* Profile 24. */
-            { 388, 391 }, /* Profile 25. */
-            { 384, 387 }, /* Profile 26. */
-            { 384, 387 }, /* Profile 27. */
-            { 376, 379 }, /* Profile 28. */
-            { 388, 391 }, /* Profile 29. */
-            { 384, 387 }, /* Profile 30. */
-            { 384, 387 }, /* Profile 31. */
+            { 368, 371 }, /* Profile 24. */
+            { 368, 371 }, /* Profile 25. */
+            { 368, 371 }, /* Profile 26. */
+            { 368, 371 }, /* Profile 27. */
+            { 368, 371 }, /* Profile 28. */
+            { 368, 371 }, /* Profile 29. */
+            { 368, 371 }, /* Profile 30. */
+            { 368, 371 }, /* Profile 31. */
             { -1, -1 }, /* Profile 32. */
             { -1, -1 }, /* Profile 33. */
             { -1, -1 }, /* Profile 34. */
-            { 376, 379 }, /* Profile 35. */
-            { 388, 391 }, /* Profile 36. */
-            { 384, 387 }, /* Profile 37. */
-            { 384, 387 }, /* Profile 38. */
-            { 376, 379 }, /* Profile 39. */
-            { 388, 391 }, /* Profile 40. */
-            { 384, 387 }, /* Profile 41. */
-            { 384, 387 }, /* Profile 42. */
+            { 368, 371 }, /* Profile 35. */
+            { 368, 371 }, /* Profile 36. */
+            { 368, 371 }, /* Profile 37. */
+            { 368, 371 }, /* Profile 38. */
+            { 368, 371 }, /* Profile 39. */
+            { 368, 371 }, /* Profile 40. */
+            { 368, 371 }, /* Profile 41. */
+            { 368, 371 }, /* Profile 42. */
         },
         .profile_cnt = 43,
     },
     {
         .name = "EP_NIH_HDR_TIMESTAMP_15_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_15_0,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { -1, -1 }, /* Profile 2. */
             { -1, -1 }, /* Profile 3. */
-            { 144, 159 }, /* Profile 4. */
+            { 208, 223 }, /* Profile 4. */
             { -1, -1 }, /* Profile 5. */
             { -1, -1 }, /* Profile 6. */
             { -1, -1 }, /* Profile 7. */
-            { 144, 159 }, /* Profile 8. */
+            { 208, 223 }, /* Profile 8. */
             { -1, -1 }, /* Profile 9. */
             { -1, -1 }, /* Profile 10. */
             { -1, -1 }, /* Profile 11. */
             { -1, -1 }, /* Profile 12. */
             { -1, -1 }, /* Profile 13. */
             { -1, -1 }, /* Profile 14. */
-            { 144, 159 }, /* Profile 15. */
+            { 208, 223 }, /* Profile 15. */
             { -1, -1 }, /* Profile 16. */
             { -1, -1 }, /* Profile 17. */
             { -1, -1 }, /* Profile 18. */
-            { 144, 159 }, /* Profile 19. */
+            { 208, 223 }, /* Profile 19. */
             { -1, -1 }, /* Profile 20. */
             { -1, -1 }, /* Profile 21. */
             { -1, -1 }, /* Profile 22. */
             { -1, -1 }, /* Profile 23. */
             { -1, -1 }, /* Profile 24. */
             { -1, -1 }, /* Profile 25. */
-            { 160, 175 }, /* Profile 26. */
+            { 224, 239 }, /* Profile 26. */
             { -1, -1 }, /* Profile 27. */
             { -1, -1 }, /* Profile 28. */
             { -1, -1 }, /* Profile 29. */
-            { 160, 175 }, /* Profile 30. */
+            { 224, 239 }, /* Profile 30. */
             { -1, -1 }, /* Profile 31. */
             { -1, -1 }, /* Profile 32. */
             { -1, -1 }, /* Profile 33. */
             { -1, -1 }, /* Profile 34. */
             { -1, -1 }, /* Profile 35. */
             { -1, -1 }, /* Profile 36. */
-            { 160, 175 }, /* Profile 37. */
+            { 224, 239 }, /* Profile 37. */
             { -1, -1 }, /* Profile 38. */
             { -1, -1 }, /* Profile 39. */
             { -1, -1 }, /* Profile 40. */
-            { 160, 175 }, /* Profile 41. */
+            { 224, 239 }, /* Profile 41. */
         },
         .profile_cnt = 42,
     },
     {
         .name = "EP_NIH_HDR_TIMESTAMP_31_16",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_31_16,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_EP_NIH_HDR_TIMESTAMP_31_16,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { -1, -1 }, /* Profile 2. */
             { -1, -1 }, /* Profile 3. */
-            { 160, 175 }, /* Profile 4. */
+            { 224, 239 }, /* Profile 4. */
             { -1, -1 }, /* Profile 5. */
             { -1, -1 }, /* Profile 6. */
             { -1, -1 }, /* Profile 7. */
-            { 160, 175 }, /* Profile 8. */
+            { 224, 239 }, /* Profile 8. */
             { -1, -1 }, /* Profile 9. */
             { -1, -1 }, /* Profile 10. */
             { -1, -1 }, /* Profile 11. */
             { -1, -1 }, /* Profile 12. */
             { -1, -1 }, /* Profile 13. */
             { -1, -1 }, /* Profile 14. */
-            { 160, 175 }, /* Profile 15. */
+            { 224, 239 }, /* Profile 15. */
             { -1, -1 }, /* Profile 16. */
             { -1, -1 }, /* Profile 17. */
             { -1, -1 }, /* Profile 18. */
-            { 160, 175 }, /* Profile 19. */
+            { 224, 239 }, /* Profile 19. */
             { -1, -1 }, /* Profile 20. */
             { -1, -1 }, /* Profile 21. */
             { -1, -1 }, /* Profile 22. */
             { -1, -1 }, /* Profile 23. */
             { -1, -1 }, /* Profile 24. */
             { -1, -1 }, /* Profile 25. */
-            { 176, 191 }, /* Profile 26. */
+            { 240, 255 }, /* Profile 26. */
             { -1, -1 }, /* Profile 27. */
             { -1, -1 }, /* Profile 28. */
             { -1, -1 }, /* Profile 29. */
-            { 176, 191 }, /* Profile 30. */
+            { 240, 255 }, /* Profile 30. */
             { -1, -1 }, /* Profile 31. */
             { -1, -1 }, /* Profile 32. */
             { -1, -1 }, /* Profile 33. */
             { -1, -1 }, /* Profile 34. */
             { -1, -1 }, /* Profile 35. */
             { -1, -1 }, /* Profile 36. */
-            { 176, 191 }, /* Profile 37. */
+            { 240, 255 }, /* Profile 37. */
             { -1, -1 }, /* Profile 38. */
             { -1, -1 }, /* Profile 39. */
             { -1, -1 }, /* Profile 40. */
-            { 176, 191 }, /* Profile 41. */
+            { 240, 255 }, /* Profile 41. */
         },
         .profile_cnt = 42,
     },
     {
         .name = "EVENT_TRACE_VECTOR_15_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_15_0,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1008,7 +1055,7 @@ static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_flex_field_
     },
     {
         .name = "EVENT_TRACE_VECTOR_31_16",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_16,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_31_16,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1061,7 +1108,7 @@ static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_flex_field_
     },
     {
         .name = "EVENT_TRACE_VECTOR_47_32",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_EVENT_TRACE_VECTOR_47_32,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1114,515 +1161,515 @@ static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_flex_field_
     },
     {
         .name = "I2E_CLASS_ID_15_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_I2E_CLASS_ID_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 192, 207 }, /* Profile 2. */
-            { 192, 207 }, /* Profile 3. */
-            { 224, 239 }, /* Profile 4. */
-            { 224, 239 }, /* Profile 5. */
-            { 192, 207 }, /* Profile 6. */
-            { 192, 207 }, /* Profile 7. */
-            { 224, 239 }, /* Profile 8. */
-            { 224, 239 }, /* Profile 9. */
-            { 192, 207 }, /* Profile 10. */
-            { 192, 207 }, /* Profile 11. */
-            { 224, 239 }, /* Profile 12. */
-            { 192, 207 }, /* Profile 13. */
-            { 192, 207 }, /* Profile 14. */
-            { 224, 239 }, /* Profile 15. */
-            { 224, 239 }, /* Profile 16. */
-            { 192, 207 }, /* Profile 17. */
-            { 192, 207 }, /* Profile 18. */
-            { 224, 239 }, /* Profile 19. */
-            { 224, 239 }, /* Profile 20. */
-            { 192, 207 }, /* Profile 21. */
-            { 192, 207 }, /* Profile 22. */
-            { 224, 239 }, /* Profile 23. */
-            { 208, 223 }, /* Profile 24. */
-            { 208, 223 }, /* Profile 25. */
-            { 240, 255 }, /* Profile 26. */
-            { 240, 255 }, /* Profile 27. */
-            { 208, 223 }, /* Profile 28. */
-            { 208, 223 }, /* Profile 29. */
-            { 240, 255 }, /* Profile 30. */
-            { 240, 255 }, /* Profile 31. */
-            { 208, 223 }, /* Profile 32. */
-            { 208, 223 }, /* Profile 33. */
-            { 240, 255 }, /* Profile 34. */
-            { 208, 223 }, /* Profile 35. */
-            { 208, 223 }, /* Profile 36. */
-            { 240, 255 }, /* Profile 37. */
-            { 240, 255 }, /* Profile 38. */
-            { 208, 223 }, /* Profile 39. */
-            { 208, 223 }, /* Profile 40. */
-            { 240, 255 }, /* Profile 41. */
-            { 240, 255 }, /* Profile 42. */
-            { 208, 223 }, /* Profile 43. */
-            { 208, 223 }, /* Profile 44. */
-            { 240, 255 }, /* Profile 45. */
-        },
+            { 352, 367 }, /* Profile 2. */
+            { 352, 367 }, /* Profile 3. */
+            { 352, 367 }, /* Profile 4. */
+            { 352, 367 }, /* Profile 5. */
+            { 352, 367 }, /* Profile 6. */
+            { 352, 367 }, /* Profile 7. */
+            { 352, 367 }, /* Profile 8. */
+            { 352, 367 }, /* Profile 9. */
+            { 352, 367 }, /* Profile 10. */
+            { 352, 367 }, /* Profile 11. */
+            { 352, 367 }, /* Profile 12. */
+            { 352, 367 }, /* Profile 13. */
+            { 352, 367 }, /* Profile 14. */
+            { 352, 367 }, /* Profile 15. */
+            { 352, 367 }, /* Profile 16. */
+            { 352, 367 }, /* Profile 17. */
+            { 352, 367 }, /* Profile 18. */
+            { 352, 367 }, /* Profile 19. */
+            { 352, 367 }, /* Profile 20. */
+            { 352, 367 }, /* Profile 21. */
+            { 352, 367 }, /* Profile 22. */
+            { 352, 367 }, /* Profile 23. */
+            { 352, 367 }, /* Profile 24. */
+            { 352, 367 }, /* Profile 25. */
+            { 352, 367 }, /* Profile 26. */
+            { 352, 367 }, /* Profile 27. */
+            { 352, 367 }, /* Profile 28. */
+            { 352, 367 }, /* Profile 29. */
+            { 352, 367 }, /* Profile 30. */
+            { 352, 367 }, /* Profile 31. */
+            { 352, 367 }, /* Profile 32. */
+            { 352, 367 }, /* Profile 33. */
+            { 352, 367 }, /* Profile 34. */
+            { 352, 367 }, /* Profile 35. */
+            { 352, 367 }, /* Profile 36. */
+            { 352, 367 }, /* Profile 37. */
+            { 352, 367 }, /* Profile 38. */
+            { 352, 367 }, /* Profile 39. */
+            { 352, 367 }, /* Profile 40. */
+            { 352, 367 }, /* Profile 41. */
+            { 352, 367 }, /* Profile 42. */
+            { 352, 367 }, /* Profile 43. */
+            { 352, 367 }, /* Profile 44. */
+            { 352, 367 }, /* Profile 45. */
+        },
         .profile_cnt = 46,
     },
     {
         .name = "IFP_IOAM_GBP_ACTION_3_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_IFP_IOAM_GBP_ACTION_3_0,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_IFP_IOAM_GBP_ACTION_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 368, 371 }, /* Profile 2. */
-            { 380, 383 }, /* Profile 3. */
-            { 376, 379 }, /* Profile 4. */
-            { 376, 379 }, /* Profile 5. */
-            { 368, 371 }, /* Profile 6. */
-            { 380, 383 }, /* Profile 7. */
-            { 376, 379 }, /* Profile 8. */
-            { 376, 379 }, /* Profile 9. */
-            { 368, 371 }, /* Profile 10. */
-            { 380, 383 }, /* Profile 11. */
-            { 376, 379 }, /* Profile 12. */
-            { 368, 371 }, /* Profile 13. */
-            { 380, 383 }, /* Profile 14. */
-            { 376, 379 }, /* Profile 15. */
-            { 376, 379 }, /* Profile 16. */
-            { 368, 371 }, /* Profile 17. */
-            { 380, 383 }, /* Profile 18. */
-            { 376, 379 }, /* Profile 19. */
-            { 376, 379 }, /* Profile 20. */
-            { 368, 371 }, /* Profile 21. */
-            { 380, 383 }, /* Profile 22. */
-            { 376, 379 }, /* Profile 23. */
-            { 368, 371 }, /* Profile 24. */
-            { 380, 383 }, /* Profile 25. */
-            { 376, 379 }, /* Profile 26. */
-            { 376, 379 }, /* Profile 27. */
-            { 368, 371 }, /* Profile 28. */
-            { 380, 383 }, /* Profile 29. */
-            { 376, 379 }, /* Profile 30. */
-            { 376, 379 }, /* Profile 31. */
-            { 368, 371 }, /* Profile 32. */
-            { 380, 383 }, /* Profile 33. */
-            { 376, 379 }, /* Profile 34. */
-            { 368, 371 }, /* Profile 35. */
-            { 380, 383 }, /* Profile 36. */
-            { 376, 379 }, /* Profile 37. */
-            { 376, 379 }, /* Profile 38. */
-            { 368, 371 }, /* Profile 39. */
-            { 380, 383 }, /* Profile 40. */
-            { 376, 379 }, /* Profile 41. */
-            { 376, 379 }, /* Profile 42. */
-            { 368, 371 }, /* Profile 43. */
-            { 380, 383 }, /* Profile 44. */
-            { 376, 379 }, /* Profile 45. */
+            { 400, 403 }, /* Profile 2. */
+            { 400, 403 }, /* Profile 3. */
+            { 396, 399 }, /* Profile 4. */
+            { 396, 399 }, /* Profile 5. */
+            { 400, 403 }, /* Profile 6. */
+            { 400, 403 }, /* Profile 7. */
+            { 396, 399 }, /* Profile 8. */
+            { 396, 399 }, /* Profile 9. */
+            { 396, 399 }, /* Profile 10. */
+            { 396, 399 }, /* Profile 11. */
+            { 392, 395 }, /* Profile 12. */
+            { 400, 403 }, /* Profile 13. */
+            { 400, 403 }, /* Profile 14. */
+            { 396, 399 }, /* Profile 15. */
+            { 396, 399 }, /* Profile 16. */
+            { 400, 403 }, /* Profile 17. */
+            { 400, 403 }, /* Profile 18. */
+            { 396, 399 }, /* Profile 19. */
+            { 396, 399 }, /* Profile 20. */
+            { 396, 399 }, /* Profile 21. */
+            { 396, 399 }, /* Profile 22. */
+            { 392, 395 }, /* Profile 23. */
+            { 400, 403 }, /* Profile 24. */
+            { 400, 403 }, /* Profile 25. */
+            { 396, 399 }, /* Profile 26. */
+            { 396, 399 }, /* Profile 27. */
+            { 400, 403 }, /* Profile 28. */
+            { 400, 403 }, /* Profile 29. */
+            { 396, 399 }, /* Profile 30. */
+            { 396, 399 }, /* Profile 31. */
+            { 396, 399 }, /* Profile 32. */
+            { 396, 399 }, /* Profile 33. */
+            { 392, 395 }, /* Profile 34. */
+            { 400, 403 }, /* Profile 35. */
+            { 400, 403 }, /* Profile 36. */
+            { 396, 399 }, /* Profile 37. */
+            { 396, 399 }, /* Profile 38. */
+            { 400, 403 }, /* Profile 39. */
+            { 400, 403 }, /* Profile 40. */
+            { 396, 399 }, /* Profile 41. */
+            { 396, 399 }, /* Profile 42. */
+            { 396, 399 }, /* Profile 43. */
+            { 396, 399 }, /* Profile 44. */
+            { 392, 395 }, /* Profile 45. */
         },
         .profile_cnt = 46,
     },
     {
         .name = "IFP_TS_CONTROL_ACTION_3_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_IFP_TS_CONTROL_ACTION_3_0,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_IFP_TS_CONTROL_ACTION_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 392, 395 }, /* Profile 2. */
-            { 404, 407 }, /* Profile 3. */
-            { 400, 403 }, /* Profile 4. */
-            { 400, 403 }, /* Profile 5. */
-            { 392, 395 }, /* Profile 6. */
-            { 404, 407 }, /* Profile 7. */
-            { 400, 403 }, /* Profile 8. */
-            { 400, 403 }, /* Profile 9. */
-            { 388, 391 }, /* Profile 10. */
-            { 400, 403 }, /* Profile 11. */
-            { 396, 399 }, /* Profile 12. */
-            { 392, 395 }, /* Profile 13. */
-            { 404, 407 }, /* Profile 14. */
-            { 400, 403 }, /* Profile 15. */
-            { 400, 403 }, /* Profile 16. */
-            { 392, 395 }, /* Profile 17. */
-            { 404, 407 }, /* Profile 18. */
-            { 400, 403 }, /* Profile 19. */
-            { 400, 403 }, /* Profile 20. */
-            { 388, 391 }, /* Profile 21. */
-            { 400, 403 }, /* Profile 22. */
-            { 396, 399 }, /* Profile 23. */
-            { 392, 395 }, /* Profile 24. */
-            { 404, 407 }, /* Profile 25. */
-            { 400, 403 }, /* Profile 26. */
-            { 400, 403 }, /* Profile 27. */
-            { 392, 395 }, /* Profile 28. */
-            { 404, 407 }, /* Profile 29. */
-            { 400, 403 }, /* Profile 30. */
-            { 400, 403 }, /* Profile 31. */
-            { 388, 391 }, /* Profile 32. */
-            { 400, 403 }, /* Profile 33. */
-            { 396, 399 }, /* Profile 34. */
-            { 392, 395 }, /* Profile 35. */
-            { 404, 407 }, /* Profile 36. */
-            { 400, 403 }, /* Profile 37. */
-            { 400, 403 }, /* Profile 38. */
-            { 392, 395 }, /* Profile 39. */
-            { 404, 407 }, /* Profile 40. */
-            { 400, 403 }, /* Profile 41. */
-            { 400, 403 }, /* Profile 42. */
-            { 388, 391 }, /* Profile 43. */
-            { 400, 403 }, /* Profile 44. */
-            { 396, 399 }, /* Profile 45. */
+            { 420, 423 }, /* Profile 2. */
+            { 420, 423 }, /* Profile 3. */
+            { 420, 423 }, /* Profile 4. */
+            { 420, 423 }, /* Profile 5. */
+            { 420, 423 }, /* Profile 6. */
+            { 420, 423 }, /* Profile 7. */
+            { 420, 423 }, /* Profile 8. */
+            { 420, 423 }, /* Profile 9. */
+            { 416, 419 }, /* Profile 10. */
+            { 416, 419 }, /* Profile 11. */
+            { 416, 419 }, /* Profile 12. */
+            { 420, 423 }, /* Profile 13. */
+            { 420, 423 }, /* Profile 14. */
+            { 420, 423 }, /* Profile 15. */
+            { 420, 423 }, /* Profile 16. */
+            { 420, 423 }, /* Profile 17. */
+            { 420, 423 }, /* Profile 18. */
+            { 420, 423 }, /* Profile 19. */
+            { 420, 423 }, /* Profile 20. */
+            { 416, 419 }, /* Profile 21. */
+            { 416, 419 }, /* Profile 22. */
+            { 416, 419 }, /* Profile 23. */
+            { 420, 423 }, /* Profile 24. */
+            { 420, 423 }, /* Profile 25. */
+            { 420, 423 }, /* Profile 26. */
+            { 420, 423 }, /* Profile 27. */
+            { 420, 423 }, /* Profile 28. */
+            { 420, 423 }, /* Profile 29. */
+            { 420, 423 }, /* Profile 30. */
+            { 420, 423 }, /* Profile 31. */
+            { 416, 419 }, /* Profile 32. */
+            { 416, 419 }, /* Profile 33. */
+            { 416, 419 }, /* Profile 34. */
+            { 420, 423 }, /* Profile 35. */
+            { 420, 423 }, /* Profile 36. */
+            { 420, 423 }, /* Profile 37. */
+            { 420, 423 }, /* Profile 38. */
+            { 420, 423 }, /* Profile 39. */
+            { 420, 423 }, /* Profile 40. */
+            { 420, 423 }, /* Profile 41. */
+            { 420, 423 }, /* Profile 42. */
+            { 416, 419 }, /* Profile 43. */
+            { 416, 419 }, /* Profile 44. */
+            { 416, 419 }, /* Profile 45. */
         },
         .profile_cnt = 46,
     },
     {
         .name = "ING_TIMESTAMP_15_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_15_0,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { -1, -1 }, /* Profile 2. */
             { -1, -1 }, /* Profile 3. */
             { -1, -1 }, /* Profile 4. */
-            { 144, 159 }, /* Profile 5. */
+            { 208, 223 }, /* Profile 5. */
             { -1, -1 }, /* Profile 6. */
             { -1, -1 }, /* Profile 7. */
             { -1, -1 }, /* Profile 8. */
-            { 144, 159 }, /* Profile 9. */
+            { 208, 223 }, /* Profile 9. */
             { -1, -1 }, /* Profile 10. */
             { -1, -1 }, /* Profile 11. */
-            { 144, 159 }, /* Profile 12. */
+            { 208, 223 }, /* Profile 12. */
             { -1, -1 }, /* Profile 13. */
             { -1, -1 }, /* Profile 14. */
             { -1, -1 }, /* Profile 15. */
-            { 144, 159 }, /* Profile 16. */
+            { 208, 223 }, /* Profile 16. */
             { -1, -1 }, /* Profile 17. */
             { -1, -1 }, /* Profile 18. */
             { -1, -1 }, /* Profile 19. */
-            { 144, 159 }, /* Profile 20. */
+            { 208, 223 }, /* Profile 20. */
             { -1, -1 }, /* Profile 21. */
             { -1, -1 }, /* Profile 22. */
-            { 144, 159 }, /* Profile 23. */
+            { 208, 223 }, /* Profile 23. */
             { -1, -1 }, /* Profile 24. */
             { -1, -1 }, /* Profile 25. */
             { -1, -1 }, /* Profile 26. */
-            { 160, 175 }, /* Profile 27. */
+            { 224, 239 }, /* Profile 27. */
             { -1, -1 }, /* Profile 28. */
             { -1, -1 }, /* Profile 29. */
             { -1, -1 }, /* Profile 30. */
-            { 160, 175 }, /* Profile 31. */
+            { 224, 239 }, /* Profile 31. */
             { -1, -1 }, /* Profile 32. */
             { -1, -1 }, /* Profile 33. */
-            { 160, 175 }, /* Profile 34. */
+            { 224, 239 }, /* Profile 34. */
             { -1, -1 }, /* Profile 35. */
             { -1, -1 }, /* Profile 36. */
             { -1, -1 }, /* Profile 37. */
-            { 160, 175 }, /* Profile 38. */
+            { 224, 239 }, /* Profile 38. */
             { -1, -1 }, /* Profile 39. */
             { -1, -1 }, /* Profile 40. */
             { -1, -1 }, /* Profile 41. */
-            { 160, 175 }, /* Profile 42. */
+            { 224, 239 }, /* Profile 42. */
             { -1, -1 }, /* Profile 43. */
             { -1, -1 }, /* Profile 44. */
-            { 160, 175 }, /* Profile 45. */
+            { 224, 239 }, /* Profile 45. */
         },
         .profile_cnt = 46,
     },
     {
         .name = "ING_TIMESTAMP_31_16",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_16,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_ING_TIMESTAMP_31_16,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { -1, -1 }, /* Profile 2. */
             { -1, -1 }, /* Profile 3. */
             { -1, -1 }, /* Profile 4. */
-            { 160, 175 }, /* Profile 5. */
+            { 224, 239 }, /* Profile 5. */
             { -1, -1 }, /* Profile 6. */
             { -1, -1 }, /* Profile 7. */
             { -1, -1 }, /* Profile 8. */
-            { 160, 175 }, /* Profile 9. */
+            { 224, 239 }, /* Profile 9. */
             { -1, -1 }, /* Profile 10. */
             { -1, -1 }, /* Profile 11. */
-            { 160, 175 }, /* Profile 12. */
+            { 224, 239 }, /* Profile 12. */
             { -1, -1 }, /* Profile 13. */
             { -1, -1 }, /* Profile 14. */
             { -1, -1 }, /* Profile 15. */
-            { 160, 175 }, /* Profile 16. */
+            { 224, 239 }, /* Profile 16. */
             { -1, -1 }, /* Profile 17. */
             { -1, -1 }, /* Profile 18. */
             { -1, -1 }, /* Profile 19. */
-            { 160, 175 }, /* Profile 20. */
+            { 224, 239 }, /* Profile 20. */
             { -1, -1 }, /* Profile 21. */
             { -1, -1 }, /* Profile 22. */
-            { 160, 175 }, /* Profile 23. */
+            { 224, 239 }, /* Profile 23. */
             { -1, -1 }, /* Profile 24. */
             { -1, -1 }, /* Profile 25. */
             { -1, -1 }, /* Profile 26. */
-            { 176, 191 }, /* Profile 27. */
+            { 240, 255 }, /* Profile 27. */
             { -1, -1 }, /* Profile 28. */
             { -1, -1 }, /* Profile 29. */
             { -1, -1 }, /* Profile 30. */
-            { 176, 191 }, /* Profile 31. */
+            { 240, 255 }, /* Profile 31. */
             { -1, -1 }, /* Profile 32. */
             { -1, -1 }, /* Profile 33. */
-            { 176, 191 }, /* Profile 34. */
+            { 240, 255 }, /* Profile 34. */
             { -1, -1 }, /* Profile 35. */
             { -1, -1 }, /* Profile 36. */
             { -1, -1 }, /* Profile 37. */
-            { 176, 191 }, /* Profile 38. */
+            { 240, 255 }, /* Profile 38. */
             { -1, -1 }, /* Profile 39. */
             { -1, -1 }, /* Profile 40. */
             { -1, -1 }, /* Profile 41. */
-            { 176, 191 }, /* Profile 42. */
+            { 240, 255 }, /* Profile 42. */
             { -1, -1 }, /* Profile 43. */
             { -1, -1 }, /* Profile 44. */
-            { 176, 191 }, /* Profile 45. */
+            { 240, 255 }, /* Profile 45. */
         },
         .profile_cnt = 46,
     },
     {
-        .name = "INGRESS_DEVICE_PORT_6_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_INGRESS_DEVICE_PORT_6_0,
+        .name = "INGRESS_PP_PORT_7_0",
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_INGRESS_PP_PORT_7_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 272, 278 }, /* Profile 2. */
-            { 304, 310 }, /* Profile 3. */
-            { 304, 310 }, /* Profile 4. */
-            { 304, 310 }, /* Profile 5. */
-            { 272, 278 }, /* Profile 6. */
-            { 304, 310 }, /* Profile 7. */
-            { 304, 310 }, /* Profile 8. */
-            { 304, 310 }, /* Profile 9. */
-            { 272, 278 }, /* Profile 10. */
-            { 304, 310 }, /* Profile 11. */
-            { 304, 310 }, /* Profile 12. */
-            { 272, 278 }, /* Profile 13. */
-            { 304, 310 }, /* Profile 14. */
-            { 304, 310 }, /* Profile 15. */
-            { 304, 310 }, /* Profile 16. */
-            { 272, 278 }, /* Profile 17. */
-            { 304, 310 }, /* Profile 18. */
-            { 304, 310 }, /* Profile 19. */
-            { 304, 310 }, /* Profile 20. */
-            { 272, 278 }, /* Profile 21. */
-            { 304, 310 }, /* Profile 22. */
-            { 304, 310 }, /* Profile 23. */
-            { 272, 278 }, /* Profile 24. */
-            { 304, 310 }, /* Profile 25. */
-            { 304, 310 }, /* Profile 26. */
-            { 304, 310 }, /* Profile 27. */
-            { 272, 278 }, /* Profile 28. */
-            { 304, 310 }, /* Profile 29. */
-            { 304, 310 }, /* Profile 30. */
-            { 304, 310 }, /* Profile 31. */
-            { 272, 278 }, /* Profile 32. */
-            { 304, 310 }, /* Profile 33. */
-            { 304, 310 }, /* Profile 34. */
-            { 272, 278 }, /* Profile 35. */
-            { 304, 310 }, /* Profile 36. */
-            { 304, 310 }, /* Profile 37. */
-            { 304, 310 }, /* Profile 38. */
-            { 272, 278 }, /* Profile 39. */
-            { 304, 310 }, /* Profile 40. */
-            { 304, 310 }, /* Profile 41. */
-            { 304, 310 }, /* Profile 42. */
-            { 272, 278 }, /* Profile 43. */
-            { 304, 310 }, /* Profile 44. */
-            { 304, 310 }, /* Profile 45. */
+            { 272, 279 }, /* Profile 2. */
+            { 272, 279 }, /* Profile 3. */
+            { 272, 279 }, /* Profile 4. */
+            { 272, 279 }, /* Profile 5. */
+            { 272, 279 }, /* Profile 6. */
+            { 272, 279 }, /* Profile 7. */
+            { 272, 279 }, /* Profile 8. */
+            { 272, 279 }, /* Profile 9. */
+            { 272, 279 }, /* Profile 10. */
+            { 272, 279 }, /* Profile 11. */
+            { 272, 279 }, /* Profile 12. */
+            { 272, 279 }, /* Profile 13. */
+            { 272, 279 }, /* Profile 14. */
+            { 272, 279 }, /* Profile 15. */
+            { 272, 279 }, /* Profile 16. */
+            { 272, 279 }, /* Profile 17. */
+            { 272, 279 }, /* Profile 18. */
+            { 272, 279 }, /* Profile 19. */
+            { 272, 279 }, /* Profile 20. */
+            { 272, 279 }, /* Profile 21. */
+            { 272, 279 }, /* Profile 22. */
+            { 272, 279 }, /* Profile 23. */
+            { 288, 295 }, /* Profile 24. */
+            { 288, 295 }, /* Profile 25. */
+            { 288, 295 }, /* Profile 26. */
+            { 288, 295 }, /* Profile 27. */
+            { 288, 295 }, /* Profile 28. */
+            { 288, 295 }, /* Profile 29. */
+            { 288, 295 }, /* Profile 30. */
+            { 288, 295 }, /* Profile 31. */
+            { 288, 295 }, /* Profile 32. */
+            { 288, 295 }, /* Profile 33. */
+            { 288, 295 }, /* Profile 34. */
+            { 288, 295 }, /* Profile 35. */
+            { 288, 295 }, /* Profile 36. */
+            { 288, 295 }, /* Profile 37. */
+            { 288, 295 }, /* Profile 38. */
+            { 288, 295 }, /* Profile 39. */
+            { 288, 295 }, /* Profile 40. */
+            { 288, 295 }, /* Profile 41. */
+            { 288, 295 }, /* Profile 42. */
+            { 288, 295 }, /* Profile 43. */
+            { 288, 295 }, /* Profile 44. */
+            { 288, 295 }, /* Profile 45. */
         },
         .profile_cnt = 46,
     },
     {
         .name = "INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMAP_VALUE_OR_IFP_OPAQUE_OBJ_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 224, 239 }, /* Profile 2. */
-            { 224, 239 }, /* Profile 3. */
-            { 256, 271 }, /* Profile 4. */
-            { 256, 271 }, /* Profile 5. */
-            { 224, 239 }, /* Profile 6. */
-            { 224, 239 }, /* Profile 7. */
-            { 256, 271 }, /* Profile 8. */
-            { 256, 271 }, /* Profile 9. */
-            { 224, 239 }, /* Profile 10. */
-            { 224, 239 }, /* Profile 11. */
-            { 256, 271 }, /* Profile 12. */
-            { 224, 239 }, /* Profile 13. */
-            { 224, 239 }, /* Profile 14. */
-            { 256, 271 }, /* Profile 15. */
-            { 256, 271 }, /* Profile 16. */
-            { 224, 239 }, /* Profile 17. */
-            { 224, 239 }, /* Profile 18. */
-            { 256, 271 }, /* Profile 19. */
-            { 256, 271 }, /* Profile 20. */
-            { 224, 239 }, /* Profile 21. */
-            { 224, 239 }, /* Profile 22. */
-            { 256, 271 }, /* Profile 23. */
-            { 240, 255 }, /* Profile 24. */
-            { 240, 255 }, /* Profile 25. */
-            { 272, 287 }, /* Profile 26. */
-            { 272, 287 }, /* Profile 27. */
-            { 240, 255 }, /* Profile 28. */
-            { 240, 255 }, /* Profile 29. */
-            { 272, 287 }, /* Profile 30. */
-            { 272, 287 }, /* Profile 31. */
-            { 240, 255 }, /* Profile 32. */
-            { 240, 255 }, /* Profile 33. */
-            { 272, 287 }, /* Profile 34. */
-            { 240, 255 }, /* Profile 35. */
-            { 240, 255 }, /* Profile 36. */
-            { 272, 287 }, /* Profile 37. */
-            { 272, 287 }, /* Profile 38. */
-            { 240, 255 }, /* Profile 39. */
-            { 240, 255 }, /* Profile 40. */
-            { 272, 287 }, /* Profile 41. */
-            { 272, 287 }, /* Profile 42. */
-            { 240, 255 }, /* Profile 43. */
-            { 240, 255 }, /* Profile 44. */
-            { 272, 287 }, /* Profile 45. */
+            { 288, 303 }, /* Profile 2. */
+            { 288, 303 }, /* Profile 3. */
+            { 288, 303 }, /* Profile 4. */
+            { 288, 303 }, /* Profile 5. */
+            { 288, 303 }, /* Profile 6. */
+            { 288, 303 }, /* Profile 7. */
+            { 288, 303 }, /* Profile 8. */
+            { 288, 303 }, /* Profile 9. */
+            { 288, 303 }, /* Profile 10. */
+            { 288, 303 }, /* Profile 11. */
+            { 288, 303 }, /* Profile 12. */
+            { 288, 303 }, /* Profile 13. */
+            { 288, 303 }, /* Profile 14. */
+            { 288, 303 }, /* Profile 15. */
+            { 288, 303 }, /* Profile 16. */
+            { 288, 303 }, /* Profile 17. */
+            { 288, 303 }, /* Profile 18. */
+            { 288, 303 }, /* Profile 19. */
+            { 288, 303 }, /* Profile 20. */
+            { 288, 303 }, /* Profile 21. */
+            { 288, 303 }, /* Profile 22. */
+            { 288, 303 }, /* Profile 23. */
+            { 304, 319 }, /* Profile 24. */
+            { 304, 319 }, /* Profile 25. */
+            { 304, 319 }, /* Profile 26. */
+            { 304, 319 }, /* Profile 27. */
+            { 304, 319 }, /* Profile 28. */
+            { 304, 319 }, /* Profile 29. */
+            { 304, 319 }, /* Profile 30. */
+            { 304, 319 }, /* Profile 31. */
+            { 304, 319 }, /* Profile 32. */
+            { 304, 319 }, /* Profile 33. */
+            { 304, 319 }, /* Profile 34. */
+            { 304, 319 }, /* Profile 35. */
+            { 304, 319 }, /* Profile 36. */
+            { 304, 319 }, /* Profile 37. */
+            { 304, 319 }, /* Profile 38. */
+            { 304, 319 }, /* Profile 39. */
+            { 304, 319 }, /* Profile 40. */
+            { 304, 319 }, /* Profile 41. */
+            { 304, 319 }, /* Profile 42. */
+            { 304, 319 }, /* Profile 43. */
+            { 304, 319 }, /* Profile 44. */
+            { 304, 319 }, /* Profile 45. */
         },
         .profile_cnt = 46,
     },
     {
         .name = "INGRESS_QOS_REMARK_CTRL_3_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_INGRESS_QOS_REMARK_CTRL_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { 404, 407 }, /* Profile 2. */
-            { 416, 419 }, /* Profile 3. */
-            { 412, 415 }, /* Profile 4. */
-            { 412, 415 }, /* Profile 5. */
+            { 404, 407 }, /* Profile 3. */
+            { 400, 403 }, /* Profile 4. */
+            { 400, 403 }, /* Profile 5. */
             { 404, 407 }, /* Profile 6. */
-            { 416, 419 }, /* Profile 7. */
-            { 412, 415 }, /* Profile 8. */
-            { 412, 415 }, /* Profile 9. */
+            { 404, 407 }, /* Profile 7. */
+            { 400, 403 }, /* Profile 8. */
+            { 400, 403 }, /* Profile 9. */
             { 400, 403 }, /* Profile 10. */
-            { 412, 415 }, /* Profile 11. */
-            { 408, 411 }, /* Profile 12. */
+            { 400, 403 }, /* Profile 11. */
+            { 396, 399 }, /* Profile 12. */
             { 404, 407 }, /* Profile 13. */
-            { 416, 419 }, /* Profile 14. */
-            { 412, 415 }, /* Profile 15. */
-            { 412, 415 }, /* Profile 16. */
+            { 404, 407 }, /* Profile 14. */
+            { 400, 403 }, /* Profile 15. */
+            { 400, 403 }, /* Profile 16. */
             { 404, 407 }, /* Profile 17. */
-            { 416, 419 }, /* Profile 18. */
-            { 412, 415 }, /* Profile 19. */
-            { 412, 415 }, /* Profile 20. */
+            { 404, 407 }, /* Profile 18. */
+            { 400, 403 }, /* Profile 19. */
+            { 400, 403 }, /* Profile 20. */
             { 400, 403 }, /* Profile 21. */
-            { 412, 415 }, /* Profile 22. */
-            { 408, 411 }, /* Profile 23. */
+            { 400, 403 }, /* Profile 22. */
+            { 396, 399 }, /* Profile 23. */
             { 404, 407 }, /* Profile 24. */
-            { 416, 419 }, /* Profile 25. */
-            { 412, 415 }, /* Profile 26. */
-            { 412, 415 }, /* Profile 27. */
+            { 404, 407 }, /* Profile 25. */
+            { 400, 403 }, /* Profile 26. */
+            { 400, 403 }, /* Profile 27. */
             { 404, 407 }, /* Profile 28. */
-            { 416, 419 }, /* Profile 29. */
-            { 412, 415 }, /* Profile 30. */
-            { 412, 415 }, /* Profile 31. */
+            { 404, 407 }, /* Profile 29. */
+            { 400, 403 }, /* Profile 30. */
+            { 400, 403 }, /* Profile 31. */
             { 400, 403 }, /* Profile 32. */
-            { 412, 415 }, /* Profile 33. */
-            { 408, 411 }, /* Profile 34. */
+            { 400, 403 }, /* Profile 33. */
+            { 396, 399 }, /* Profile 34. */
             { 404, 407 }, /* Profile 35. */
-            { 416, 419 }, /* Profile 36. */
-            { 412, 415 }, /* Profile 37. */
-            { 412, 415 }, /* Profile 38. */
+            { 404, 407 }, /* Profile 36. */
+            { 400, 403 }, /* Profile 37. */
+            { 400, 403 }, /* Profile 38. */
             { 404, 407 }, /* Profile 39. */
-            { 416, 419 }, /* Profile 40. */
-            { 412, 415 }, /* Profile 41. */
-            { 412, 415 }, /* Profile 42. */
+            { 404, 407 }, /* Profile 40. */
+            { 400, 403 }, /* Profile 41. */
+            { 400, 403 }, /* Profile 42. */
             { 400, 403 }, /* Profile 43. */
-            { 412, 415 }, /* Profile 44. */
-            { 408, 411 }, /* Profile 45. */
+            { 400, 403 }, /* Profile 44. */
+            { 396, 399 }, /* Profile 45. */
         },
         .profile_cnt = 46,
     },
     {
         .name = "INT_PRI_3_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_INT_PRI_3_0,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_INT_PRI_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 352, 355 }, /* Profile 2. */
-            { 372, 375 }, /* Profile 3. */
-            { 368, 371 }, /* Profile 4. */
-            { 368, 371 }, /* Profile 5. */
-            { 352, 355 }, /* Profile 6. */
-            { 372, 375 }, /* Profile 7. */
-            { 368, 371 }, /* Profile 8. */
-            { 368, 371 }, /* Profile 9. */
-            { 352, 355 }, /* Profile 10. */
-            { 372, 375 }, /* Profile 11. */
-            { 368, 371 }, /* Profile 12. */
-            { 352, 355 }, /* Profile 13. */
-            { 372, 375 }, /* Profile 14. */
-            { 368, 371 }, /* Profile 15. */
-            { 368, 371 }, /* Profile 16. */
-            { 352, 355 }, /* Profile 17. */
-            { 372, 375 }, /* Profile 18. */
-            { 368, 371 }, /* Profile 19. */
-            { 368, 371 }, /* Profile 20. */
-            { 352, 355 }, /* Profile 21. */
-            { 372, 375 }, /* Profile 22. */
-            { 368, 371 }, /* Profile 23. */
-            { 352, 355 }, /* Profile 24. */
-            { 372, 375 }, /* Profile 25. */
-            { 368, 371 }, /* Profile 26. */
-            { 368, 371 }, /* Profile 27. */
-            { 352, 355 }, /* Profile 28. */
-            { 372, 375 }, /* Profile 29. */
-            { 368, 371 }, /* Profile 30. */
-            { 368, 371 }, /* Profile 31. */
-            { 352, 355 }, /* Profile 32. */
-            { 372, 375 }, /* Profile 33. */
-            { 368, 371 }, /* Profile 34. */
-            { 352, 355 }, /* Profile 35. */
-            { 372, 375 }, /* Profile 36. */
-            { 368, 371 }, /* Profile 37. */
-            { 368, 371 }, /* Profile 38. */
-            { 352, 355 }, /* Profile 39. */
-            { 372, 375 }, /* Profile 40. */
-            { 368, 371 }, /* Profile 41. */
-            { 368, 371 }, /* Profile 42. */
-            { 352, 355 }, /* Profile 43. */
-            { 372, 375 }, /* Profile 44. */
-            { 368, 371 }, /* Profile 45. */
+            { 416, 419 }, /* Profile 2. */
+            { 416, 419 }, /* Profile 3. */
+            { 416, 419 }, /* Profile 4. */
+            { 416, 419 }, /* Profile 5. */
+            { 416, 419 }, /* Profile 6. */
+            { 416, 419 }, /* Profile 7. */
+            { 416, 419 }, /* Profile 8. */
+            { 416, 419 }, /* Profile 9. */
+            { 412, 415 }, /* Profile 10. */
+            { 412, 415 }, /* Profile 11. */
+            { 412, 415 }, /* Profile 12. */
+            { 416, 419 }, /* Profile 13. */
+            { 416, 419 }, /* Profile 14. */
+            { 416, 419 }, /* Profile 15. */
+            { 416, 419 }, /* Profile 16. */
+            { 416, 419 }, /* Profile 17. */
+            { 416, 419 }, /* Profile 18. */
+            { 416, 419 }, /* Profile 19. */
+            { 416, 419 }, /* Profile 20. */
+            { 412, 415 }, /* Profile 21. */
+            { 412, 415 }, /* Profile 22. */
+            { 412, 415 }, /* Profile 23. */
+            { 416, 419 }, /* Profile 24. */
+            { 416, 419 }, /* Profile 25. */
+            { 416, 419 }, /* Profile 26. */
+            { 416, 419 }, /* Profile 27. */
+            { 416, 419 }, /* Profile 28. */
+            { 416, 419 }, /* Profile 29. */
+            { 416, 419 }, /* Profile 30. */
+            { 416, 419 }, /* Profile 31. */
+            { 412, 415 }, /* Profile 32. */
+            { 412, 415 }, /* Profile 33. */
+            { 412, 415 }, /* Profile 34. */
+            { 416, 419 }, /* Profile 35. */
+            { 416, 419 }, /* Profile 36. */
+            { 416, 419 }, /* Profile 37. */
+            { 416, 419 }, /* Profile 38. */
+            { 416, 419 }, /* Profile 39. */
+            { 416, 419 }, /* Profile 40. */
+            { 416, 419 }, /* Profile 41. */
+            { 416, 419 }, /* Profile 42. */
+            { 412, 415 }, /* Profile 43. */
+            { 412, 415 }, /* Profile 44. */
+            { 412, 415 }, /* Profile 45. */
         },
         .profile_cnt = 46,
     },
     {
         .name = "L2_IIF_11_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_L2_IIF_11_0,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_L2_IIF_11_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 240, 251 }, /* Profile 2. */
-            { 240, 251 }, /* Profile 3. */
-            { 272, 283 }, /* Profile 4. */
-            { 272, 283 }, /* Profile 5. */
-            { 240, 251 }, /* Profile 6. */
-            { 240, 251 }, /* Profile 7. */
-            { 272, 283 }, /* Profile 8. */
-            { 272, 283 }, /* Profile 9. */
-            { 240, 251 }, /* Profile 10. */
-            { 240, 251 }, /* Profile 11. */
-            { 272, 283 }, /* Profile 12. */
-            { 240, 251 }, /* Profile 13. */
-            { 240, 251 }, /* Profile 14. */
-            { 272, 283 }, /* Profile 15. */
-            { 272, 283 }, /* Profile 16. */
-            { 240, 251 }, /* Profile 17. */
-            { 240, 251 }, /* Profile 18. */
-            { 272, 283 }, /* Profile 19. */
-            { 272, 283 }, /* Profile 20. */
-            { 240, 251 }, /* Profile 21. */
-            { 240, 251 }, /* Profile 22. */
-            { 272, 283 }, /* Profile 23. */
+            { 336, 347 }, /* Profile 2. */
+            { 336, 347 }, /* Profile 3. */
+            { 336, 347 }, /* Profile 4. */
+            { 336, 347 }, /* Profile 5. */
+            { 336, 347 }, /* Profile 6. */
+            { 336, 347 }, /* Profile 7. */
+            { 336, 347 }, /* Profile 8. */
+            { 336, 347 }, /* Profile 9. */
+            { 336, 347 }, /* Profile 10. */
+            { 336, 347 }, /* Profile 11. */
+            { 336, 347 }, /* Profile 12. */
+            { 336, 347 }, /* Profile 13. */
+            { 336, 347 }, /* Profile 14. */
+            { 336, 347 }, /* Profile 15. */
+            { 336, 347 }, /* Profile 16. */
+            { 336, 347 }, /* Profile 17. */
+            { 336, 347 }, /* Profile 18. */
+            { 336, 347 }, /* Profile 19. */
+            { 336, 347 }, /* Profile 20. */
+            { 336, 347 }, /* Profile 21. */
+            { 336, 347 }, /* Profile 22. */
+            { 336, 347 }, /* Profile 23. */
         },
         .profile_cnt = 24,
     },
     {
         .name = "L2_OIF_11_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_L2_OIF_11_0,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_L2_OIF_11_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -1675,376 +1722,427 @@ static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_flex_field_
     },
     {
         .name = "L3_DNAT_INDEX_15_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_L3_DNAT_INDEX_15_0,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_L3_DNAT_INDEX_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { -1, -1 }, /* Profile 2. */
-            { 272, 287 }, /* Profile 3. */
+            { 240, 255 }, /* Profile 2. */
+            { 240, 255 }, /* Profile 3. */
             { -1, -1 }, /* Profile 4. */
             { -1, -1 }, /* Profile 5. */
-            { -1, -1 }, /* Profile 6. */
-            { 272, 287 }, /* Profile 7. */
+            { 240, 255 }, /* Profile 6. */
+            { 240, 255 }, /* Profile 7. */
             { -1, -1 }, /* Profile 8. */
             { -1, -1 }, /* Profile 9. */
-            { -1, -1 }, /* Profile 10. */
-            { 272, 287 }, /* Profile 11. */
+            { 240, 255 }, /* Profile 10. */
+            { 240, 255 }, /* Profile 11. */
             { -1, -1 }, /* Profile 12. */
-            { -1, -1 }, /* Profile 13. */
-            { 272, 287 }, /* Profile 14. */
+            { 240, 255 }, /* Profile 13. */
+            { 240, 255 }, /* Profile 14. */
             { -1, -1 }, /* Profile 15. */
             { -1, -1 }, /* Profile 16. */
-            { -1, -1 }, /* Profile 17. */
-            { 272, 287 }, /* Profile 18. */
+            { 240, 255 }, /* Profile 17. */
+            { 240, 255 }, /* Profile 18. */
             { -1, -1 }, /* Profile 19. */
             { -1, -1 }, /* Profile 20. */
-            { -1, -1 }, /* Profile 21. */
-            { 272, 287 }, /* Profile 22. */
+            { 240, 255 }, /* Profile 21. */
+            { 240, 255 }, /* Profile 22. */
             { -1, -1 }, /* Profile 23. */
-            { -1, -1 }, /* Profile 24. */
-            { 272, 287 }, /* Profile 25. */
+            { 256, 271 }, /* Profile 24. */
+            { 256, 271 }, /* Profile 25. */
             { -1, -1 }, /* Profile 26. */
             { -1, -1 }, /* Profile 27. */
-            { -1, -1 }, /* Profile 28. */
-            { 272, 287 }, /* Profile 29. */
+            { 256, 271 }, /* Profile 28. */
+            { 256, 271 }, /* Profile 29. */
             { -1, -1 }, /* Profile 30. */
             { -1, -1 }, /* Profile 31. */
-            { -1, -1 }, /* Profile 32. */
-            { 272, 287 }, /* Profile 33. */
+            { 256, 271 }, /* Profile 32. */
+            { 256, 271 }, /* Profile 33. */
             { -1, -1 }, /* Profile 34. */
-            { -1, -1 }, /* Profile 35. */
-            { 272, 287 }, /* Profile 36. */
+            { 256, 271 }, /* Profile 35. */
+            { 256, 271 }, /* Profile 36. */
             { -1, -1 }, /* Profile 37. */
             { -1, -1 }, /* Profile 38. */
-            { -1, -1 }, /* Profile 39. */
-            { 272, 287 }, /* Profile 40. */
+            { 256, 271 }, /* Profile 39. */
+            { 256, 271 }, /* Profile 40. */
             { -1, -1 }, /* Profile 41. */
             { -1, -1 }, /* Profile 42. */
-            { -1, -1 }, /* Profile 43. */
-            { 272, 287 }, /* Profile 44. */
+            { 256, 271 }, /* Profile 43. */
+            { 256, 271 }, /* Profile 44. */
         },
         .profile_cnt = 45,
     },
     {
         .name = "L3_IIF_13_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_L3_IIF_13_0,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_L3_IIF_13_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 208, 221 }, /* Profile 2. */
-            { 208, 221 }, /* Profile 3. */
-            { 240, 253 }, /* Profile 4. */
-            { 240, 253 }, /* Profile 5. */
-            { 208, 221 }, /* Profile 6. */
-            { 208, 221 }, /* Profile 7. */
-            { 240, 253 }, /* Profile 8. */
-            { 240, 253 }, /* Profile 9. */
-            { 208, 221 }, /* Profile 10. */
-            { 208, 221 }, /* Profile 11. */
-            { 240, 253 }, /* Profile 12. */
-            { 208, 221 }, /* Profile 13. */
-            { 208, 221 }, /* Profile 14. */
-            { 240, 253 }, /* Profile 15. */
-            { 240, 253 }, /* Profile 16. */
-            { 208, 221 }, /* Profile 17. */
-            { 208, 221 }, /* Profile 18. */
-            { 240, 253 }, /* Profile 19. */
-            { 240, 253 }, /* Profile 20. */
-            { 208, 221 }, /* Profile 21. */
-            { 208, 221 }, /* Profile 22. */
-            { 240, 253 }, /* Profile 23. */
-            { 224, 237 }, /* Profile 24. */
-            { 224, 237 }, /* Profile 25. */
-            { 256, 269 }, /* Profile 26. */
-            { 256, 269 }, /* Profile 27. */
-            { 224, 237 }, /* Profile 28. */
-            { 224, 237 }, /* Profile 29. */
-            { 256, 269 }, /* Profile 30. */
-            { 256, 269 }, /* Profile 31. */
-            { 224, 237 }, /* Profile 32. */
-            { 224, 237 }, /* Profile 33. */
-            { 256, 269 }, /* Profile 34. */
-            { 224, 237 }, /* Profile 35. */
-            { 224, 237 }, /* Profile 36. */
-            { 256, 269 }, /* Profile 37. */
-            { 256, 269 }, /* Profile 38. */
-            { 224, 237 }, /* Profile 39. */
-            { 224, 237 }, /* Profile 40. */
-            { 256, 269 }, /* Profile 41. */
-            { 256, 269 }, /* Profile 42. */
-            { 224, 237 }, /* Profile 43. */
-            { 224, 237 }, /* Profile 44. */
-            { 256, 269 }, /* Profile 45. */
+            { 320, 333 }, /* Profile 2. */
+            { 320, 333 }, /* Profile 3. */
+            { 320, 333 }, /* Profile 4. */
+            { 320, 333 }, /* Profile 5. */
+            { 320, 333 }, /* Profile 6. */
+            { 320, 333 }, /* Profile 7. */
+            { 320, 333 }, /* Profile 8. */
+            { 320, 333 }, /* Profile 9. */
+            { 320, 333 }, /* Profile 10. */
+            { 320, 333 }, /* Profile 11. */
+            { 320, 333 }, /* Profile 12. */
+            { 320, 333 }, /* Profile 13. */
+            { 320, 333 }, /* Profile 14. */
+            { 320, 333 }, /* Profile 15. */
+            { 320, 333 }, /* Profile 16. */
+            { 320, 333 }, /* Profile 17. */
+            { 320, 333 }, /* Profile 18. */
+            { 320, 333 }, /* Profile 19. */
+            { 320, 333 }, /* Profile 20. */
+            { 320, 333 }, /* Profile 21. */
+            { 320, 333 }, /* Profile 22. */
+            { 320, 333 }, /* Profile 23. */
+            { 336, 349 }, /* Profile 24. */
+            { 336, 349 }, /* Profile 25. */
+            { 336, 349 }, /* Profile 26. */
+            { 336, 349 }, /* Profile 27. */
+            { 336, 349 }, /* Profile 28. */
+            { 336, 349 }, /* Profile 29. */
+            { 336, 349 }, /* Profile 30. */
+            { 336, 349 }, /* Profile 31. */
+            { 336, 349 }, /* Profile 32. */
+            { 336, 349 }, /* Profile 33. */
+            { 336, 349 }, /* Profile 34. */
+            { 336, 349 }, /* Profile 35. */
+            { 336, 349 }, /* Profile 36. */
+            { 336, 349 }, /* Profile 37. */
+            { 336, 349 }, /* Profile 38. */
+            { 336, 349 }, /* Profile 39. */
+            { 336, 349 }, /* Profile 40. */
+            { 336, 349 }, /* Profile 41. */
+            { 336, 349 }, /* Profile 42. */
+            { 336, 349 }, /* Profile 43. */
+            { 336, 349 }, /* Profile 44. */
+            { 336, 349 }, /* Profile 45. */
         },
         .profile_cnt = 46,
     },
     {
         .name = "L3_OIF_1_13_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_L3_OIF_1_13_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 160, 173 }, /* Profile 2. */
-            { 160, 173 }, /* Profile 3. */
-            { 192, 205 }, /* Profile 4. */
-            { 192, 205 }, /* Profile 5. */
-            { 160, 173 }, /* Profile 6. */
-            { 160, 173 }, /* Profile 7. */
-            { 192, 205 }, /* Profile 8. */
-            { 192, 205 }, /* Profile 9. */
-            { 160, 173 }, /* Profile 10. */
-            { 160, 173 }, /* Profile 11. */
-            { 192, 205 }, /* Profile 12. */
-            { 160, 173 }, /* Profile 13. */
-            { 160, 173 }, /* Profile 14. */
-            { 192, 205 }, /* Profile 15. */
-            { 192, 205 }, /* Profile 16. */
-            { 160, 173 }, /* Profile 17. */
-            { 160, 173 }, /* Profile 18. */
-            { 192, 205 }, /* Profile 19. */
-            { 192, 205 }, /* Profile 20. */
-            { 160, 173 }, /* Profile 21. */
-            { 160, 173 }, /* Profile 22. */
-            { 192, 205 }, /* Profile 23. */
-            { 176, 189 }, /* Profile 24. */
-            { 176, 189 }, /* Profile 25. */
-            { 208, 221 }, /* Profile 26. */
-            { 208, 221 }, /* Profile 27. */
-            { 176, 189 }, /* Profile 28. */
-            { 176, 189 }, /* Profile 29. */
-            { 208, 221 }, /* Profile 30. */
-            { 208, 221 }, /* Profile 31. */
-            { 176, 189 }, /* Profile 32. */
-            { 176, 189 }, /* Profile 33. */
-            { 208, 221 }, /* Profile 34. */
-            { 176, 189 }, /* Profile 35. */
-            { 176, 189 }, /* Profile 36. */
-            { 208, 221 }, /* Profile 37. */
-            { 208, 221 }, /* Profile 38. */
-            { 176, 189 }, /* Profile 39. */
-            { 176, 189 }, /* Profile 40. */
-            { 208, 221 }, /* Profile 41. */
-            { 208, 221 }, /* Profile 42. */
-            { 176, 189 }, /* Profile 43. */
-            { 176, 189 }, /* Profile 44. */
-            { 208, 221 }, /* Profile 45. */
+            { 144, 157 }, /* Profile 2. */
+            { 144, 157 }, /* Profile 3. */
+            { 144, 157 }, /* Profile 4. */
+            { 144, 157 }, /* Profile 5. */
+            { 144, 157 }, /* Profile 6. */
+            { 144, 157 }, /* Profile 7. */
+            { 144, 157 }, /* Profile 8. */
+            { 144, 157 }, /* Profile 9. */
+            { 144, 157 }, /* Profile 10. */
+            { 144, 157 }, /* Profile 11. */
+            { 144, 157 }, /* Profile 12. */
+            { 144, 157 }, /* Profile 13. */
+            { 144, 157 }, /* Profile 14. */
+            { 144, 157 }, /* Profile 15. */
+            { 144, 157 }, /* Profile 16. */
+            { 144, 157 }, /* Profile 17. */
+            { 144, 157 }, /* Profile 18. */
+            { 144, 157 }, /* Profile 19. */
+            { 144, 157 }, /* Profile 20. */
+            { 144, 157 }, /* Profile 21. */
+            { 144, 157 }, /* Profile 22. */
+            { 144, 157 }, /* Profile 23. */
+            { 160, 173 }, /* Profile 24. */
+            { 160, 173 }, /* Profile 25. */
+            { 160, 173 }, /* Profile 26. */
+            { 160, 173 }, /* Profile 27. */
+            { 160, 173 }, /* Profile 28. */
+            { 160, 173 }, /* Profile 29. */
+            { 160, 173 }, /* Profile 30. */
+            { 160, 173 }, /* Profile 31. */
+            { 160, 173 }, /* Profile 32. */
+            { 160, 173 }, /* Profile 33. */
+            { 160, 173 }, /* Profile 34. */
+            { 160, 173 }, /* Profile 35. */
+            { 160, 173 }, /* Profile 36. */
+            { 160, 173 }, /* Profile 37. */
+            { 160, 173 }, /* Profile 38. */
+            { 160, 173 }, /* Profile 39. */
+            { 160, 173 }, /* Profile 40. */
+            { 160, 173 }, /* Profile 41. */
+            { 160, 173 }, /* Profile 42. */
+            { 160, 173 }, /* Profile 43. */
+            { 160, 173 }, /* Profile 44. */
+            { 160, 173 }, /* Profile 45. */
         },
         .profile_cnt = 46,
     },
     {
         .name = "L3_SNAT_INDEX_15_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_L3_SNAT_INDEX_15_0,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_L3_SNAT_INDEX_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { -1, -1 }, /* Profile 2. */
-            { 256, 271 }, /* Profile 3. */
+            { 208, 223 }, /* Profile 2. */
+            { 208, 223 }, /* Profile 3. */
             { -1, -1 }, /* Profile 4. */
             { -1, -1 }, /* Profile 5. */
-            { -1, -1 }, /* Profile 6. */
-            { 256, 271 }, /* Profile 7. */
+            { 208, 223 }, /* Profile 6. */
+            { 208, 223 }, /* Profile 7. */
             { -1, -1 }, /* Profile 8. */
             { -1, -1 }, /* Profile 9. */
-            { -1, -1 }, /* Profile 10. */
-            { 256, 271 }, /* Profile 11. */
+            { 208, 223 }, /* Profile 10. */
+            { 208, 223 }, /* Profile 11. */
             { -1, -1 }, /* Profile 12. */
-            { -1, -1 }, /* Profile 13. */
-            { 256, 271 }, /* Profile 14. */
+            { 208, 223 }, /* Profile 13. */
+            { 208, 223 }, /* Profile 14. */
             { -1, -1 }, /* Profile 15. */
             { -1, -1 }, /* Profile 16. */
-            { -1, -1 }, /* Profile 17. */
-            { 256, 271 }, /* Profile 18. */
+            { 208, 223 }, /* Profile 17. */
+            { 208, 223 }, /* Profile 18. */
             { -1, -1 }, /* Profile 19. */
             { -1, -1 }, /* Profile 20. */
-            { -1, -1 }, /* Profile 21. */
-            { 256, 271 }, /* Profile 22. */
+            { 208, 223 }, /* Profile 21. */
+            { 208, 223 }, /* Profile 22. */
             { -1, -1 }, /* Profile 23. */
-            { -1, -1 }, /* Profile 24. */
-            { 256, 271 }, /* Profile 25. */
+            { 224, 239 }, /* Profile 24. */
+            { 224, 239 }, /* Profile 25. */
             { -1, -1 }, /* Profile 26. */
             { -1, -1 }, /* Profile 27. */
-            { -1, -1 }, /* Profile 28. */
-            { 256, 271 }, /* Profile 29. */
+            { 224, 239 }, /* Profile 28. */
+            { 224, 239 }, /* Profile 29. */
             { -1, -1 }, /* Profile 30. */
             { -1, -1 }, /* Profile 31. */
-            { -1, -1 }, /* Profile 32. */
-            { 256, 271 }, /* Profile 33. */
+            { 224, 239 }, /* Profile 32. */
+            { 224, 239 }, /* Profile 33. */
             { -1, -1 }, /* Profile 34. */
-            { -1, -1 }, /* Profile 35. */
-            { 256, 271 }, /* Profile 36. */
+            { 224, 239 }, /* Profile 35. */
+            { 224, 239 }, /* Profile 36. */
             { -1, -1 }, /* Profile 37. */
             { -1, -1 }, /* Profile 38. */
-            { -1, -1 }, /* Profile 39. */
-            { 256, 271 }, /* Profile 40. */
+            { 224, 239 }, /* Profile 39. */
+            { 224, 239 }, /* Profile 40. */
             { -1, -1 }, /* Profile 41. */
             { -1, -1 }, /* Profile 42. */
-            { -1, -1 }, /* Profile 43. */
-            { 256, 271 }, /* Profile 44. */
+            { 224, 239 }, /* Profile 43. */
+            { 224, 239 }, /* Profile 44. */
         },
         .profile_cnt = 45,
     },
     {
-        .name = "MPLS_LABEL_DECAP_COUNT_3_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_MPLS_LABEL_DECAP_COUNT_3_0,
+        .name = "MAC_DA_23_20_3_0",
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_MAC_DA_23_20_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 408, 411 }, /* Profile 2. */
-            { 420, 423 }, /* Profile 3. */
-            { 416, 419 }, /* Profile 4. */
-            { 416, 419 }, /* Profile 5. */
-            { 408, 411 }, /* Profile 6. */
-            { 420, 423 }, /* Profile 7. */
-            { 416, 419 }, /* Profile 8. */
-            { 416, 419 }, /* Profile 9. */
-            { 404, 407 }, /* Profile 10. */
-            { 416, 419 }, /* Profile 11. */
-            { 412, 415 }, /* Profile 12. */
-            { 408, 411 }, /* Profile 13. */
-            { 420, 423 }, /* Profile 14. */
-            { 416, 419 }, /* Profile 15. */
-            { 416, 419 }, /* Profile 16. */
-            { 408, 411 }, /* Profile 17. */
-            { 420, 423 }, /* Profile 18. */
-            { 416, 419 }, /* Profile 19. */
-            { 416, 419 }, /* Profile 20. */
-            { 404, 407 }, /* Profile 21. */
-            { 416, 419 }, /* Profile 22. */
-            { 412, 415 }, /* Profile 23. */
-            { 408, 411 }, /* Profile 24. */
-            { 420, 423 }, /* Profile 25. */
-            { 416, 419 }, /* Profile 26. */
-            { 416, 419 }, /* Profile 27. */
-            { 408, 411 }, /* Profile 28. */
-            { 420, 423 }, /* Profile 29. */
-            { 416, 419 }, /* Profile 30. */
-            { 416, 419 }, /* Profile 31. */
-            { 404, 407 }, /* Profile 32. */
-            { 416, 419 }, /* Profile 33. */
-            { 412, 415 }, /* Profile 34. */
-            { 408, 411 }, /* Profile 35. */
-            { 420, 423 }, /* Profile 36. */
-            { 416, 419 }, /* Profile 37. */
-            { 416, 419 }, /* Profile 38. */
-            { 408, 411 }, /* Profile 39. */
-            { 420, 423 }, /* Profile 40. */
-            { 416, 419 }, /* Profile 41. */
-            { 416, 419 }, /* Profile 42. */
-            { 404, 407 }, /* Profile 43. */
-            { 416, 419 }, /* Profile 44. */
-            { 412, 415 }, /* Profile 45. */
+            { 384, 387 }, /* Profile 2. */
+            { -1, -1 }, /* Profile 3. */
+            { -1, -1 }, /* Profile 4. */
+            { -1, -1 }, /* Profile 5. */
+            { 384, 387 }, /* Profile 6. */
+            { -1, -1 }, /* Profile 7. */
+            { -1, -1 }, /* Profile 8. */
+            { -1, -1 }, /* Profile 9. */
+            { 380, 383 }, /* Profile 10. */
+            { -1, -1 }, /* Profile 11. */
+            { -1, -1 }, /* Profile 12. */
+            { 384, 387 }, /* Profile 13. */
+            { -1, -1 }, /* Profile 14. */
+            { -1, -1 }, /* Profile 15. */
+            { -1, -1 }, /* Profile 16. */
+            { 384, 387 }, /* Profile 17. */
+            { -1, -1 }, /* Profile 18. */
+            { -1, -1 }, /* Profile 19. */
+            { -1, -1 }, /* Profile 20. */
+            { 380, 383 }, /* Profile 21. */
+            { -1, -1 }, /* Profile 22. */
+            { -1, -1 }, /* Profile 23. */
+            { 384, 387 }, /* Profile 24. */
+            { -1, -1 }, /* Profile 25. */
+            { -1, -1 }, /* Profile 26. */
+            { -1, -1 }, /* Profile 27. */
+            { 384, 387 }, /* Profile 28. */
+            { -1, -1 }, /* Profile 29. */
+            { -1, -1 }, /* Profile 30. */
+            { -1, -1 }, /* Profile 31. */
+            { 380, 383 }, /* Profile 32. */
+            { -1, -1 }, /* Profile 33. */
+            { -1, -1 }, /* Profile 34. */
+            { 384, 387 }, /* Profile 35. */
+            { -1, -1 }, /* Profile 36. */
+            { -1, -1 }, /* Profile 37. */
+            { -1, -1 }, /* Profile 38. */
+            { 384, 387 }, /* Profile 39. */
+            { -1, -1 }, /* Profile 40. */
+            { -1, -1 }, /* Profile 41. */
+            { -1, -1 }, /* Profile 42. */
+            { 380, 383 }, /* Profile 43. */
+        },
+        .profile_cnt = 44,
+    },
+    {
+        .name = "MPLS_LABEL_DECAP_COUNT_3_0",
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_MPLS_LABEL_DECAP_COUNT_3_0,
+        .profile = {
+            { -1, -1 }, /* Profile 0. */
+            { -1, -1 }, /* Profile 1. */
+            { 396, 399 }, /* Profile 2. */
+            { 396, 399 }, /* Profile 3. */
+            { 392, 395 }, /* Profile 4. */
+            { 392, 395 }, /* Profile 5. */
+            { 396, 399 }, /* Profile 6. */
+            { 396, 399 }, /* Profile 7. */
+            { 392, 395 }, /* Profile 8. */
+            { 392, 395 }, /* Profile 9. */
+            { 392, 395 }, /* Profile 10. */
+            { 392, 395 }, /* Profile 11. */
+            { 388, 391 }, /* Profile 12. */
+            { 396, 399 }, /* Profile 13. */
+            { 396, 399 }, /* Profile 14. */
+            { 392, 395 }, /* Profile 15. */
+            { 392, 395 }, /* Profile 16. */
+            { 396, 399 }, /* Profile 17. */
+            { 396, 399 }, /* Profile 18. */
+            { 392, 395 }, /* Profile 19. */
+            { 392, 395 }, /* Profile 20. */
+            { 392, 395 }, /* Profile 21. */
+            { 392, 395 }, /* Profile 22. */
+            { 388, 391 }, /* Profile 23. */
+            { 396, 399 }, /* Profile 24. */
+            { 396, 399 }, /* Profile 25. */
+            { 392, 395 }, /* Profile 26. */
+            { 392, 395 }, /* Profile 27. */
+            { 396, 399 }, /* Profile 28. */
+            { 396, 399 }, /* Profile 29. */
+            { 392, 395 }, /* Profile 30. */
+            { 392, 395 }, /* Profile 31. */
+            { 392, 395 }, /* Profile 32. */
+            { 392, 395 }, /* Profile 33. */
+            { 388, 391 }, /* Profile 34. */
+            { 396, 399 }, /* Profile 35. */
+            { 396, 399 }, /* Profile 36. */
+            { 392, 395 }, /* Profile 37. */
+            { 392, 395 }, /* Profile 38. */
+            { 396, 399 }, /* Profile 39. */
+            { 396, 399 }, /* Profile 40. */
+            { 392, 395 }, /* Profile 41. */
+            { 392, 395 }, /* Profile 42. */
+            { 392, 395 }, /* Profile 43. */
+            { 392, 395 }, /* Profile 44. */
+            { 388, 391 }, /* Profile 45. */
         },
         .profile_cnt = 46,
     },
     {
         .name = "NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_NHOP_2_OR_ECMP_GROUP_INDEX_1_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 256, 271 }, /* Profile 2. */
-            { 288, 303 }, /* Profile 3. */
-            { 288, 303 }, /* Profile 4. */
-            { 288, 303 }, /* Profile 5. */
-            { 256, 271 }, /* Profile 6. */
-            { 288, 303 }, /* Profile 7. */
-            { 288, 303 }, /* Profile 8. */
-            { 288, 303 }, /* Profile 9. */
-            { 256, 271 }, /* Profile 10. */
-            { 288, 303 }, /* Profile 11. */
-            { 288, 303 }, /* Profile 12. */
-            { 256, 271 }, /* Profile 13. */
-            { 288, 303 }, /* Profile 14. */
-            { 288, 303 }, /* Profile 15. */
-            { 288, 303 }, /* Profile 16. */
-            { 256, 271 }, /* Profile 17. */
-            { 288, 303 }, /* Profile 18. */
-            { 288, 303 }, /* Profile 19. */
-            { 288, 303 }, /* Profile 20. */
-            { 256, 271 }, /* Profile 21. */
-            { 288, 303 }, /* Profile 22. */
-            { 288, 303 }, /* Profile 23. */
-            { 256, 271 }, /* Profile 24. */
-            { 288, 303 }, /* Profile 25. */
-            { 288, 303 }, /* Profile 26. */
-            { 288, 303 }, /* Profile 27. */
-            { 256, 271 }, /* Profile 28. */
-            { 288, 303 }, /* Profile 29. */
-            { 288, 303 }, /* Profile 30. */
-            { 288, 303 }, /* Profile 31. */
-            { 256, 271 }, /* Profile 32. */
-            { 288, 303 }, /* Profile 33. */
-            { 288, 303 }, /* Profile 34. */
-            { 256, 271 }, /* Profile 35. */
-            { 288, 303 }, /* Profile 36. */
-            { 288, 303 }, /* Profile 37. */
-            { 288, 303 }, /* Profile 38. */
-            { 256, 271 }, /* Profile 39. */
-            { 288, 303 }, /* Profile 40. */
-            { 288, 303 }, /* Profile 41. */
-            { 288, 303 }, /* Profile 42. */
-            { 256, 271 }, /* Profile 43. */
-            { 288, 303 }, /* Profile 44. */
-            { 288, 303 }, /* Profile 45. */
+            { 192, 207 }, /* Profile 2. */
+            { 192, 207 }, /* Profile 3. */
+            { 192, 207 }, /* Profile 4. */
+            { 192, 207 }, /* Profile 5. */
+            { 192, 207 }, /* Profile 6. */
+            { 192, 207 }, /* Profile 7. */
+            { 192, 207 }, /* Profile 8. */
+            { 192, 207 }, /* Profile 9. */
+            { 192, 207 }, /* Profile 10. */
+            { 192, 207 }, /* Profile 11. */
+            { 192, 207 }, /* Profile 12. */
+            { 192, 207 }, /* Profile 13. */
+            { 192, 207 }, /* Profile 14. */
+            { 192, 207 }, /* Profile 15. */
+            { 192, 207 }, /* Profile 16. */
+            { 192, 207 }, /* Profile 17. */
+            { 192, 207 }, /* Profile 18. */
+            { 192, 207 }, /* Profile 19. */
+            { 192, 207 }, /* Profile 20. */
+            { 192, 207 }, /* Profile 21. */
+            { 192, 207 }, /* Profile 22. */
+            { 192, 207 }, /* Profile 23. */
+            { 208, 223 }, /* Profile 24. */
+            { 208, 223 }, /* Profile 25. */
+            { 208, 223 }, /* Profile 26. */
+            { 208, 223 }, /* Profile 27. */
+            { 208, 223 }, /* Profile 28. */
+            { 208, 223 }, /* Profile 29. */
+            { 208, 223 }, /* Profile 30. */
+            { 208, 223 }, /* Profile 31. */
+            { 208, 223 }, /* Profile 32. */
+            { 208, 223 }, /* Profile 33. */
+            { 208, 223 }, /* Profile 34. */
+            { 208, 223 }, /* Profile 35. */
+            { 208, 223 }, /* Profile 36. */
+            { 208, 223 }, /* Profile 37. */
+            { 208, 223 }, /* Profile 38. */
+            { 208, 223 }, /* Profile 39. */
+            { 208, 223 }, /* Profile 40. */
+            { 208, 223 }, /* Profile 41. */
+            { 208, 223 }, /* Profile 42. */
+            { 208, 223 }, /* Profile 43. */
+            { 208, 223 }, /* Profile 44. */
+            { 208, 223 }, /* Profile 45. */
         },
         .profile_cnt = 46,
     },
     {
         .name = "NHOP_INDEX_1_15_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_15_0,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_NHOP_INDEX_1_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 304, 319 }, /* Profile 2. */
-            { 336, 351 }, /* Profile 3. */
-            { 336, 351 }, /* Profile 4. */
-            { 336, 351 }, /* Profile 5. */
-            { 304, 319 }, /* Profile 6. */
-            { 336, 351 }, /* Profile 7. */
-            { 336, 351 }, /* Profile 8. */
-            { 336, 351 }, /* Profile 9. */
-            { 304, 319 }, /* Profile 10. */
-            { 336, 351 }, /* Profile 11. */
-            { 336, 351 }, /* Profile 12. */
-            { 304, 319 }, /* Profile 13. */
-            { 336, 351 }, /* Profile 14. */
-            { 336, 351 }, /* Profile 15. */
-            { 336, 351 }, /* Profile 16. */
-            { 304, 319 }, /* Profile 17. */
-            { 336, 351 }, /* Profile 18. */
-            { 336, 351 }, /* Profile 19. */
-            { 336, 351 }, /* Profile 20. */
-            { 304, 319 }, /* Profile 21. */
-            { 336, 351 }, /* Profile 22. */
-            { 336, 351 }, /* Profile 23. */
-            { 304, 319 }, /* Profile 24. */
-            { 336, 351 }, /* Profile 25. */
-            { 336, 351 }, /* Profile 26. */
-            { 336, 351 }, /* Profile 27. */
-            { 304, 319 }, /* Profile 28. */
-            { 336, 351 }, /* Profile 29. */
-            { 336, 351 }, /* Profile 30. */
-            { 336, 351 }, /* Profile 31. */
-            { 304, 319 }, /* Profile 32. */
-            { 336, 351 }, /* Profile 33. */
-            { 336, 351 }, /* Profile 34. */
-            { 304, 319 }, /* Profile 35. */
-            { 336, 351 }, /* Profile 36. */
-            { 336, 351 }, /* Profile 37. */
-            { 336, 351 }, /* Profile 38. */
-            { 304, 319 }, /* Profile 39. */
-            { 336, 351 }, /* Profile 40. */
-            { 336, 351 }, /* Profile 41. */
-            { 336, 351 }, /* Profile 42. */
-            { 304, 319 }, /* Profile 43. */
-            { 336, 351 }, /* Profile 44. */
-            { 336, 351 }, /* Profile 45. */
+            { 224, 239 }, /* Profile 2. */
+            { 224, 239 }, /* Profile 3. */
+            { 240, 255 }, /* Profile 4. */
+            { 240, 255 }, /* Profile 5. */
+            { 224, 239 }, /* Profile 6. */
+            { 224, 239 }, /* Profile 7. */
+            { 240, 255 }, /* Profile 8. */
+            { 240, 255 }, /* Profile 9. */
+            { 224, 239 }, /* Profile 10. */
+            { 224, 239 }, /* Profile 11. */
+            { 240, 255 }, /* Profile 12. */
+            { 224, 239 }, /* Profile 13. */
+            { 224, 239 }, /* Profile 14. */
+            { 240, 255 }, /* Profile 15. */
+            { 240, 255 }, /* Profile 16. */
+            { 224, 239 }, /* Profile 17. */
+            { 224, 239 }, /* Profile 18. */
+            { 240, 255 }, /* Profile 19. */
+            { 240, 255 }, /* Profile 20. */
+            { 224, 239 }, /* Profile 21. */
+            { 224, 239 }, /* Profile 22. */
+            { 240, 255 }, /* Profile 23. */
+            { 240, 255 }, /* Profile 24. */
+            { 240, 255 }, /* Profile 25. */
+            { 256, 271 }, /* Profile 26. */
+            { 256, 271 }, /* Profile 27. */
+            { 240, 255 }, /* Profile 28. */
+            { 240, 255 }, /* Profile 29. */
+            { 256, 271 }, /* Profile 30. */
+            { 256, 271 }, /* Profile 31. */
+            { 240, 255 }, /* Profile 32. */
+            { 240, 255 }, /* Profile 33. */
+            { 256, 271 }, /* Profile 34. */
+            { 240, 255 }, /* Profile 35. */
+            { 240, 255 }, /* Profile 36. */
+            { 256, 271 }, /* Profile 37. */
+            { 256, 271 }, /* Profile 38. */
+            { 240, 255 }, /* Profile 39. */
+            { 240, 255 }, /* Profile 40. */
+            { 256, 271 }, /* Profile 41. */
+            { 256, 271 }, /* Profile 42. */
+            { 240, 255 }, /* Profile 43. */
+            { 240, 255 }, /* Profile 44. */
+            { 256, 271 }, /* Profile 45. */
         },
         .profile_cnt = 46,
     },
     {
         .name = "PARSER_VHLEN_0_15_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_PARSER_VHLEN_0_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -2097,423 +2195,166 @@ static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_flex_field_
     },
     {
         .name = "PKT_MISC_CTRL_0_3_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_PKT_MISC_CTRL_0_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 400, 403 }, /* Profile 2. */
-            { 412, 415 }, /* Profile 3. */
-            { 408, 411 }, /* Profile 4. */
-            { 408, 411 }, /* Profile 5. */
-            { 400, 403 }, /* Profile 6. */
-            { 412, 415 }, /* Profile 7. */
-            { 408, 411 }, /* Profile 8. */
-            { 408, 411 }, /* Profile 9. */
-            { 396, 399 }, /* Profile 10. */
-            { 408, 411 }, /* Profile 11. */
-            { 404, 407 }, /* Profile 12. */
-            { 400, 403 }, /* Profile 13. */
-            { 412, 415 }, /* Profile 14. */
-            { 408, 411 }, /* Profile 15. */
-            { 408, 411 }, /* Profile 16. */
-            { 400, 403 }, /* Profile 17. */
-            { 412, 415 }, /* Profile 18. */
-            { 408, 411 }, /* Profile 19. */
-            { 408, 411 }, /* Profile 20. */
-            { 396, 399 }, /* Profile 21. */
-            { 408, 411 }, /* Profile 22. */
-            { 404, 407 }, /* Profile 23. */
-            { 400, 403 }, /* Profile 24. */
-            { 412, 415 }, /* Profile 25. */
-            { 408, 411 }, /* Profile 26. */
-            { 408, 411 }, /* Profile 27. */
-            { 400, 403 }, /* Profile 28. */
-            { 412, 415 }, /* Profile 29. */
-            { 408, 411 }, /* Profile 30. */
-            { 408, 411 }, /* Profile 31. */
-            { 396, 399 }, /* Profile 32. */
-            { 408, 411 }, /* Profile 33. */
-            { 404, 407 }, /* Profile 34. */
-            { 400, 403 }, /* Profile 35. */
-            { 412, 415 }, /* Profile 36. */
-            { 408, 411 }, /* Profile 37. */
-            { 408, 411 }, /* Profile 38. */
-            { 400, 403 }, /* Profile 39. */
-            { 412, 415 }, /* Profile 40. */
-            { 408, 411 }, /* Profile 41. */
-            { 408, 411 }, /* Profile 42. */
-            { 396, 399 }, /* Profile 43. */
-            { 408, 411 }, /* Profile 44. */
-            { 404, 407 }, /* Profile 45. */
+            { 388, 391 }, /* Profile 2. */
+            { 388, 391 }, /* Profile 3. */
+            { 384, 387 }, /* Profile 4. */
+            { 384, 387 }, /* Profile 5. */
+            { 388, 391 }, /* Profile 6. */
+            { 388, 391 }, /* Profile 7. */
+            { 384, 387 }, /* Profile 8. */
+            { 384, 387 }, /* Profile 9. */
+            { 384, 387 }, /* Profile 10. */
+            { 384, 387 }, /* Profile 11. */
+            { 380, 383 }, /* Profile 12. */
+            { 388, 391 }, /* Profile 13. */
+            { 388, 391 }, /* Profile 14. */
+            { 384, 387 }, /* Profile 15. */
+            { 384, 387 }, /* Profile 16. */
+            { 388, 391 }, /* Profile 17. */
+            { 388, 391 }, /* Profile 18. */
+            { 384, 387 }, /* Profile 19. */
+            { 384, 387 }, /* Profile 20. */
+            { 384, 387 }, /* Profile 21. */
+            { 384, 387 }, /* Profile 22. */
+            { 380, 383 }, /* Profile 23. */
+            { 388, 391 }, /* Profile 24. */
+            { 388, 391 }, /* Profile 25. */
+            { 384, 387 }, /* Profile 26. */
+            { 384, 387 }, /* Profile 27. */
+            { 388, 391 }, /* Profile 28. */
+            { 388, 391 }, /* Profile 29. */
+            { 384, 387 }, /* Profile 30. */
+            { 384, 387 }, /* Profile 31. */
+            { 384, 387 }, /* Profile 32. */
+            { 384, 387 }, /* Profile 33. */
+            { 380, 383 }, /* Profile 34. */
+            { 388, 391 }, /* Profile 35. */
+            { 388, 391 }, /* Profile 36. */
+            { 384, 387 }, /* Profile 37. */
+            { 384, 387 }, /* Profile 38. */
+            { 388, 391 }, /* Profile 39. */
+            { 388, 391 }, /* Profile 40. */
+            { 384, 387 }, /* Profile 41. */
+            { 384, 387 }, /* Profile 42. */
+            { 384, 387 }, /* Profile 43. */
+            { 384, 387 }, /* Profile 44. */
+            { 380, 383 }, /* Profile 45. */
         },
         .profile_cnt = 46,
     },
-    {
-        .name = "SRV6_EDIT_AND_SL_UPDATE_CTRL_3_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_SRV6_EDIT_AND_SL_UPDATE_CTRL_3_0,
-        .profile = {
-            { -1, -1 }, /* Profile 0. */
-            { -1, -1 }, /* Profile 1. */
-            { 356, 359 }, /* Profile 2. */
-            { -1, -1 }, /* Profile 3. */
-            { -1, -1 }, /* Profile 4. */
-            { -1, -1 }, /* Profile 5. */
-            { 356, 359 }, /* Profile 6. */
-            { -1, -1 }, /* Profile 7. */
-            { -1, -1 }, /* Profile 8. */
-            { -1, -1 }, /* Profile 9. */
-            { 356, 359 }, /* Profile 10. */
-            { -1, -1 }, /* Profile 11. */
-            { -1, -1 }, /* Profile 12. */
-            { 356, 359 }, /* Profile 13. */
-            { -1, -1 }, /* Profile 14. */
-            { -1, -1 }, /* Profile 15. */
-            { -1, -1 }, /* Profile 16. */
-            { 356, 359 }, /* Profile 17. */
-            { -1, -1 }, /* Profile 18. */
-            { -1, -1 }, /* Profile 19. */
-            { -1, -1 }, /* Profile 20. */
-            { 356, 359 }, /* Profile 21. */
-            { -1, -1 }, /* Profile 22. */
-            { -1, -1 }, /* Profile 23. */
-            { 356, 359 }, /* Profile 24. */
-            { -1, -1 }, /* Profile 25. */
-            { -1, -1 }, /* Profile 26. */
-            { -1, -1 }, /* Profile 27. */
-            { 356, 359 }, /* Profile 28. */
-            { -1, -1 }, /* Profile 29. */
-            { -1, -1 }, /* Profile 30. */
-            { -1, -1 }, /* Profile 31. */
-            { 356, 359 }, /* Profile 32. */
-            { -1, -1 }, /* Profile 33. */
-            { -1, -1 }, /* Profile 34. */
-            { 356, 359 }, /* Profile 35. */
-            { -1, -1 }, /* Profile 36. */
-            { -1, -1 }, /* Profile 37. */
-            { -1, -1 }, /* Profile 38. */
-            { 356, 359 }, /* Profile 39. */
-            { -1, -1 }, /* Profile 40. */
-            { -1, -1 }, /* Profile 41. */
-            { -1, -1 }, /* Profile 42. */
-            { 356, 359 }, /* Profile 43. */
-        },
-        .profile_cnt = 44,
-    },
-    {
-        .name = "SRV6_NEW_GSID_SI_2_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_SRV6_NEW_GSID_SI_2_0,
-        .profile = {
-            { -1, -1 }, /* Profile 0. */
-            { -1, -1 }, /* Profile 1. */
-            { 412, 414 }, /* Profile 2. */
-            { -1, -1 }, /* Profile 3. */
-            { -1, -1 }, /* Profile 4. */
-            { -1, -1 }, /* Profile 5. */
-            { 412, 414 }, /* Profile 6. */
-            { -1, -1 }, /* Profile 7. */
-            { -1, -1 }, /* Profile 8. */
-            { -1, -1 }, /* Profile 9. */
-            { 408, 410 }, /* Profile 10. */
-            { -1, -1 }, /* Profile 11. */
-            { -1, -1 }, /* Profile 12. */
-            { 412, 414 }, /* Profile 13. */
-            { -1, -1 }, /* Profile 14. */
-            { -1, -1 }, /* Profile 15. */
-            { -1, -1 }, /* Profile 16. */
-            { 412, 414 }, /* Profile 17. */
-            { -1, -1 }, /* Profile 18. */
-            { -1, -1 }, /* Profile 19. */
-            { -1, -1 }, /* Profile 20. */
-            { 408, 410 }, /* Profile 21. */
-            { -1, -1 }, /* Profile 22. */
-            { -1, -1 }, /* Profile 23. */
-            { 412, 414 }, /* Profile 24. */
-            { -1, -1 }, /* Profile 25. */
-            { -1, -1 }, /* Profile 26. */
-            { -1, -1 }, /* Profile 27. */
-            { 412, 414 }, /* Profile 28. */
-            { -1, -1 }, /* Profile 29. */
-            { -1, -1 }, /* Profile 30. */
-            { -1, -1 }, /* Profile 31. */
-            { 408, 410 }, /* Profile 32. */
-            { -1, -1 }, /* Profile 33. */
-            { -1, -1 }, /* Profile 34. */
-            { 412, 414 }, /* Profile 35. */
-            { -1, -1 }, /* Profile 36. */
-            { -1, -1 }, /* Profile 37. */
-            { -1, -1 }, /* Profile 38. */
-            { 412, 414 }, /* Profile 39. */
-            { -1, -1 }, /* Profile 40. */
-            { -1, -1 }, /* Profile 41. */
-            { -1, -1 }, /* Profile 42. */
-            { 408, 410 }, /* Profile 43. */
-        },
-        .profile_cnt = 44,
-    },
-    {
-        .name = "SRV6_SID_AND_PREFIX_LEN_ENC_3_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_SRV6_SID_AND_PREFIX_LEN_ENC_3_0,
-        .profile = {
-            { -1, -1 }, /* Profile 0. */
-            { -1, -1 }, /* Profile 1. */
-            { 364, 367 }, /* Profile 2. */
-            { -1, -1 }, /* Profile 3. */
-            { -1, -1 }, /* Profile 4. */
-            { -1, -1 }, /* Profile 5. */
-            { 364, 367 }, /* Profile 6. */
-            { -1, -1 }, /* Profile 7. */
-            { -1, -1 }, /* Profile 8. */
-            { -1, -1 }, /* Profile 9. */
-            { 364, 367 }, /* Profile 10. */
-            { -1, -1 }, /* Profile 11. */
-            { -1, -1 }, /* Profile 12. */
-            { 364, 367 }, /* Profile 13. */
-            { -1, -1 }, /* Profile 14. */
-            { -1, -1 }, /* Profile 15. */
-            { -1, -1 }, /* Profile 16. */
-            { 364, 367 }, /* Profile 17. */
-            { -1, -1 }, /* Profile 18. */
-            { -1, -1 }, /* Profile 19. */
-            { -1, -1 }, /* Profile 20. */
-            { 364, 367 }, /* Profile 21. */
-            { -1, -1 }, /* Profile 22. */
-            { -1, -1 }, /* Profile 23. */
-            { 364, 367 }, /* Profile 24. */
-            { -1, -1 }, /* Profile 25. */
-            { -1, -1 }, /* Profile 26. */
-            { -1, -1 }, /* Profile 27. */
-            { 364, 367 }, /* Profile 28. */
-            { -1, -1 }, /* Profile 29. */
-            { -1, -1 }, /* Profile 30. */
-            { -1, -1 }, /* Profile 31. */
-            { 364, 367 }, /* Profile 32. */
-            { -1, -1 }, /* Profile 33. */
-            { -1, -1 }, /* Profile 34. */
-            { 364, 367 }, /* Profile 35. */
-            { -1, -1 }, /* Profile 36. */
-            { -1, -1 }, /* Profile 37. */
-            { -1, -1 }, /* Profile 38. */
-            { 364, 367 }, /* Profile 39. */
-            { -1, -1 }, /* Profile 40. */
-            { -1, -1 }, /* Profile 41. */
-            { -1, -1 }, /* Profile 42. */
-            { 364, 367 }, /* Profile 43. */
-        },
-        .profile_cnt = 44,
-    },
-    {
-        .name = "SRV6_TUNNEL_NEXT_SID_SELECT_3_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_SRV6_TUNNEL_NEXT_SID_SELECT_3_0,
-        .profile = {
-            { -1, -1 }, /* Profile 0. */
-            { -1, -1 }, /* Profile 1. */
-            { 416, 419 }, /* Profile 2. */
-            { -1, -1 }, /* Profile 3. */
-            { -1, -1 }, /* Profile 4. */
-            { -1, -1 }, /* Profile 5. */
-            { 416, 419 }, /* Profile 6. */
-            { -1, -1 }, /* Profile 7. */
-            { -1, -1 }, /* Profile 8. */
-            { -1, -1 }, /* Profile 9. */
-            { 412, 415 }, /* Profile 10. */
-            { -1, -1 }, /* Profile 11. */
-            { -1, -1 }, /* Profile 12. */
-            { 416, 419 }, /* Profile 13. */
-            { -1, -1 }, /* Profile 14. */
-            { -1, -1 }, /* Profile 15. */
-            { -1, -1 }, /* Profile 16. */
-            { 416, 419 }, /* Profile 17. */
-            { -1, -1 }, /* Profile 18. */
-            { -1, -1 }, /* Profile 19. */
-            { -1, -1 }, /* Profile 20. */
-            { 412, 415 }, /* Profile 21. */
-            { -1, -1 }, /* Profile 22. */
-            { -1, -1 }, /* Profile 23. */
-            { 416, 419 }, /* Profile 24. */
-            { -1, -1 }, /* Profile 25. */
-            { -1, -1 }, /* Profile 26. */
-            { -1, -1 }, /* Profile 27. */
-            { 416, 419 }, /* Profile 28. */
-            { -1, -1 }, /* Profile 29. */
-            { -1, -1 }, /* Profile 30. */
-            { -1, -1 }, /* Profile 31. */
-            { 412, 415 }, /* Profile 32. */
-            { -1, -1 }, /* Profile 33. */
-            { -1, -1 }, /* Profile 34. */
-            { 416, 419 }, /* Profile 35. */
-            { -1, -1 }, /* Profile 36. */
-            { -1, -1 }, /* Profile 37. */
-            { -1, -1 }, /* Profile 38. */
-            { 416, 419 }, /* Profile 39. */
-            { -1, -1 }, /* Profile 40. */
-            { -1, -1 }, /* Profile 41. */
-            { -1, -1 }, /* Profile 42. */
-            { 412, 415 }, /* Profile 43. */
-        },
-        .profile_cnt = 44,
-    },
     {
         .name = "SVP_15_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_SVP_15_0,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_SVP_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 320, 335 }, /* Profile 2. */
-            { 352, 367 }, /* Profile 3. */
-            { 352, 367 }, /* Profile 4. */
-            { 352, 367 }, /* Profile 5. */
-            { 320, 335 }, /* Profile 6. */
-            { 352, 367 }, /* Profile 7. */
-            { 352, 367 }, /* Profile 8. */
-            { 352, 367 }, /* Profile 9. */
-            { 320, 335 }, /* Profile 10. */
-            { 352, 367 }, /* Profile 11. */
-            { 352, 367 }, /* Profile 12. */
-            { 320, 335 }, /* Profile 13. */
-            { 352, 367 }, /* Profile 14. */
-            { 352, 367 }, /* Profile 15. */
-            { 352, 367 }, /* Profile 16. */
-            { 320, 335 }, /* Profile 17. */
-            { 352, 367 }, /* Profile 18. */
-            { 352, 367 }, /* Profile 19. */
-            { 352, 367 }, /* Profile 20. */
-            { 320, 335 }, /* Profile 21. */
-            { 352, 367 }, /* Profile 22. */
-            { 352, 367 }, /* Profile 23. */
+            { 304, 319 }, /* Profile 2. */
+            { 304, 319 }, /* Profile 3. */
+            { 304, 319 }, /* Profile 4. */
+            { 304, 319 }, /* Profile 5. */
+            { 304, 319 }, /* Profile 6. */
+            { 304, 319 }, /* Profile 7. */
+            { 304, 319 }, /* Profile 8. */
+            { 304, 319 }, /* Profile 9. */
+            { 304, 319 }, /* Profile 10. */
+            { 304, 319 }, /* Profile 11. */
+            { 304, 319 }, /* Profile 12. */
+            { 304, 319 }, /* Profile 13. */
+            { 304, 319 }, /* Profile 14. */
+            { 304, 319 }, /* Profile 15. */
+            { 304, 319 }, /* Profile 16. */
+            { 304, 319 }, /* Profile 17. */
+            { 304, 319 }, /* Profile 18. */
+            { 304, 319 }, /* Profile 19. */
+            { 304, 319 }, /* Profile 20. */
+            { 304, 319 }, /* Profile 21. */
+            { 304, 319 }, /* Profile 22. */
+            { 304, 319 }, /* Profile 23. */
             { 320, 335 }, /* Profile 24. */
-            { 352, 367 }, /* Profile 25. */
-            { 352, 367 }, /* Profile 26. */
-            { 352, 367 }, /* Profile 27. */
+            { 320, 335 }, /* Profile 25. */
+            { 320, 335 }, /* Profile 26. */
+            { 320, 335 }, /* Profile 27. */
             { 320, 335 }, /* Profile 28. */
-            { 352, 367 }, /* Profile 29. */
-            { 352, 367 }, /* Profile 30. */
-            { 352, 367 }, /* Profile 31. */
+            { 320, 335 }, /* Profile 29. */
+            { 320, 335 }, /* Profile 30. */
+            { 320, 335 }, /* Profile 31. */
             { 320, 335 }, /* Profile 32. */
-            { 352, 367 }, /* Profile 33. */
-            { 352, 367 }, /* Profile 34. */
+            { 320, 335 }, /* Profile 33. */
+            { 320, 335 }, /* Profile 34. */
             { 320, 335 }, /* Profile 35. */
-            { 352, 367 }, /* Profile 36. */
-            { 352, 367 }, /* Profile 37. */
-            { 352, 367 }, /* Profile 38. */
+            { 320, 335 }, /* Profile 36. */
+            { 320, 335 }, /* Profile 37. */
+            { 320, 335 }, /* Profile 38. */
             { 320, 335 }, /* Profile 39. */
-            { 352, 367 }, /* Profile 40. */
-            { 352, 367 }, /* Profile 41. */
-            { 352, 367 }, /* Profile 42. */
+            { 320, 335 }, /* Profile 40. */
+            { 320, 335 }, /* Profile 41. */
+            { 320, 335 }, /* Profile 42. */
             { 320, 335 }, /* Profile 43. */
-            { 352, 367 }, /* Profile 44. */
-            { 352, 367 }, /* Profile 45. */
+            { 320, 335 }, /* Profile 44. */
+            { 320, 335 }, /* Profile 45. */
         },
         .profile_cnt = 46,
     },
     {
         .name = "SVP_NETWORK_GROUP_BITMAP_3_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0,
-        .profile = {
-            { -1, -1 }, /* Profile 0. */
-            { -1, -1 }, /* Profile 1. */
-            { 380, 383 }, /* Profile 2. */
-            { 392, 395 }, /* Profile 3. */
-            { 388, 391 }, /* Profile 4. */
-            { 388, 391 }, /* Profile 5. */
-            { 380, 383 }, /* Profile 6. */
-            { 392, 395 }, /* Profile 7. */
-            { 388, 391 }, /* Profile 8. */
-            { 388, 391 }, /* Profile 9. */
-            { 376, 379 }, /* Profile 10. */
-            { 388, 391 }, /* Profile 11. */
-            { 384, 387 }, /* Profile 12. */
-            { 380, 383 }, /* Profile 13. */
-            { 392, 395 }, /* Profile 14. */
-            { 388, 391 }, /* Profile 15. */
-            { 388, 391 }, /* Profile 16. */
-            { 380, 383 }, /* Profile 17. */
-            { 392, 395 }, /* Profile 18. */
-            { 388, 391 }, /* Profile 19. */
-            { 388, 391 }, /* Profile 20. */
-            { 376, 379 }, /* Profile 21. */
-            { 388, 391 }, /* Profile 22. */
-            { 384, 387 }, /* Profile 23. */
-            { 380, 383 }, /* Profile 24. */
-            { 392, 395 }, /* Profile 25. */
-            { 388, 391 }, /* Profile 26. */
-            { 388, 391 }, /* Profile 27. */
-            { 380, 383 }, /* Profile 28. */
-            { 392, 395 }, /* Profile 29. */
-            { 388, 391 }, /* Profile 30. */
-            { 388, 391 }, /* Profile 31. */
-            { 376, 379 }, /* Profile 32. */
-            { 388, 391 }, /* Profile 33. */
-            { 384, 387 }, /* Profile 34. */
-            { 380, 383 }, /* Profile 35. */
-            { 392, 395 }, /* Profile 36. */
-            { 388, 391 }, /* Profile 37. */
-            { 388, 391 }, /* Profile 38. */
-            { 380, 383 }, /* Profile 39. */
-            { 392, 395 }, /* Profile 40. */
-            { 388, 391 }, /* Profile 41. */
-            { 388, 391 }, /* Profile 42. */
-            { 376, 379 }, /* Profile 43. */
-            { 388, 391 }, /* Profile 44. */
-            { 384, 387 }, /* Profile 45. */
-        },
-        .profile_cnt = 46,
-    },
-    {
-        .name = "SVTAG_SC_INDEX_STR_ALLOW_NAT_3_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_SVTAG_SC_INDEX_STR_ALLOW_NAT_3_0,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_SVP_NETWORK_GROUP_BITMAP_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 384, 387 }, /* Profile 2. */
-            { 396, 399 }, /* Profile 3. */
-            { 392, 395 }, /* Profile 4. */
-            { 392, 395 }, /* Profile 5. */
-            { 384, 387 }, /* Profile 6. */
-            { 396, 399 }, /* Profile 7. */
-            { 392, 395 }, /* Profile 8. */
-            { 392, 395 }, /* Profile 9. */
-            { 380, 383 }, /* Profile 10. */
-            { 392, 395 }, /* Profile 11. */
-            { 388, 391 }, /* Profile 12. */
-            { 384, 387 }, /* Profile 13. */
-            { 396, 399 }, /* Profile 14. */
-            { 392, 395 }, /* Profile 15. */
-            { 392, 395 }, /* Profile 16. */
-            { 384, 387 }, /* Profile 17. */
-            { 396, 399 }, /* Profile 18. */
-            { 392, 395 }, /* Profile 19. */
-            { 392, 395 }, /* Profile 20. */
-            { 380, 383 }, /* Profile 21. */
-            { 392, 395 }, /* Profile 22. */
-            { 388, 391 }, /* Profile 23. */
-            { 384, 387 }, /* Profile 24. */
-            { 396, 399 }, /* Profile 25. */
-            { 392, 395 }, /* Profile 26. */
-            { 392, 395 }, /* Profile 27. */
-            { 384, 387 }, /* Profile 28. */
-            { 396, 399 }, /* Profile 29. */
-            { 392, 395 }, /* Profile 30. */
-            { 392, 395 }, /* Profile 31. */
-            { 380, 383 }, /* Profile 32. */
-            { 392, 395 }, /* Profile 33. */
-            { 388, 391 }, /* Profile 34. */
-            { 384, 387 }, /* Profile 35. */
-            { 396, 399 }, /* Profile 36. */
-            { 392, 395 }, /* Profile 37. */
-            { 392, 395 }, /* Profile 38. */
-            { 384, 387 }, /* Profile 39. */
-            { 396, 399 }, /* Profile 40. */
-            { 392, 395 }, /* Profile 41. */
-            { 392, 395 }, /* Profile 42. */
-            { 380, 383 }, /* Profile 43. */
-            { 392, 395 }, /* Profile 44. */
-            { 388, 391 }, /* Profile 45. */
+            { 376, 379 }, /* Profile 2. */
+            { 380, 383 }, /* Profile 3. */
+            { 376, 379 }, /* Profile 4. */
+            { 376, 379 }, /* Profile 5. */
+            { 376, 379 }, /* Profile 6. */
+            { 380, 383 }, /* Profile 7. */
+            { 376, 379 }, /* Profile 8. */
+            { 376, 379 }, /* Profile 9. */
+            { 372, 375 }, /* Profile 10. */
+            { 376, 379 }, /* Profile 11. */
+            { 372, 375 }, /* Profile 12. */
+            { 376, 379 }, /* Profile 13. */
+            { 380, 383 }, /* Profile 14. */
+            { 376, 379 }, /* Profile 15. */
+            { 376, 379 }, /* Profile 16. */
+            { 376, 379 }, /* Profile 17. */
+            { 380, 383 }, /* Profile 18. */
+            { 376, 379 }, /* Profile 19. */
+            { 376, 379 }, /* Profile 20. */
+            { 372, 375 }, /* Profile 21. */
+            { 376, 379 }, /* Profile 22. */
+            { 372, 375 }, /* Profile 23. */
+            { 376, 379 }, /* Profile 24. */
+            { 380, 383 }, /* Profile 25. */
+            { 376, 379 }, /* Profile 26. */
+            { 376, 379 }, /* Profile 27. */
+            { 376, 379 }, /* Profile 28. */
+            { 380, 383 }, /* Profile 29. */
+            { 376, 379 }, /* Profile 30. */
+            { 376, 379 }, /* Profile 31. */
+            { 372, 375 }, /* Profile 32. */
+            { 376, 379 }, /* Profile 33. */
+            { 372, 375 }, /* Profile 34. */
+            { 376, 379 }, /* Profile 35. */
+            { 380, 383 }, /* Profile 36. */
+            { 376, 379 }, /* Profile 37. */
+            { 376, 379 }, /* Profile 38. */
+            { 376, 379 }, /* Profile 39. */
+            { 380, 383 }, /* Profile 40. */
+            { 376, 379 }, /* Profile 41. */
+            { 376, 379 }, /* Profile 42. */
+            { 372, 375 }, /* Profile 43. */
+            { 376, 379 }, /* Profile 44. */
+            { 372, 375 }, /* Profile 45. */
         },
         .profile_cnt = 46,
     },
     {
         .name = "SYSTEM_DESTINATION_15_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_SYSTEM_DESTINATION_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -2540,245 +2381,245 @@ static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_flex_field_
             { 112, 127 }, /* Profile 22. */
             { 112, 127 }, /* Profile 23. */
             { 112, 127 }, /* Profile 24. */
-            { 112, 127 }, /* Profile 25. */
-            { 112, 127 }, /* Profile 26. */
-            { 112, 127 }, /* Profile 27. */
-            { 112, 127 }, /* Profile 28. */
-            { 112, 127 }, /* Profile 29. */
-            { 112, 127 }, /* Profile 30. */
-            { 112, 127 }, /* Profile 31. */
-            { 112, 127 }, /* Profile 32. */
-            { 112, 127 }, /* Profile 33. */
-            { 112, 127 }, /* Profile 34. */
-            { 112, 127 }, /* Profile 35. */
-            { 112, 127 }, /* Profile 36. */
-            { 112, 127 }, /* Profile 37. */
-            { 112, 127 }, /* Profile 38. */
-            { 112, 127 }, /* Profile 39. */
-            { 112, 127 }, /* Profile 40. */
-            { 112, 127 }, /* Profile 41. */
-            { 112, 127 }, /* Profile 42. */
-            { 112, 127 }, /* Profile 43. */
-            { 112, 127 }, /* Profile 44. */
-            { 112, 127 }, /* Profile 45. */
-        },
-        .profile_cnt = 46,
-    },
-    {
-        .name = "SYSTEM_OPCODE_3_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0,
-        .profile = {
-            { -1, -1 }, /* Profile 0. */
-            { -1, -1 }, /* Profile 1. */
-            { 396, 399 }, /* Profile 2. */
-            { 408, 411 }, /* Profile 3. */
-            { 404, 407 }, /* Profile 4. */
-            { 404, 407 }, /* Profile 5. */
-            { 396, 399 }, /* Profile 6. */
-            { 408, 411 }, /* Profile 7. */
-            { 404, 407 }, /* Profile 8. */
-            { 404, 407 }, /* Profile 9. */
-            { 392, 395 }, /* Profile 10. */
-            { 404, 407 }, /* Profile 11. */
-            { 400, 403 }, /* Profile 12. */
-            { 396, 399 }, /* Profile 13. */
-            { 408, 411 }, /* Profile 14. */
-            { 404, 407 }, /* Profile 15. */
-            { 404, 407 }, /* Profile 16. */
-            { 396, 399 }, /* Profile 17. */
-            { 408, 411 }, /* Profile 18. */
-            { 404, 407 }, /* Profile 19. */
-            { 404, 407 }, /* Profile 20. */
-            { 392, 395 }, /* Profile 21. */
-            { 404, 407 }, /* Profile 22. */
-            { 400, 403 }, /* Profile 23. */
-            { 396, 399 }, /* Profile 24. */
-            { 408, 411 }, /* Profile 25. */
-            { 404, 407 }, /* Profile 26. */
-            { 404, 407 }, /* Profile 27. */
-            { 396, 399 }, /* Profile 28. */
-            { 408, 411 }, /* Profile 29. */
-            { 404, 407 }, /* Profile 30. */
-            { 404, 407 }, /* Profile 31. */
-            { 392, 395 }, /* Profile 32. */
-            { 404, 407 }, /* Profile 33. */
-            { 400, 403 }, /* Profile 34. */
-            { 396, 399 }, /* Profile 35. */
-            { 408, 411 }, /* Profile 36. */
-            { 404, 407 }, /* Profile 37. */
-            { 404, 407 }, /* Profile 38. */
-            { 396, 399 }, /* Profile 39. */
-            { 408, 411 }, /* Profile 40. */
-            { 404, 407 }, /* Profile 41. */
-            { 404, 407 }, /* Profile 42. */
-            { 392, 395 }, /* Profile 43. */
-            { 404, 407 }, /* Profile 44. */
-            { 400, 403 }, /* Profile 45. */
+            { 112, 127 }, /* Profile 25. */
+            { 112, 127 }, /* Profile 26. */
+            { 112, 127 }, /* Profile 27. */
+            { 112, 127 }, /* Profile 28. */
+            { 112, 127 }, /* Profile 29. */
+            { 112, 127 }, /* Profile 30. */
+            { 112, 127 }, /* Profile 31. */
+            { 112, 127 }, /* Profile 32. */
+            { 112, 127 }, /* Profile 33. */
+            { 112, 127 }, /* Profile 34. */
+            { 112, 127 }, /* Profile 35. */
+            { 112, 127 }, /* Profile 36. */
+            { 112, 127 }, /* Profile 37. */
+            { 112, 127 }, /* Profile 38. */
+            { 112, 127 }, /* Profile 39. */
+            { 112, 127 }, /* Profile 40. */
+            { 112, 127 }, /* Profile 41. */
+            { 112, 127 }, /* Profile 42. */
+            { 112, 127 }, /* Profile 43. */
+            { 112, 127 }, /* Profile 44. */
+            { 112, 127 }, /* Profile 45. */
+        },
+        .profile_cnt = 46,
+    },
+    {
+        .name = "SYSTEM_OPCODE_3_0",
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_SYSTEM_OPCODE_3_0,
+        .profile = {
+            { -1, -1 }, /* Profile 0. */
+            { -1, -1 }, /* Profile 1. */
+            { 392, 395 }, /* Profile 2. */
+            { 392, 395 }, /* Profile 3. */
+            { 388, 391 }, /* Profile 4. */
+            { 388, 391 }, /* Profile 5. */
+            { 392, 395 }, /* Profile 6. */
+            { 392, 395 }, /* Profile 7. */
+            { 388, 391 }, /* Profile 8. */
+            { 388, 391 }, /* Profile 9. */
+            { 388, 391 }, /* Profile 10. */
+            { 388, 391 }, /* Profile 11. */
+            { 384, 387 }, /* Profile 12. */
+            { 392, 395 }, /* Profile 13. */
+            { 392, 395 }, /* Profile 14. */
+            { 388, 391 }, /* Profile 15. */
+            { 388, 391 }, /* Profile 16. */
+            { 392, 395 }, /* Profile 17. */
+            { 392, 395 }, /* Profile 18. */
+            { 388, 391 }, /* Profile 19. */
+            { 388, 391 }, /* Profile 20. */
+            { 388, 391 }, /* Profile 21. */
+            { 388, 391 }, /* Profile 22. */
+            { 384, 387 }, /* Profile 23. */
+            { 392, 395 }, /* Profile 24. */
+            { 392, 395 }, /* Profile 25. */
+            { 388, 391 }, /* Profile 26. */
+            { 388, 391 }, /* Profile 27. */
+            { 392, 395 }, /* Profile 28. */
+            { 392, 395 }, /* Profile 29. */
+            { 388, 391 }, /* Profile 30. */
+            { 388, 391 }, /* Profile 31. */
+            { 388, 391 }, /* Profile 32. */
+            { 388, 391 }, /* Profile 33. */
+            { 384, 387 }, /* Profile 34. */
+            { 392, 395 }, /* Profile 35. */
+            { 392, 395 }, /* Profile 36. */
+            { 388, 391 }, /* Profile 37. */
+            { 388, 391 }, /* Profile 38. */
+            { 392, 395 }, /* Profile 39. */
+            { 392, 395 }, /* Profile 40. */
+            { 388, 391 }, /* Profile 41. */
+            { 388, 391 }, /* Profile 42. */
+            { 388, 391 }, /* Profile 43. */
+            { 388, 391 }, /* Profile 44. */
+            { 384, 387 }, /* Profile 45. */
         },
         .profile_cnt = 46,
     },
     {
         .name = "SYSTEM_SOURCE_15_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_SYSTEM_SOURCE_15_0,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_SYSTEM_SOURCE_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 96, 111 }, /* Profile 2. */
-            { 96, 111 }, /* Profile 3. */
-            { 96, 111 }, /* Profile 4. */
-            { 96, 111 }, /* Profile 5. */
-            { 96, 111 }, /* Profile 6. */
-            { 96, 111 }, /* Profile 7. */
-            { 96, 111 }, /* Profile 8. */
-            { 96, 111 }, /* Profile 9. */
-            { 96, 111 }, /* Profile 10. */
-            { 96, 111 }, /* Profile 11. */
-            { 96, 111 }, /* Profile 12. */
-            { 96, 111 }, /* Profile 13. */
-            { 96, 111 }, /* Profile 14. */
-            { 96, 111 }, /* Profile 15. */
-            { 96, 111 }, /* Profile 16. */
-            { 96, 111 }, /* Profile 17. */
-            { 96, 111 }, /* Profile 18. */
-            { 96, 111 }, /* Profile 19. */
-            { 96, 111 }, /* Profile 20. */
-            { 96, 111 }, /* Profile 21. */
-            { 96, 111 }, /* Profile 22. */
-            { 96, 111 }, /* Profile 23. */
-            { 96, 111 }, /* Profile 24. */
-            { 96, 111 }, /* Profile 25. */
-            { 96, 111 }, /* Profile 26. */
-            { 96, 111 }, /* Profile 27. */
-            { 96, 111 }, /* Profile 28. */
-            { 96, 111 }, /* Profile 29. */
-            { 96, 111 }, /* Profile 30. */
-            { 96, 111 }, /* Profile 31. */
-            { 96, 111 }, /* Profile 32. */
-            { 96, 111 }, /* Profile 33. */
-            { 96, 111 }, /* Profile 34. */
-            { 96, 111 }, /* Profile 35. */
-            { 96, 111 }, /* Profile 36. */
-            { 96, 111 }, /* Profile 37. */
-            { 96, 111 }, /* Profile 38. */
-            { 96, 111 }, /* Profile 39. */
-            { 96, 111 }, /* Profile 40. */
-            { 96, 111 }, /* Profile 41. */
-            { 96, 111 }, /* Profile 42. */
-            { 96, 111 }, /* Profile 43. */
-            { 96, 111 }, /* Profile 44. */
-            { 96, 111 }, /* Profile 45. */
+            { 176, 191 }, /* Profile 2. */
+            { 176, 191 }, /* Profile 3. */
+            { 176, 191 }, /* Profile 4. */
+            { 176, 191 }, /* Profile 5. */
+            { 176, 191 }, /* Profile 6. */
+            { 176, 191 }, /* Profile 7. */
+            { 176, 191 }, /* Profile 8. */
+            { 176, 191 }, /* Profile 9. */
+            { 176, 191 }, /* Profile 10. */
+            { 176, 191 }, /* Profile 11. */
+            { 176, 191 }, /* Profile 12. */
+            { 176, 191 }, /* Profile 13. */
+            { 176, 191 }, /* Profile 14. */
+            { 176, 191 }, /* Profile 15. */
+            { 176, 191 }, /* Profile 16. */
+            { 176, 191 }, /* Profile 17. */
+            { 176, 191 }, /* Profile 18. */
+            { 176, 191 }, /* Profile 19. */
+            { 176, 191 }, /* Profile 20. */
+            { 176, 191 }, /* Profile 21. */
+            { 176, 191 }, /* Profile 22. */
+            { 176, 191 }, /* Profile 23. */
+            { 192, 207 }, /* Profile 24. */
+            { 192, 207 }, /* Profile 25. */
+            { 192, 207 }, /* Profile 26. */
+            { 192, 207 }, /* Profile 27. */
+            { 192, 207 }, /* Profile 28. */
+            { 192, 207 }, /* Profile 29. */
+            { 192, 207 }, /* Profile 30. */
+            { 192, 207 }, /* Profile 31. */
+            { 192, 207 }, /* Profile 32. */
+            { 192, 207 }, /* Profile 33. */
+            { 192, 207 }, /* Profile 34. */
+            { 192, 207 }, /* Profile 35. */
+            { 192, 207 }, /* Profile 36. */
+            { 192, 207 }, /* Profile 37. */
+            { 192, 207 }, /* Profile 38. */
+            { 192, 207 }, /* Profile 39. */
+            { 192, 207 }, /* Profile 40. */
+            { 192, 207 }, /* Profile 41. */
+            { 192, 207 }, /* Profile 42. */
+            { 192, 207 }, /* Profile 43. */
+            { 192, 207 }, /* Profile 44. */
+            { 192, 207 }, /* Profile 45. */
         },
         .profile_cnt = 46,
     },
     {
         .name = "TIMESTAMP_CTRL_3_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_TIMESTAMP_CTRL_3_0,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_TIMESTAMP_CTRL_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
             { -1, -1 }, /* Profile 2. */
             { -1, -1 }, /* Profile 3. */
-            { 420, 423 }, /* Profile 4. */
-            { 420, 423 }, /* Profile 5. */
+            { 408, 411 }, /* Profile 4. */
+            { 408, 411 }, /* Profile 5. */
             { -1, -1 }, /* Profile 6. */
             { -1, -1 }, /* Profile 7. */
-            { 420, 423 }, /* Profile 8. */
-            { 420, 423 }, /* Profile 9. */
+            { 408, 411 }, /* Profile 8. */
+            { 408, 411 }, /* Profile 9. */
             { -1, -1 }, /* Profile 10. */
             { -1, -1 }, /* Profile 11. */
-            { 416, 419 }, /* Profile 12. */
-            { -1, -1 }, /* Profile 13. */
-            { -1, -1 }, /* Profile 14. */
-            { 420, 423 }, /* Profile 15. */
-            { 420, 423 }, /* Profile 16. */
-            { -1, -1 }, /* Profile 17. */
-            { -1, -1 }, /* Profile 18. */
-            { 420, 423 }, /* Profile 19. */
-            { 420, 423 }, /* Profile 20. */
-            { -1, -1 }, /* Profile 21. */
-            { -1, -1 }, /* Profile 22. */
-            { 416, 419 }, /* Profile 23. */
-            { -1, -1 }, /* Profile 24. */
-            { -1, -1 }, /* Profile 25. */
-            { 420, 423 }, /* Profile 26. */
-            { 420, 423 }, /* Profile 27. */
-            { -1, -1 }, /* Profile 28. */
-            { -1, -1 }, /* Profile 29. */
-            { 420, 423 }, /* Profile 30. */
-            { 420, 423 }, /* Profile 31. */
-            { -1, -1 }, /* Profile 32. */
-            { -1, -1 }, /* Profile 33. */
-            { 416, 419 }, /* Profile 34. */
-            { -1, -1 }, /* Profile 35. */
-            { -1, -1 }, /* Profile 36. */
-            { 420, 423 }, /* Profile 37. */
-            { 420, 423 }, /* Profile 38. */
-            { -1, -1 }, /* Profile 39. */
-            { -1, -1 }, /* Profile 40. */
-            { 420, 423 }, /* Profile 41. */
-            { 420, 423 }, /* Profile 42. */
-            { -1, -1 }, /* Profile 43. */
-            { -1, -1 }, /* Profile 44. */
-            { 416, 419 }, /* Profile 45. */
-        },
-        .profile_cnt = 46,
-    },
-    {
-        .name = "TUNNEL_PROCESSING_RESULTS_1_3_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0,
-        .profile = {
-            { -1, -1 }, /* Profile 0. */
-            { -1, -1 }, /* Profile 1. */
-            { 388, 391 }, /* Profile 2. */
-            { 400, 403 }, /* Profile 3. */
-            { 396, 399 }, /* Profile 4. */
-            { 396, 399 }, /* Profile 5. */
-            { 388, 391 }, /* Profile 6. */
-            { 400, 403 }, /* Profile 7. */
-            { 396, 399 }, /* Profile 8. */
-            { 396, 399 }, /* Profile 9. */
-            { 384, 387 }, /* Profile 10. */
-            { 396, 399 }, /* Profile 11. */
-            { 392, 395 }, /* Profile 12. */
-            { 388, 391 }, /* Profile 13. */
-            { 400, 403 }, /* Profile 14. */
-            { 396, 399 }, /* Profile 15. */
-            { 396, 399 }, /* Profile 16. */
-            { 388, 391 }, /* Profile 17. */
-            { 400, 403 }, /* Profile 18. */
-            { 396, 399 }, /* Profile 19. */
-            { 396, 399 }, /* Profile 20. */
-            { 384, 387 }, /* Profile 21. */
-            { 396, 399 }, /* Profile 22. */
-            { 392, 395 }, /* Profile 23. */
-            { 388, 391 }, /* Profile 24. */
-            { 400, 403 }, /* Profile 25. */
-            { 396, 399 }, /* Profile 26. */
-            { 396, 399 }, /* Profile 27. */
-            { 388, 391 }, /* Profile 28. */
-            { 400, 403 }, /* Profile 29. */
-            { 396, 399 }, /* Profile 30. */
-            { 396, 399 }, /* Profile 31. */
-            { 384, 387 }, /* Profile 32. */
-            { 396, 399 }, /* Profile 33. */
-            { 392, 395 }, /* Profile 34. */
-            { 388, 391 }, /* Profile 35. */
-            { 400, 403 }, /* Profile 36. */
-            { 396, 399 }, /* Profile 37. */
-            { 396, 399 }, /* Profile 38. */
-            { 388, 391 }, /* Profile 39. */
-            { 400, 403 }, /* Profile 40. */
-            { 396, 399 }, /* Profile 41. */
-            { 396, 399 }, /* Profile 42. */
-            { 384, 387 }, /* Profile 43. */
-            { 396, 399 }, /* Profile 44. */
-            { 392, 395 }, /* Profile 45. */
+            { 404, 407 }, /* Profile 12. */
+            { -1, -1 }, /* Profile 13. */
+            { -1, -1 }, /* Profile 14. */
+            { 408, 411 }, /* Profile 15. */
+            { 408, 411 }, /* Profile 16. */
+            { -1, -1 }, /* Profile 17. */
+            { -1, -1 }, /* Profile 18. */
+            { 408, 411 }, /* Profile 19. */
+            { 408, 411 }, /* Profile 20. */
+            { -1, -1 }, /* Profile 21. */
+            { -1, -1 }, /* Profile 22. */
+            { 404, 407 }, /* Profile 23. */
+            { -1, -1 }, /* Profile 24. */
+            { -1, -1 }, /* Profile 25. */
+            { 408, 411 }, /* Profile 26. */
+            { 408, 411 }, /* Profile 27. */
+            { -1, -1 }, /* Profile 28. */
+            { -1, -1 }, /* Profile 29. */
+            { 408, 411 }, /* Profile 30. */
+            { 408, 411 }, /* Profile 31. */
+            { -1, -1 }, /* Profile 32. */
+            { -1, -1 }, /* Profile 33. */
+            { 404, 407 }, /* Profile 34. */
+            { -1, -1 }, /* Profile 35. */
+            { -1, -1 }, /* Profile 36. */
+            { 408, 411 }, /* Profile 37. */
+            { 408, 411 }, /* Profile 38. */
+            { -1, -1 }, /* Profile 39. */
+            { -1, -1 }, /* Profile 40. */
+            { 408, 411 }, /* Profile 41. */
+            { 408, 411 }, /* Profile 42. */
+            { -1, -1 }, /* Profile 43. */
+            { -1, -1 }, /* Profile 44. */
+            { 404, 407 }, /* Profile 45. */
+        },
+        .profile_cnt = 46,
+    },
+    {
+        .name = "TUNNEL_PROCESSING_RESULTS_1_3_0",
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_TUNNEL_PROCESSING_RESULTS_1_3_0,
+        .profile = {
+            { -1, -1 }, /* Profile 0. */
+            { -1, -1 }, /* Profile 1. */
+            { 408, 411 }, /* Profile 2. */
+            { 408, 411 }, /* Profile 3. */
+            { 404, 407 }, /* Profile 4. */
+            { 404, 407 }, /* Profile 5. */
+            { 408, 411 }, /* Profile 6. */
+            { 408, 411 }, /* Profile 7. */
+            { 404, 407 }, /* Profile 8. */
+            { 404, 407 }, /* Profile 9. */
+            { 404, 407 }, /* Profile 10. */
+            { 404, 407 }, /* Profile 11. */
+            { 400, 403 }, /* Profile 12. */
+            { 408, 411 }, /* Profile 13. */
+            { 408, 411 }, /* Profile 14. */
+            { 404, 407 }, /* Profile 15. */
+            { 404, 407 }, /* Profile 16. */
+            { 408, 411 }, /* Profile 17. */
+            { 408, 411 }, /* Profile 18. */
+            { 404, 407 }, /* Profile 19. */
+            { 404, 407 }, /* Profile 20. */
+            { 404, 407 }, /* Profile 21. */
+            { 404, 407 }, /* Profile 22. */
+            { 400, 403 }, /* Profile 23. */
+            { 408, 411 }, /* Profile 24. */
+            { 408, 411 }, /* Profile 25. */
+            { 404, 407 }, /* Profile 26. */
+            { 404, 407 }, /* Profile 27. */
+            { 408, 411 }, /* Profile 28. */
+            { 408, 411 }, /* Profile 29. */
+            { 404, 407 }, /* Profile 30. */
+            { 404, 407 }, /* Profile 31. */
+            { 404, 407 }, /* Profile 32. */
+            { 404, 407 }, /* Profile 33. */
+            { 400, 403 }, /* Profile 34. */
+            { 408, 411 }, /* Profile 35. */
+            { 408, 411 }, /* Profile 36. */
+            { 404, 407 }, /* Profile 37. */
+            { 404, 407 }, /* Profile 38. */
+            { 408, 411 }, /* Profile 39. */
+            { 408, 411 }, /* Profile 40. */
+            { 404, 407 }, /* Profile 41. */
+            { 404, 407 }, /* Profile 42. */
+            { 404, 407 }, /* Profile 43. */
+            { 404, 407 }, /* Profile 44. */
+            { 400, 403 }, /* Profile 45. */
         },
         .profile_cnt = 46,
     },
     {
         .name = "VFI_15_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_VFI_15_0,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_VFI_15_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
@@ -2831,71 +2672,76 @@ static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_flex_field_
     },
     {
         .name = "VLAN_TAG_PRESERVE_CTRL_SVP_MIRROR_ENABLE_3_0",
-        .fid = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_VLAN_TAG_PRESERVE_CTRL_SVP_MIRROR_ENABLE_3_0,
+        .fid = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_VLAN_TAG_PRESERVE_CTRL_SVP_MIRROR_ENABLE_3_0,
         .profile = {
             { -1, -1 }, /* Profile 0. */
             { -1, -1 }, /* Profile 1. */
-            { 360, 363 }, /* Profile 2. */
+            { 372, 375 }, /* Profile 2. */
             { 376, 379 }, /* Profile 3. */
             { 372, 375 }, /* Profile 4. */
             { 372, 375 }, /* Profile 5. */
-            { 360, 363 }, /* Profile 6. */
+            { 372, 375 }, /* Profile 6. */
             { 376, 379 }, /* Profile 7. */
             { 372, 375 }, /* Profile 8. */
             { 372, 375 }, /* Profile 9. */
-            { 360, 363 }, /* Profile 10. */
-            { 376, 379 }, /* Profile 11. */
-            { 372, 375 }, /* Profile 12. */
-            { 360, 363 }, /* Profile 13. */
+            { 368, 371 }, /* Profile 10. */
+            { 372, 375 }, /* Profile 11. */
+            { 368, 371 }, /* Profile 12. */
+            { 372, 375 }, /* Profile 13. */
             { 376, 379 }, /* Profile 14. */
             { 372, 375 }, /* Profile 15. */
             { 372, 375 }, /* Profile 16. */
-            { 360, 363 }, /* Profile 17. */
+            { 372, 375 }, /* Profile 17. */
             { 376, 379 }, /* Profile 18. */
             { 372, 375 }, /* Profile 19. */
             { 372, 375 }, /* Profile 20. */
-            { 360, 363 }, /* Profile 21. */
-            { 376, 379 }, /* Profile 22. */
-            { 372, 375 }, /* Profile 23. */
-            { 360, 363 }, /* Profile 24. */
+            { 368, 371 }, /* Profile 21. */
+            { 372, 375 }, /* Profile 22. */
+            { 368, 371 }, /* Profile 23. */
+            { 372, 375 }, /* Profile 24. */
             { 376, 379 }, /* Profile 25. */
             { 372, 375 }, /* Profile 26. */
             { 372, 375 }, /* Profile 27. */
-            { 360, 363 }, /* Profile 28. */
+            { 372, 375 }, /* Profile 28. */
             { 376, 379 }, /* Profile 29. */
             { 372, 375 }, /* Profile 30. */
             { 372, 375 }, /* Profile 31. */
-            { 360, 363 }, /* Profile 32. */
-            { 376, 379 }, /* Profile 33. */
-            { 372, 375 }, /* Profile 34. */
-            { 360, 363 }, /* Profile 35. */
+            { 368, 371 }, /* Profile 32. */
+            { 372, 375 }, /* Profile 33. */
+            { 368, 371 }, /* Profile 34. */
+            { 372, 375 }, /* Profile 35. */
             { 376, 379 }, /* Profile 36. */
             { 372, 375 }, /* Profile 37. */
             { 372, 375 }, /* Profile 38. */
-            { 360, 363 }, /* Profile 39. */
+            { 372, 375 }, /* Profile 39. */
             { 376, 379 }, /* Profile 40. */
             { 372, 375 }, /* Profile 41. */
             { 372, 375 }, /* Profile 42. */
-            { 360, 363 }, /* Profile 43. */
-            { 376, 379 }, /* Profile 44. */
-            { 372, 375 }, /* Profile 45. */
+            { 368, 371 }, /* Profile 43. */
+            { 372, 375 }, /* Profile 44. */
+            { 368, 371 }, /* Profile 45. */
         },
         .profile_cnt = 46,
     },
-};static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_flex_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_rxpmd_flex_field_data,
+};
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_flex_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_rxpmd_flex_field_data,
+    .profile_bmp_cnt = 2,
+    .profile_bmp[0] = 0xfffffffc,
+    .profile_bmp[1] = 0x3fff,
+
 };
 
-static shr_enum_map_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_flex_reason_names[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT
+static shr_enum_map_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_flex_reason_names[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_reasons_info_t bcm56690_a0_dna_6_5_29_0_1_rxpmd_flex_reasons_info = {
-    .num_reasons = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RXPMD_FLEX_REASON_COUNT,
-    .reason_names = bcm56690_a0_dna_6_5_29_0_1_rxpmd_flex_reason_names,
-    .reason_encode = bcm56690_a0_dna_6_5_29_0_1_rxpmd_flex_reason_encode,
-    .reason_decode = bcm56690_a0_dna_6_5_29_0_1_rxpmd_flex_reason_decode,
+static bcmpkt_flex_reasons_info_t bcm78800_a0_dna_6_5_31_5_0_rxpmd_flex_reasons_info = {
+    .num_reasons = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RXPMD_FLEX_REASON_COUNT,
+    .reason_names = bcm78800_a0_dna_6_5_31_5_0_rxpmd_flex_reason_names,
+    .reason_encode = bcm78800_a0_dna_6_5_31_5_0_rxpmd_flex_reason_encode,
+    .reason_decode = bcm78800_a0_dna_6_5_31_5_0_rxpmd_flex_reason_decode,
 };
 
 
@@ -3038,7 +2884,7 @@ static int32_t bcmpkt_arp_t_target_ip_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_arp_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ARP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_arp_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ARP_T_FID_COUNT] = {
     bcmpkt_arp_t_hardware_len_get,
     bcmpkt_arp_t_hardware_type_get,
     bcmpkt_arp_t_operation_get,
@@ -3050,7 +2896,7 @@ bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_arp_t_fget[BCM56690_A0_DNA_6_
     bcmpkt_arp_t_target_ip_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_arp_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ARP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_arp_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ARP_T_FID_COUNT] = {
     bcmpkt_arp_t_hardware_len_set,
     bcmpkt_arp_t_hardware_type_set,
     bcmpkt_arp_t_operation_set,
@@ -3062,13 +2908,13 @@ bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_arp_t_fset[BCM56690_A0_DNA_6_
     bcmpkt_arp_t_target_ip_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_arp_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_arp_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ARP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_arp_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ARP_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_arp_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_arp_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ARP_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_arp_t_field_data,
 };
 
 
@@ -3165,7 +3011,7 @@ static int32_t bcmpkt_authen_t_spi_set(uint32_t *data, int profile, uint32_t val
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_authen_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_AUTHEN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_authen_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_AUTHEN_T_FID_COUNT] = {
     bcmpkt_authen_t_data_get,
     bcmpkt_authen_t_next_header_get,
     bcmpkt_authen_t_payload_len_get,
@@ -3174,7 +3020,7 @@ bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_authen_t_fget[BCM56690_A0_DNA
     bcmpkt_authen_t_spi_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_authen_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_AUTHEN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_authen_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_AUTHEN_T_FID_COUNT] = {
     bcmpkt_authen_t_data_set,
     bcmpkt_authen_t_next_header_set,
     bcmpkt_authen_t_payload_len_set,
@@ -3183,13 +3029,13 @@ bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_authen_t_fset[BCM56690_A0_DNA
     bcmpkt_authen_t_spi_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_authen_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_AUTHEN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_authen_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_AUTHEN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_authen_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_AUTHEN_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_authen_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_authen_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_AUTHEN_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_authen_t_field_data,
 };
 
 
@@ -3438,7 +3284,7 @@ static int32_t bcmpkt_bfd_t_version_set(uint32_t *data, int profile, uint32_t va
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_bfd_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_bfd_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_FID_COUNT] = {
     bcmpkt_bfd_t_ap_get,
     bcmpkt_bfd_t_bfd_length_get,
     bcmpkt_bfd_t_cpi_get,
@@ -3457,7 +3303,7 @@ bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_bfd_t_fget[BCM56690_A0_DNA_6_
     bcmpkt_bfd_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_bfd_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_bfd_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_FID_COUNT] = {
     bcmpkt_bfd_t_ap_set,
     bcmpkt_bfd_t_bfd_length_set,
     bcmpkt_bfd_t_cpi_set,
@@ -3476,13 +3322,13 @@ bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_bfd_t_fset[BCM56690_A0_DNA_6_
     bcmpkt_bfd_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_bfd_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_bfd_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_bfd_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_BFD_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_bfd_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_bfd_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_BFD_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_bfd_t_field_data,
 };
 
 
@@ -3516,23 +3362,23 @@ static int32_t bcmpkt_cntag_t_tpid_set(uint32_t *data, int profile, uint32_t val
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_cntag_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CNTAG_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_cntag_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CNTAG_T_FID_COUNT] = {
     bcmpkt_cntag_t_rpid_get,
     bcmpkt_cntag_t_tpid_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_cntag_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CNTAG_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_cntag_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CNTAG_T_FID_COUNT] = {
     bcmpkt_cntag_t_rpid_set,
     bcmpkt_cntag_t_tpid_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_cntag_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CNTAG_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_cntag_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CNTAG_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_cntag_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CNTAG_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_cntag_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_cntag_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CNTAG_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_cntag_t_field_data,
 };
 
 
@@ -3648,7 +3494,7 @@ static int32_t bcmpkt_cpu_composites_0_t_dma_cont6_set(uint32_t *data, int profi
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_cpu_composites_0_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_cpu_composites_0_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
     bcmpkt_cpu_composites_0_t_dma_cont0_get,
     bcmpkt_cpu_composites_0_t_dma_cont1_get,
     bcmpkt_cpu_composites_0_t_dma_cont2_get,
@@ -3658,7 +3504,7 @@ bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_cpu_composites_0_t_fget[BCM56
     bcmpkt_cpu_composites_0_t_dma_cont6_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_cpu_composites_0_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_cpu_composites_0_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT] = {
     bcmpkt_cpu_composites_0_t_dma_cont0_set,
     bcmpkt_cpu_composites_0_t_dma_cont1_set,
     bcmpkt_cpu_composites_0_t_dma_cont2_set,
@@ -3668,13 +3514,13 @@ bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_cpu_composites_0_t_fset[BCM56
     bcmpkt_cpu_composites_0_t_dma_cont6_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_cpu_composites_0_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_cpu_composites_0_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_cpu_composites_0_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_cpu_composites_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_cpu_composites_0_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_0_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_cpu_composites_0_t_field_data,
 };
 
 
@@ -3734,161 +3580,296 @@ static int32_t bcmpkt_cpu_composites_1_t_dma_cont13_get(uint32_t *data, int prof
     return ret;
 }
 
-static int32_t bcmpkt_cpu_composites_1_t_dma_cont13_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
+static int32_t bcmpkt_cpu_composites_1_t_dma_cont13_set(uint32_t *data, int profile, uint32_t val) {
+    int32_t ret = SHR_E_NONE;
+
+    ret = SHR_E_PARAM;
+
+    return ret;
+}
+
+static int32_t bcmpkt_cpu_composites_1_t_dma_cont14_get(uint32_t *data, int profile, uint32_t *val) {
+    int32_t ret = SHR_E_NONE;
+
+    ret = SHR_E_PARAM;
+
+    return ret;
+}
+
+static int32_t bcmpkt_cpu_composites_1_t_dma_cont14_set(uint32_t *data, int profile, uint32_t val) {
+    int32_t ret = SHR_E_NONE;
+
+    ret = SHR_E_PARAM;
+
+    return ret;
+}
+
+static int32_t bcmpkt_cpu_composites_1_t_dma_cont15_get(uint32_t *data, int profile, uint32_t *val) {
+    int32_t ret = SHR_E_NONE;
+
+    ret = SHR_E_PARAM;
+
+    return ret;
+}
+
+static int32_t bcmpkt_cpu_composites_1_t_dma_cont15_set(uint32_t *data, int profile, uint32_t val) {
+    int32_t ret = SHR_E_NONE;
+
+    ret = SHR_E_PARAM;
+
+    return ret;
+}
+
+static int32_t bcmpkt_cpu_composites_1_t_dma_cont16_get(uint32_t *data, int profile, uint32_t *val) {
+    int32_t ret = SHR_E_NONE;
+
+    ret = SHR_E_PARAM;
+
+    return ret;
+}
+
+static int32_t bcmpkt_cpu_composites_1_t_dma_cont16_set(uint32_t *data, int profile, uint32_t val) {
+    int32_t ret = SHR_E_NONE;
+
+    ret = SHR_E_PARAM;
+
+    return ret;
+}
+
+static int32_t bcmpkt_cpu_composites_1_t_dma_cont17_get(uint32_t *data, int profile, uint32_t *val) {
+    int32_t ret = SHR_E_NONE;
+
+    ret = SHR_E_PARAM;
+
+    return ret;
+}
+
+static int32_t bcmpkt_cpu_composites_1_t_dma_cont17_set(uint32_t *data, int profile, uint32_t val) {
+    int32_t ret = SHR_E_NONE;
+
+    ret = SHR_E_PARAM;
+
+    return ret;
+}
+
+static int32_t bcmpkt_cpu_composites_1_t_dma_cont7_get(uint32_t *data, int profile, uint32_t *val) {
+    int32_t ret = SHR_E_NONE;
+
+    ret = SHR_E_PARAM;
+
+    return ret;
+}
+
+static int32_t bcmpkt_cpu_composites_1_t_dma_cont7_set(uint32_t *data, int profile, uint32_t val) {
+    int32_t ret = SHR_E_NONE;
+
+    ret = SHR_E_PARAM;
+
+    return ret;
+}
+
+static int32_t bcmpkt_cpu_composites_1_t_dma_cont8_get(uint32_t *data, int profile, uint32_t *val) {
+    int32_t ret = SHR_E_NONE;
+
+    ret = SHR_E_PARAM;
+
+    return ret;
+}
+
+static int32_t bcmpkt_cpu_composites_1_t_dma_cont8_set(uint32_t *data, int profile, uint32_t val) {
+    int32_t ret = SHR_E_NONE;
+
+    ret = SHR_E_PARAM;
+
+    return ret;
+}
+
+static int32_t bcmpkt_cpu_composites_1_t_dma_cont9_get(uint32_t *data, int profile, uint32_t *val) {
+    int32_t ret = SHR_E_NONE;
+
+    ret = SHR_E_PARAM;
+
+    return ret;
+}
+
+static int32_t bcmpkt_cpu_composites_1_t_dma_cont9_set(uint32_t *data, int profile, uint32_t val) {
+    int32_t ret = SHR_E_NONE;
+
+    ret = SHR_E_PARAM;
+
+    return ret;
+}
+
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_cpu_composites_1_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
+    bcmpkt_cpu_composites_1_t_dma_cont10_get,
+    bcmpkt_cpu_composites_1_t_dma_cont11_get,
+    bcmpkt_cpu_composites_1_t_dma_cont12_get,
+    bcmpkt_cpu_composites_1_t_dma_cont13_get,
+    bcmpkt_cpu_composites_1_t_dma_cont14_get,
+    bcmpkt_cpu_composites_1_t_dma_cont15_get,
+    bcmpkt_cpu_composites_1_t_dma_cont16_get,
+    bcmpkt_cpu_composites_1_t_dma_cont17_get,
+    bcmpkt_cpu_composites_1_t_dma_cont7_get,
+    bcmpkt_cpu_composites_1_t_dma_cont8_get,
+    bcmpkt_cpu_composites_1_t_dma_cont9_get,
+};
+
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_cpu_composites_1_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
+    bcmpkt_cpu_composites_1_t_dma_cont10_set,
+    bcmpkt_cpu_composites_1_t_dma_cont11_set,
+    bcmpkt_cpu_composites_1_t_dma_cont12_set,
+    bcmpkt_cpu_composites_1_t_dma_cont13_set,
+    bcmpkt_cpu_composites_1_t_dma_cont14_set,
+    bcmpkt_cpu_composites_1_t_dma_cont15_set,
+    bcmpkt_cpu_composites_1_t_dma_cont16_set,
+    bcmpkt_cpu_composites_1_t_dma_cont17_set,
+    bcmpkt_cpu_composites_1_t_dma_cont7_set,
+    bcmpkt_cpu_composites_1_t_dma_cont8_set,
+    bcmpkt_cpu_composites_1_t_dma_cont9_set,
+};
+
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_cpu_composites_1_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT
+};
 
-    ret = SHR_E_PARAM;
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_cpu_composites_1_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_cpu_composites_1_t_field_data,
+};
 
-    return ret;
-}
 
-static int32_t bcmpkt_cpu_composites_1_t_dma_cont14_get(uint32_t *data, int profile, uint32_t *val) {
+static int32_t bcmpkt_dcn_t_flags_get(uint32_t *data, int profile, uint32_t *val) {
     int32_t ret = SHR_E_NONE;
 
-    ret = SHR_E_PARAM;
+    *val = WORD_FIELD_GET(data[0], 24, 8);
 
     return ret;
 }
 
-static int32_t bcmpkt_cpu_composites_1_t_dma_cont14_set(uint32_t *data, int profile, uint32_t val) {
+static int32_t bcmpkt_dcn_t_flags_set(uint32_t *data, int profile, uint32_t val) {
     int32_t ret = SHR_E_NONE;
 
-    ret = SHR_E_PARAM;
-
+    WORD_FIELD_SET(data[0], 24, 8, val);
     return ret;
 }
 
-static int32_t bcmpkt_cpu_composites_1_t_dma_cont15_get(uint32_t *data, int profile, uint32_t *val) {
+static int32_t bcmpkt_dcn_t_next_protocol_get(uint32_t *data, int profile, uint32_t *val) {
     int32_t ret = SHR_E_NONE;
 
-    ret = SHR_E_PARAM;
+    *val = WORD_FIELD_GET(data[1], 0, 8);
 
     return ret;
 }
 
-static int32_t bcmpkt_cpu_composites_1_t_dma_cont15_set(uint32_t *data, int profile, uint32_t val) {
+static int32_t bcmpkt_dcn_t_next_protocol_set(uint32_t *data, int profile, uint32_t val) {
     int32_t ret = SHR_E_NONE;
 
-    ret = SHR_E_PARAM;
-
+    WORD_FIELD_SET(data[1], 0, 8, val);
     return ret;
 }
 
-static int32_t bcmpkt_cpu_composites_1_t_dma_cont16_get(uint32_t *data, int profile, uint32_t *val) {
+static int32_t bcmpkt_dcn_t_reserved0_get(uint32_t *data, int profile, uint32_t *val) {
     int32_t ret = SHR_E_NONE;
 
-    ret = SHR_E_PARAM;
+    *val = WORD_FIELD_GET(data[0], 16, 8);
 
     return ret;
 }
 
-static int32_t bcmpkt_cpu_composites_1_t_dma_cont16_set(uint32_t *data, int profile, uint32_t val) {
+static int32_t bcmpkt_dcn_t_reserved0_set(uint32_t *data, int profile, uint32_t val) {
     int32_t ret = SHR_E_NONE;
 
-    ret = SHR_E_PARAM;
-
+    WORD_FIELD_SET(data[0], 16, 8, val);
     return ret;
 }
 
-static int32_t bcmpkt_cpu_composites_1_t_dma_cont17_get(uint32_t *data, int profile, uint32_t *val) {
+static int32_t bcmpkt_dcn_t_reserved1_get(uint32_t *data, int profile, uint32_t *val) {
     int32_t ret = SHR_E_NONE;
 
-    ret = SHR_E_PARAM;
+    *val = WORD_FIELD_GET(data[0], 0, 16);
 
     return ret;
 }
 
-static int32_t bcmpkt_cpu_composites_1_t_dma_cont17_set(uint32_t *data, int profile, uint32_t val) {
+static int32_t bcmpkt_dcn_t_reserved1_set(uint32_t *data, int profile, uint32_t val) {
     int32_t ret = SHR_E_NONE;
 
-    ret = SHR_E_PARAM;
-
+    WORD_FIELD_SET(data[0], 0, 16, val);
     return ret;
 }
 
-static int32_t bcmpkt_cpu_composites_1_t_dma_cont7_get(uint32_t *data, int profile, uint32_t *val) {
+static int32_t bcmpkt_dcn_t_reserved2_get(uint32_t *data, int profile, uint32_t *val) {
     int32_t ret = SHR_E_NONE;
 
-    ret = SHR_E_PARAM;
+    *val = WORD_FIELD_GET(data[1], 24, 8);
 
     return ret;
 }
 
-static int32_t bcmpkt_cpu_composites_1_t_dma_cont7_set(uint32_t *data, int profile, uint32_t val) {
+static int32_t bcmpkt_dcn_t_reserved2_set(uint32_t *data, int profile, uint32_t val) {
     int32_t ret = SHR_E_NONE;
 
-    ret = SHR_E_PARAM;
-
+    WORD_FIELD_SET(data[1], 24, 8, val);
     return ret;
 }
 
-static int32_t bcmpkt_cpu_composites_1_t_dma_cont8_get(uint32_t *data, int profile, uint32_t *val) {
+static int32_t bcmpkt_dcn_t_reserved3_get(uint32_t *data, int profile, uint32_t *val) {
     int32_t ret = SHR_E_NONE;
 
-    ret = SHR_E_PARAM;
+    *val = WORD_FIELD_GET(data[1], 16, 8);
 
     return ret;
 }
 
-static int32_t bcmpkt_cpu_composites_1_t_dma_cont8_set(uint32_t *data, int profile, uint32_t val) {
+static int32_t bcmpkt_dcn_t_reserved3_set(uint32_t *data, int profile, uint32_t val) {
     int32_t ret = SHR_E_NONE;
 
-    ret = SHR_E_PARAM;
-
+    WORD_FIELD_SET(data[1], 16, 8, val);
     return ret;
 }
 
-static int32_t bcmpkt_cpu_composites_1_t_dma_cont9_get(uint32_t *data, int profile, uint32_t *val) {
+static int32_t bcmpkt_dcn_t_reserved4_get(uint32_t *data, int profile, uint32_t *val) {
     int32_t ret = SHR_E_NONE;
 
-    ret = SHR_E_PARAM;
+    *val = WORD_FIELD_GET(data[1], 8, 8);
 
     return ret;
 }
 
-static int32_t bcmpkt_cpu_composites_1_t_dma_cont9_set(uint32_t *data, int profile, uint32_t val) {
+static int32_t bcmpkt_dcn_t_reserved4_set(uint32_t *data, int profile, uint32_t val) {
     int32_t ret = SHR_E_NONE;
 
-    ret = SHR_E_PARAM;
-
+    WORD_FIELD_SET(data[1], 8, 8, val);
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_cpu_composites_1_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
-    bcmpkt_cpu_composites_1_t_dma_cont10_get,
-    bcmpkt_cpu_composites_1_t_dma_cont11_get,
-    bcmpkt_cpu_composites_1_t_dma_cont12_get,
-    bcmpkt_cpu_composites_1_t_dma_cont13_get,
-    bcmpkt_cpu_composites_1_t_dma_cont14_get,
-    bcmpkt_cpu_composites_1_t_dma_cont15_get,
-    bcmpkt_cpu_composites_1_t_dma_cont16_get,
-    bcmpkt_cpu_composites_1_t_dma_cont17_get,
-    bcmpkt_cpu_composites_1_t_dma_cont7_get,
-    bcmpkt_cpu_composites_1_t_dma_cont8_get,
-    bcmpkt_cpu_composites_1_t_dma_cont9_get,
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_dcn_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_DCN_T_FID_COUNT] = {
+    bcmpkt_dcn_t_flags_get,
+    bcmpkt_dcn_t_next_protocol_get,
+    bcmpkt_dcn_t_reserved0_get,
+    bcmpkt_dcn_t_reserved1_get,
+    bcmpkt_dcn_t_reserved2_get,
+    bcmpkt_dcn_t_reserved3_get,
+    bcmpkt_dcn_t_reserved4_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_cpu_composites_1_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT] = {
-    bcmpkt_cpu_composites_1_t_dma_cont10_set,
-    bcmpkt_cpu_composites_1_t_dma_cont11_set,
-    bcmpkt_cpu_composites_1_t_dma_cont12_set,
-    bcmpkt_cpu_composites_1_t_dma_cont13_set,
-    bcmpkt_cpu_composites_1_t_dma_cont14_set,
-    bcmpkt_cpu_composites_1_t_dma_cont15_set,
-    bcmpkt_cpu_composites_1_t_dma_cont16_set,
-    bcmpkt_cpu_composites_1_t_dma_cont17_set,
-    bcmpkt_cpu_composites_1_t_dma_cont7_set,
-    bcmpkt_cpu_composites_1_t_dma_cont8_set,
-    bcmpkt_cpu_composites_1_t_dma_cont9_set,
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_dcn_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_DCN_T_FID_COUNT] = {
+    bcmpkt_dcn_t_flags_set,
+    bcmpkt_dcn_t_next_protocol_set,
+    bcmpkt_dcn_t_reserved0_set,
+    bcmpkt_dcn_t_reserved1_set,
+    bcmpkt_dcn_t_reserved2_set,
+    bcmpkt_dcn_t_reserved3_set,
+    bcmpkt_dcn_t_reserved4_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_cpu_composites_1_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_1_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_dcn_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_DCN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_cpu_composites_1_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_CPU_COMPOSITES_1_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_cpu_composites_1_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_dcn_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_DCN_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_dcn_t_field_data,
 };
 
 
@@ -3938,25 +3919,25 @@ static int32_t bcmpkt_dest_option_t_option_set(uint32_t *data, int profile, uint
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_dest_option_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_DEST_OPTION_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_dest_option_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_DEST_OPTION_T_FID_COUNT] = {
     bcmpkt_dest_option_t_hdr_ext_len_get,
     bcmpkt_dest_option_t_next_header_get,
     bcmpkt_dest_option_t_option_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_dest_option_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_DEST_OPTION_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_dest_option_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_DEST_OPTION_T_FID_COUNT] = {
     bcmpkt_dest_option_t_hdr_ext_len_set,
     bcmpkt_dest_option_t_next_header_set,
     bcmpkt_dest_option_t_option_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_dest_option_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_DEST_OPTION_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_dest_option_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_DEST_OPTION_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_dest_option_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_DEST_OPTION_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_dest_option_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_dest_option_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_DEST_OPTION_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_dest_option_t_field_data,
 };
 
 
@@ -4142,7 +4123,7 @@ static int32_t bcmpkt_ep_nih_header_t_timestamp_set(uint32_t *data, int profile,
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_ep_nih_header_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_EP_NIH_HEADER_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_ep_nih_header_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT] = {
     bcmpkt_ep_nih_header_t_header_subtype_get,
     bcmpkt_ep_nih_header_t_header_type_get,
     bcmpkt_ep_nih_header_t_opaque_ctrl_a_get,
@@ -4157,7 +4138,7 @@ bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_ep_nih_header_t_fget[BCM56690
     bcmpkt_ep_nih_header_t_timestamp_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_ep_nih_header_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_EP_NIH_HEADER_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_ep_nih_header_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT] = {
     bcmpkt_ep_nih_header_t_header_subtype_set,
     bcmpkt_ep_nih_header_t_header_type_set,
     bcmpkt_ep_nih_header_t_opaque_ctrl_a_set,
@@ -4172,13 +4153,13 @@ bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_ep_nih_header_t_fset[BCM56690
     bcmpkt_ep_nih_header_t_timestamp_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_ep_nih_header_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_EP_NIH_HEADER_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_ep_nih_header_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_EP_NIH_HEADER_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_ep_nih_header_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_EP_NIH_HEADER_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_ep_nih_header_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_ep_nih_header_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_EP_NIH_HEADER_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_ep_nih_header_t_field_data,
 };
 
 
@@ -4318,7 +4299,7 @@ static int32_t bcmpkt_erspan3_fixed_hdr_t_vlan_set(uint32_t *data, int profile,
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_erspan3_fixed_hdr_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_erspan3_fixed_hdr_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
     bcmpkt_erspan3_fixed_hdr_t_bso_get,
     bcmpkt_erspan3_fixed_hdr_t_cos_get,
     bcmpkt_erspan3_fixed_hdr_t_gbp_sid_get,
@@ -4330,7 +4311,7 @@ bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_erspan3_fixed_hdr_t_fget[BCM5
     bcmpkt_erspan3_fixed_hdr_t_vlan_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_erspan3_fixed_hdr_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_erspan3_fixed_hdr_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT] = {
     bcmpkt_erspan3_fixed_hdr_t_bso_set,
     bcmpkt_erspan3_fixed_hdr_t_cos_set,
     bcmpkt_erspan3_fixed_hdr_t_gbp_sid_set,
@@ -4342,13 +4323,13 @@ bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_erspan3_fixed_hdr_t_fset[BCM5
     bcmpkt_erspan3_fixed_hdr_t_vlan_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_erspan3_fixed_hdr_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_erspan3_fixed_hdr_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_erspan3_fixed_hdr_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_erspan3_fixed_hdr_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_erspan3_fixed_hdr_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_FIXED_HDR_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_erspan3_fixed_hdr_t_field_data,
 };
 
 
@@ -4413,27 +4394,27 @@ static int32_t bcmpkt_erspan3_subhdr_5_t_timestamp_set(uint32_t *data, int profi
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_erspan3_subhdr_5_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_erspan3_subhdr_5_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
     bcmpkt_erspan3_subhdr_5_t_platform_id_get,
     bcmpkt_erspan3_subhdr_5_t_port_id_get,
     bcmpkt_erspan3_subhdr_5_t_switch_id_get,
     bcmpkt_erspan3_subhdr_5_t_timestamp_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_erspan3_subhdr_5_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_erspan3_subhdr_5_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT] = {
     bcmpkt_erspan3_subhdr_5_t_platform_id_set,
     bcmpkt_erspan3_subhdr_5_t_port_id_set,
     bcmpkt_erspan3_subhdr_5_t_switch_id_set,
     bcmpkt_erspan3_subhdr_5_t_timestamp_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_erspan3_subhdr_5_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_erspan3_subhdr_5_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_erspan3_subhdr_5_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_erspan3_subhdr_5_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_erspan3_subhdr_5_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ERSPAN3_SUBHDR_5_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_erspan3_subhdr_5_t_field_data,
 };
 
 
@@ -4514,7 +4495,7 @@ static int32_t bcmpkt_esp_t_spi_set(uint32_t *data, int profile, uint32_t val) {
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_esp_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ESP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_esp_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ESP_T_FID_COUNT] = {
     bcmpkt_esp_t_next_header_get,
     bcmpkt_esp_t_pad_get,
     bcmpkt_esp_t_pad_len_get,
@@ -4522,7 +4503,7 @@ bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_esp_t_fget[BCM56690_A0_DNA_6_
     bcmpkt_esp_t_spi_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_esp_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ESP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_esp_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ESP_T_FID_COUNT] = {
     bcmpkt_esp_t_next_header_set,
     bcmpkt_esp_t_pad_set,
     bcmpkt_esp_t_pad_len_set,
@@ -4530,13 +4511,13 @@ bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_esp_t_fset[BCM56690_A0_DNA_6_
     bcmpkt_esp_t_spi_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_esp_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ESP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_esp_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ESP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_esp_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ESP_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_esp_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_esp_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ESP_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_esp_t_field_data,
 };
 
 
@@ -4555,21 +4536,21 @@ static int32_t bcmpkt_ethertype_t_type_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_ethertype_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_ethertype_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
     bcmpkt_ethertype_t_type_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_ethertype_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_ethertype_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ETHERTYPE_T_FID_COUNT] = {
     bcmpkt_ethertype_t_type_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_ethertype_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_ethertype_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ETHERTYPE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_ethertype_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ETHERTYPE_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_ethertype_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_ethertype_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ETHERTYPE_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_ethertype_t_field_data,
 };
 
 
@@ -4634,27 +4615,27 @@ static int32_t bcmpkt_frag_t_reserved_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_frag_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_FRAG_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_frag_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_FRAG_T_FID_COUNT] = {
     bcmpkt_frag_t_frag_info_get,
     bcmpkt_frag_t_id_get,
     bcmpkt_frag_t_next_header_get,
     bcmpkt_frag_t_reserved_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_frag_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_FRAG_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_frag_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_FRAG_T_FID_COUNT] = {
     bcmpkt_frag_t_frag_info_set,
     bcmpkt_frag_t_id_set,
     bcmpkt_frag_t_next_header_set,
     bcmpkt_frag_t_reserved_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_frag_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_FRAG_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_frag_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_FRAG_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_frag_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_FRAG_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_frag_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_frag_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_FRAG_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_frag_t_field_data,
 };
 
 
@@ -4748,7 +4729,7 @@ static int32_t bcmpkt_gbp_ethernet_shim_t_ver_set(uint32_t *data, int profile, u
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_gbp_ethernet_shim_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GBP_ETHERNET_SHIM_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_gbp_ethernet_shim_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GBP_ETHERNET_SHIM_T_FID_COUNT] = {
     bcmpkt_gbp_ethernet_shim_t_ethertype_get,
     bcmpkt_gbp_ethernet_shim_t_flags_get,
     bcmpkt_gbp_ethernet_shim_t_reserved_get,
@@ -4757,7 +4738,7 @@ bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_gbp_ethernet_shim_t_fget[BCM5
     bcmpkt_gbp_ethernet_shim_t_ver_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_gbp_ethernet_shim_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GBP_ETHERNET_SHIM_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_gbp_ethernet_shim_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GBP_ETHERNET_SHIM_T_FID_COUNT] = {
     bcmpkt_gbp_ethernet_shim_t_ethertype_set,
     bcmpkt_gbp_ethernet_shim_t_flags_set,
     bcmpkt_gbp_ethernet_shim_t_reserved_set,
@@ -4766,13 +4747,13 @@ bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_gbp_ethernet_shim_t_fset[BCM5
     bcmpkt_gbp_ethernet_shim_t_ver_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_gbp_ethernet_shim_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GBP_ETHERNET_SHIM_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_gbp_ethernet_shim_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GBP_ETHERNET_SHIM_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_gbp_ethernet_shim_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GBP_ETHERNET_SHIM_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_gbp_ethernet_shim_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_gbp_ethernet_shim_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GBP_ETHERNET_SHIM_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_gbp_ethernet_shim_t_field_data,
 };
 
 
@@ -5001,7 +4982,7 @@ static int32_t bcmpkt_generic_loopback_t_start_byte_set(uint32_t *data, int prof
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_generic_loopback_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_generic_loopback_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
     bcmpkt_generic_loopback_t_destination_obj_get,
     bcmpkt_generic_loopback_t_destination_type_get,
     bcmpkt_generic_loopback_t_entropy_obj_get,
@@ -5019,7 +5000,7 @@ bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_generic_loopback_t_fget[BCM56
     bcmpkt_generic_loopback_t_start_byte_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_generic_loopback_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_generic_loopback_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT] = {
     bcmpkt_generic_loopback_t_destination_obj_set,
     bcmpkt_generic_loopback_t_destination_type_set,
     bcmpkt_generic_loopback_t_entropy_obj_set,
@@ -5037,13 +5018,13 @@ bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_generic_loopback_t_fset[BCM56
     bcmpkt_generic_loopback_t_start_byte_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_generic_loopback_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_generic_loopback_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_generic_loopback_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_generic_loopback_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_generic_loopback_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GENERIC_LOOPBACK_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_generic_loopback_t_field_data,
 };
 
 
@@ -5122,7 +5103,7 @@ static int32_t bcmpkt_gpe_t_vni_set(uint32_t *data, int profile, uint32_t val) {
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_gpe_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GPE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_gpe_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GPE_T_FID_COUNT] = {
     bcmpkt_gpe_t_flags_get,
     bcmpkt_gpe_t_next_protocol_get,
     bcmpkt_gpe_t_reserved0_get,
@@ -5130,7 +5111,7 @@ bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_gpe_t_fget[BCM56690_A0_DNA_6_
     bcmpkt_gpe_t_vni_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_gpe_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GPE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_gpe_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GPE_T_FID_COUNT] = {
     bcmpkt_gpe_t_flags_set,
     bcmpkt_gpe_t_next_protocol_set,
     bcmpkt_gpe_t_reserved0_set,
@@ -5138,13 +5119,13 @@ bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_gpe_t_fset[BCM56690_A0_DNA_6_
     bcmpkt_gpe_t_vni_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_gpe_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GPE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_gpe_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GPE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_gpe_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GPE_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_gpe_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_gpe_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GPE_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_gpe_t_field_data,
 };
 
 
@@ -5178,23 +5159,23 @@ static int32_t bcmpkt_gre_chksum_t_offset_set(uint32_t *data, int profile, uint3
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_gre_chksum_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_CHKSUM_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_gre_chksum_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT] = {
     bcmpkt_gre_chksum_t_checksum_get,
     bcmpkt_gre_chksum_t_offset_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_gre_chksum_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_CHKSUM_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_gre_chksum_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT] = {
     bcmpkt_gre_chksum_t_checksum_set,
     bcmpkt_gre_chksum_t_offset_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_gre_chksum_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_CHKSUM_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_gre_chksum_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_CHKSUM_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_gre_chksum_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_CHKSUM_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_gre_chksum_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_gre_chksum_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_CHKSUM_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_gre_chksum_t_field_data,
 };
 
 
@@ -5214,21 +5195,21 @@ static int32_t bcmpkt_gre_key_t_key_set(uint32_t *data, int profile, uint32_t va
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_gre_key_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_KEY_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_gre_key_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_KEY_T_FID_COUNT] = {
     bcmpkt_gre_key_t_key_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_gre_key_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_KEY_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_gre_key_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_KEY_T_FID_COUNT] = {
     bcmpkt_gre_key_t_key_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_gre_key_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_KEY_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_gre_key_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_KEY_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_gre_key_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_KEY_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_gre_key_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_gre_key_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_KEY_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_gre_key_t_field_data,
 };
 
 
@@ -5248,21 +5229,21 @@ static int32_t bcmpkt_gre_rout_t_routing_set(uint32_t *data, int profile, uint32
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_gre_rout_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_ROUT_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_gre_rout_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_ROUT_T_FID_COUNT] = {
     bcmpkt_gre_rout_t_routing_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_gre_rout_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_ROUT_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_gre_rout_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_ROUT_T_FID_COUNT] = {
     bcmpkt_gre_rout_t_routing_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_gre_rout_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_ROUT_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_gre_rout_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_ROUT_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_gre_rout_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_ROUT_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_gre_rout_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_gre_rout_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_ROUT_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_gre_rout_t_field_data,
 };
 
 
@@ -5282,21 +5263,21 @@ static int32_t bcmpkt_gre_seq_t_sequence_set(uint32_t *data, int profile, uint32
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_gre_seq_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_SEQ_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_gre_seq_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_SEQ_T_FID_COUNT] = {
     bcmpkt_gre_seq_t_sequence_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_gre_seq_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_SEQ_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_gre_seq_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_SEQ_T_FID_COUNT] = {
     bcmpkt_gre_seq_t_sequence_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_gre_seq_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_SEQ_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_gre_seq_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_SEQ_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_gre_seq_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_SEQ_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_gre_seq_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_gre_seq_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_SEQ_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_gre_seq_t_field_data,
 };
 
 
@@ -5360,27 +5341,27 @@ static int32_t bcmpkt_gre_t_version_set(uint32_t *data, int profile, uint32_t va
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_gre_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_gre_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_T_FID_COUNT] = {
     bcmpkt_gre_t_c_r_k_s_get,
     bcmpkt_gre_t_protocol_get,
     bcmpkt_gre_t_reserved_get,
     bcmpkt_gre_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_gre_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_gre_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_T_FID_COUNT] = {
     bcmpkt_gre_t_c_r_k_s_set,
     bcmpkt_gre_t_protocol_set,
     bcmpkt_gre_t_reserved_set,
     bcmpkt_gre_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_gre_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_gre_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_gre_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_GRE_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_gre_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_gre_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_GRE_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_gre_t_field_data,
 };
 
 
@@ -5579,7 +5560,7 @@ static int32_t bcmpkt_hg3_base_t_version_set(uint32_t *data, int profile, uint32
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_hg3_base_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_hg3_base_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_FID_COUNT] = {
     bcmpkt_hg3_base_t_cn_get,
     bcmpkt_hg3_base_t_cng_get,
     bcmpkt_hg3_base_t_entropy_get,
@@ -5595,7 +5576,7 @@ bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_hg3_base_t_fget[BCM56690_A0_D
     bcmpkt_hg3_base_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_hg3_base_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_hg3_base_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_FID_COUNT] = {
     bcmpkt_hg3_base_t_cn_set,
     bcmpkt_hg3_base_t_cng_set,
     bcmpkt_hg3_base_t_entropy_set,
@@ -5611,13 +5592,13 @@ bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_hg3_base_t_fset[BCM56690_A0_D
     bcmpkt_hg3_base_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_hg3_base_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_hg3_base_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_hg3_base_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_BASE_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_hg3_base_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_hg3_base_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_BASE_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_hg3_base_t_field_data,
 };
 
 
@@ -5711,7 +5692,7 @@ static int32_t bcmpkt_hg3_extension_0_t_svp_set(uint32_t *data, int profile, uin
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_hg3_extension_0_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_hg3_extension_0_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT] = {
     bcmpkt_hg3_extension_0_t_class_id_lsb_get,
     bcmpkt_hg3_extension_0_t_class_id_msb_get,
     bcmpkt_hg3_extension_0_t_dvp_or_l3_iif_get,
@@ -5720,7 +5701,7 @@ bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_hg3_extension_0_t_fget[BCM566
     bcmpkt_hg3_extension_0_t_svp_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_hg3_extension_0_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_hg3_extension_0_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT] = {
     bcmpkt_hg3_extension_0_t_class_id_lsb_set,
     bcmpkt_hg3_extension_0_t_class_id_msb_set,
     bcmpkt_hg3_extension_0_t_dvp_or_l3_iif_set,
@@ -5729,13 +5710,13 @@ bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_hg3_extension_0_t_fset[BCM566
     bcmpkt_hg3_extension_0_t_svp_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_hg3_extension_0_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_EXTENSION_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_hg3_extension_0_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_EXTENSION_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_hg3_extension_0_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_hg3_extension_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_hg3_extension_0_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HG3_EXTENSION_0_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_hg3_extension_0_t_field_data,
 };
 
 
@@ -5785,25 +5766,25 @@ static int32_t bcmpkt_hop_by_hop_t_option_set(uint32_t *data, int profile, uint3
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_hop_by_hop_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HOP_BY_HOP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_hop_by_hop_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT] = {
     bcmpkt_hop_by_hop_t_hdr_ext_len_get,
     bcmpkt_hop_by_hop_t_next_header_get,
     bcmpkt_hop_by_hop_t_option_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_hop_by_hop_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HOP_BY_HOP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_hop_by_hop_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT] = {
     bcmpkt_hop_by_hop_t_hdr_ext_len_set,
     bcmpkt_hop_by_hop_t_next_header_set,
     bcmpkt_hop_by_hop_t_option_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_hop_by_hop_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HOP_BY_HOP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_hop_by_hop_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HOP_BY_HOP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_hop_by_hop_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_HOP_BY_HOP_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_hop_by_hop_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_hop_by_hop_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_HOP_BY_HOP_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_hop_by_hop_t_field_data,
 };
 
 
@@ -5852,503 +5833,388 @@ static int32_t bcmpkt_icmp_t_icmp_type_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_icmp_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ICMP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_icmp_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ICMP_T_FID_COUNT] = {
     bcmpkt_icmp_t_checksum_get,
     bcmpkt_icmp_t_code_get,
     bcmpkt_icmp_t_icmp_type_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_icmp_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ICMP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_icmp_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ICMP_T_FID_COUNT] = {
     bcmpkt_icmp_t_checksum_set,
     bcmpkt_icmp_t_code_set,
     bcmpkt_icmp_t_icmp_type_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_icmp_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_icmp_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ICMP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_icmp_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ICMP_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_icmp_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_icmp_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ICMP_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_icmp_t_field_data,
 };
 
 
-static int32_t bcmpkt_ifa_flex_md_0_a_t_fwd_hdr_ttl_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[0], 0, 8);
-
-    return ret;
-}
-
-static int32_t bcmpkt_ifa_flex_md_0_a_t_fwd_hdr_ttl_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[0], 0, 8, val);
-    return ret;
-}
-
-static int32_t bcmpkt_ifa_flex_md_0_a_t_lns_device_id_get(uint32_t *data, int profile, uint32_t *val) {
+static int32_t bcmpkt_ifa_header_t_flags_get(uint32_t *data, int profile, uint32_t *val) {
     int32_t ret = SHR_E_NONE;
 
-    *val = WORD_FIELD_GET(data[0], 8, 24);
+    *val = WORD_FIELD_GET(data[0], 8, 8);
 
     return ret;
 }
 
-static int32_t bcmpkt_ifa_flex_md_0_a_t_lns_device_id_set(uint32_t *data, int profile, uint32_t val) {
+static int32_t bcmpkt_ifa_header_t_flags_set(uint32_t *data, int profile, uint32_t val) {
     int32_t ret = SHR_E_NONE;
 
-    WORD_FIELD_SET(data[0], 8, 24, val);
+    WORD_FIELD_SET(data[0], 8, 8, val);
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_0_a_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT] = {
-    bcmpkt_ifa_flex_md_0_a_t_fwd_hdr_ttl_get,
-    bcmpkt_ifa_flex_md_0_a_t_lns_device_id_get,
-};
-
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_0_a_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT] = {
-    bcmpkt_ifa_flex_md_0_a_t_fwd_hdr_ttl_set,
-    bcmpkt_ifa_flex_md_0_a_t_lns_device_id_set,
-};
-
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_0_a_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_0_A_T_FIELD_NAME_MAP_INIT
-};
-
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_0_a_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_0_A_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_0_a_t_field_data,
-};
-
-
-static int32_t bcmpkt_ifa_flex_md_0_b_t_cn_get(uint32_t *data, int profile, uint32_t *val) {
+static int32_t bcmpkt_ifa_header_t_gns_get(uint32_t *data, int profile, uint32_t *val) {
     int32_t ret = SHR_E_NONE;
 
-    *val = WORD_FIELD_GET(data[0], 26, 2);
+    *val = WORD_FIELD_GET(data[0], 24, 4);
 
     return ret;
 }
 
-static int32_t bcmpkt_ifa_flex_md_0_b_t_cn_set(uint32_t *data, int profile, uint32_t val) {
+static int32_t bcmpkt_ifa_header_t_gns_set(uint32_t *data, int profile, uint32_t val) {
     int32_t ret = SHR_E_NONE;
 
-    WORD_FIELD_SET(data[0], 26, 2, val);
+    WORD_FIELD_SET(data[0], 24, 4, val);
     return ret;
 }
 
-static int32_t bcmpkt_ifa_flex_md_0_b_t_port_speed_get(uint32_t *data, int profile, uint32_t *val) {
+static int32_t bcmpkt_ifa_header_t_max_length_get(uint32_t *data, int profile, uint32_t *val) {
     int32_t ret = SHR_E_NONE;
 
-    *val = WORD_FIELD_GET(data[0], 28, 4);
+    *val = WORD_FIELD_GET(data[0], 0, 8);
 
     return ret;
 }
 
-static int32_t bcmpkt_ifa_flex_md_0_b_t_port_speed_set(uint32_t *data, int profile, uint32_t val) {
+static int32_t bcmpkt_ifa_header_t_max_length_set(uint32_t *data, int profile, uint32_t val) {
     int32_t ret = SHR_E_NONE;
 
-    WORD_FIELD_SET(data[0], 28, 4, val);
+    WORD_FIELD_SET(data[0], 0, 8, val);
     return ret;
 }
 
-static int32_t bcmpkt_ifa_flex_md_0_b_t_queue_id_get(uint32_t *data, int profile, uint32_t *val) {
+static int32_t bcmpkt_ifa_header_t_next_hdr_get(uint32_t *data, int profile, uint32_t *val) {
     int32_t ret = SHR_E_NONE;
 
-    *val = WORD_FIELD_GET(data[0], 20, 6);
+    *val = WORD_FIELD_GET(data[0], 16, 8);
 
     return ret;
 }
 
-static int32_t bcmpkt_ifa_flex_md_0_b_t_queue_id_set(uint32_t *data, int profile, uint32_t val) {
+static int32_t bcmpkt_ifa_header_t_next_hdr_set(uint32_t *data, int profile, uint32_t val) {
     int32_t ret = SHR_E_NONE;
 
-    WORD_FIELD_SET(data[0], 20, 6, val);
+    WORD_FIELD_SET(data[0], 16, 8, val);
     return ret;
 }
 
-static int32_t bcmpkt_ifa_flex_md_0_b_t_rx_timestamp_sec_get(uint32_t *data, int profile, uint32_t *val) {
+static int32_t bcmpkt_ifa_header_t_ver_get(uint32_t *data, int profile, uint32_t *val) {
     int32_t ret = SHR_E_NONE;
 
-    *val = WORD_FIELD_GET(data[0], 0, 20);
+    *val = WORD_FIELD_GET(data[0], 28, 4);
 
     return ret;
 }
 
-static int32_t bcmpkt_ifa_flex_md_0_b_t_rx_timestamp_sec_set(uint32_t *data, int profile, uint32_t val) {
+static int32_t bcmpkt_ifa_header_t_ver_set(uint32_t *data, int profile, uint32_t val) {
     int32_t ret = SHR_E_NONE;
 
-    WORD_FIELD_SET(data[0], 0, 20, val);
+    WORD_FIELD_SET(data[0], 28, 4, val);
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_0_b_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT] = {
-    bcmpkt_ifa_flex_md_0_b_t_cn_get,
-    bcmpkt_ifa_flex_md_0_b_t_port_speed_get,
-    bcmpkt_ifa_flex_md_0_b_t_queue_id_get,
-    bcmpkt_ifa_flex_md_0_b_t_rx_timestamp_sec_get,
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_ifa_header_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_HEADER_T_FID_COUNT] = {
+    bcmpkt_ifa_header_t_flags_get,
+    bcmpkt_ifa_header_t_gns_get,
+    bcmpkt_ifa_header_t_max_length_get,
+    bcmpkt_ifa_header_t_next_hdr_get,
+    bcmpkt_ifa_header_t_ver_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_0_b_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT] = {
-    bcmpkt_ifa_flex_md_0_b_t_cn_set,
-    bcmpkt_ifa_flex_md_0_b_t_port_speed_set,
-    bcmpkt_ifa_flex_md_0_b_t_queue_id_set,
-    bcmpkt_ifa_flex_md_0_b_t_rx_timestamp_sec_set,
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_ifa_header_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_HEADER_T_FID_COUNT] = {
+    bcmpkt_ifa_header_t_flags_set,
+    bcmpkt_ifa_header_t_gns_set,
+    bcmpkt_ifa_header_t_max_length_set,
+    bcmpkt_ifa_header_t_next_hdr_set,
+    bcmpkt_ifa_header_t_ver_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_0_b_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_0_B_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_ifa_header_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_HEADER_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_0_b_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_0_B_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_0_b_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_ifa_header_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_HEADER_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_ifa_header_t_field_data,
 };
 
 
-static int32_t bcmpkt_ifa_flex_md_1_t_egress_port_id_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[0], 16, 16);
-
-    return ret;
-}
-
-static int32_t bcmpkt_ifa_flex_md_1_t_egress_port_id_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[0], 16, 16, val);
-    return ret;
-}
-
-static int32_t bcmpkt_ifa_flex_md_1_t_ingress_port_id_get(uint32_t *data, int profile, uint32_t *val) {
+static int32_t bcmpkt_ifa_metadata_a_t_cn_get(uint32_t *data, int profile, uint32_t *val) {
     int32_t ret = SHR_E_NONE;
 
-    *val = WORD_FIELD_GET(data[0], 0, 16);
+    *val = WORD_FIELD_GET(data[1], 26, 2);
 
     return ret;
 }
 
-static int32_t bcmpkt_ifa_flex_md_1_t_ingress_port_id_set(uint32_t *data, int profile, uint32_t val) {
+static int32_t bcmpkt_ifa_metadata_a_t_cn_set(uint32_t *data, int profile, uint32_t val) {
     int32_t ret = SHR_E_NONE;
 
-    WORD_FIELD_SET(data[0], 0, 16, val);
+    WORD_FIELD_SET(data[1], 26, 2, val);
     return ret;
 }
 
-static int32_t bcmpkt_ifa_flex_md_1_t_rx_timestamp_nanosec_get(uint32_t *data, int profile, uint32_t *val) {
+static int32_t bcmpkt_ifa_metadata_a_t_fwd_hdr_ttl_get(uint32_t *data, int profile, uint32_t *val) {
     int32_t ret = SHR_E_NONE;
 
-    ret = SHR_E_PARAM;
+    *val = WORD_FIELD_GET(data[0], 0, 8);
 
     return ret;
 }
 
-static int32_t bcmpkt_ifa_flex_md_1_t_rx_timestamp_nanosec_set(uint32_t *data, int profile, uint32_t val) {
+static int32_t bcmpkt_ifa_metadata_a_t_fwd_hdr_ttl_set(uint32_t *data, int profile, uint32_t val) {
     int32_t ret = SHR_E_NONE;
 
-    ret = SHR_E_PARAM;
-
+    WORD_FIELD_SET(data[0], 0, 8, val);
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_1_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT] = {
-    bcmpkt_ifa_flex_md_1_t_egress_port_id_get,
-    bcmpkt_ifa_flex_md_1_t_ingress_port_id_get,
-    bcmpkt_ifa_flex_md_1_t_rx_timestamp_nanosec_get,
-};
-
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_1_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT] = {
-    bcmpkt_ifa_flex_md_1_t_egress_port_id_set,
-    bcmpkt_ifa_flex_md_1_t_ingress_port_id_set,
-    bcmpkt_ifa_flex_md_1_t_rx_timestamp_nanosec_set,
-};
-
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_1_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_1_T_FIELD_NAME_MAP_INIT
-};
-
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_1_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_1_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_1_t_field_data,
-};
-
-
-static int32_t bcmpkt_ifa_flex_md_2_t_residence_time_nanosec_get(uint32_t *data, int profile, uint32_t *val) {
+static int32_t bcmpkt_ifa_metadata_a_t_lns_device_id_get(uint32_t *data, int profile, uint32_t *val) {
     int32_t ret = SHR_E_NONE;
 
-    ret = SHR_E_PARAM;
+    *val = WORD_FIELD_GET(data[0], 8, 24);
 
     return ret;
 }
 
-static int32_t bcmpkt_ifa_flex_md_2_t_residence_time_nanosec_set(uint32_t *data, int profile, uint32_t val) {
+static int32_t bcmpkt_ifa_metadata_a_t_lns_device_id_set(uint32_t *data, int profile, uint32_t val) {
     int32_t ret = SHR_E_NONE;
 
-    ret = SHR_E_PARAM;
-
+    WORD_FIELD_SET(data[0], 8, 24, val);
     return ret;
 }
 
-static int32_t bcmpkt_ifa_flex_md_2_t_tx_queue_byte_count_get(uint32_t *data, int profile, uint32_t *val) {
+static int32_t bcmpkt_ifa_metadata_a_t_port_speed_get(uint32_t *data, int profile, uint32_t *val) {
     int32_t ret = SHR_E_NONE;
 
-    ret = SHR_E_PARAM;
+    *val = WORD_FIELD_GET(data[1], 28, 4);
 
     return ret;
 }
 
-static int32_t bcmpkt_ifa_flex_md_2_t_tx_queue_byte_count_set(uint32_t *data, int profile, uint32_t val) {
+static int32_t bcmpkt_ifa_metadata_a_t_port_speed_set(uint32_t *data, int profile, uint32_t val) {
     int32_t ret = SHR_E_NONE;
 
-    ret = SHR_E_PARAM;
-
+    WORD_FIELD_SET(data[1], 28, 4, val);
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_2_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT] = {
-    bcmpkt_ifa_flex_md_2_t_residence_time_nanosec_get,
-    bcmpkt_ifa_flex_md_2_t_tx_queue_byte_count_get,
-};
-
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_2_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT] = {
-    bcmpkt_ifa_flex_md_2_t_residence_time_nanosec_set,
-    bcmpkt_ifa_flex_md_2_t_tx_queue_byte_count_set,
-};
-
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_2_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_2_T_FIELD_NAME_MAP_INIT
-};
-
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_2_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_2_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_2_t_field_data,
-};
-
-
-static int32_t bcmpkt_ifa_flex_md_3_t_mmu_stat_0_get(uint32_t *data, int profile, uint32_t *val) {
+static int32_t bcmpkt_ifa_metadata_a_t_queue_id_get(uint32_t *data, int profile, uint32_t *val) {
     int32_t ret = SHR_E_NONE;
 
-    ret = SHR_E_PARAM;
+    *val = WORD_FIELD_GET(data[1], 20, 6);
 
     return ret;
 }
 
-static int32_t bcmpkt_ifa_flex_md_3_t_mmu_stat_0_set(uint32_t *data, int profile, uint32_t val) {
+static int32_t bcmpkt_ifa_metadata_a_t_queue_id_set(uint32_t *data, int profile, uint32_t val) {
     int32_t ret = SHR_E_NONE;
 
-    ret = SHR_E_PARAM;
-
+    WORD_FIELD_SET(data[1], 20, 6, val);
     return ret;
 }
 
-static int32_t bcmpkt_ifa_flex_md_3_t_mmu_stat_1_get(uint32_t *data, int profile, uint32_t *val) {
+static int32_t bcmpkt_ifa_metadata_a_t_rx_timestamp_sec_get(uint32_t *data, int profile, uint32_t *val) {
     int32_t ret = SHR_E_NONE;
 
-    ret = SHR_E_PARAM;
+    *val = WORD_FIELD_GET(data[1], 0, 20);
 
     return ret;
 }
 
-static int32_t bcmpkt_ifa_flex_md_3_t_mmu_stat_1_set(uint32_t *data, int profile, uint32_t val) {
+static int32_t bcmpkt_ifa_metadata_a_t_rx_timestamp_sec_set(uint32_t *data, int profile, uint32_t val) {
     int32_t ret = SHR_E_NONE;
 
-    ret = SHR_E_PARAM;
-
+    WORD_FIELD_SET(data[1], 0, 20, val);
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_3_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT] = {
-    bcmpkt_ifa_flex_md_3_t_mmu_stat_0_get,
-    bcmpkt_ifa_flex_md_3_t_mmu_stat_1_get,
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_ifa_metadata_a_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_A_T_FID_COUNT] = {
+    bcmpkt_ifa_metadata_a_t_cn_get,
+    bcmpkt_ifa_metadata_a_t_fwd_hdr_ttl_get,
+    bcmpkt_ifa_metadata_a_t_lns_device_id_get,
+    bcmpkt_ifa_metadata_a_t_port_speed_get,
+    bcmpkt_ifa_metadata_a_t_queue_id_get,
+    bcmpkt_ifa_metadata_a_t_rx_timestamp_sec_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_3_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT] = {
-    bcmpkt_ifa_flex_md_3_t_mmu_stat_0_set,
-    bcmpkt_ifa_flex_md_3_t_mmu_stat_1_set,
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_ifa_metadata_a_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_A_T_FID_COUNT] = {
+    bcmpkt_ifa_metadata_a_t_cn_set,
+    bcmpkt_ifa_metadata_a_t_fwd_hdr_ttl_set,
+    bcmpkt_ifa_metadata_a_t_lns_device_id_set,
+    bcmpkt_ifa_metadata_a_t_port_speed_set,
+    bcmpkt_ifa_metadata_a_t_queue_id_set,
+    bcmpkt_ifa_metadata_a_t_rx_timestamp_sec_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_3_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_3_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_ifa_metadata_a_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_A_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_3_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_FLEX_MD_3_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_3_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_ifa_metadata_a_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_A_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_ifa_metadata_a_t_field_data,
 };
 
 
-static int32_t bcmpkt_ifa_header_t_flags_get(uint32_t *data, int profile, uint32_t *val) {
+static int32_t bcmpkt_ifa_metadata_b_t_egress_port_id_get(uint32_t *data, int profile, uint32_t *val) {
     int32_t ret = SHR_E_NONE;
 
-    *val = WORD_FIELD_GET(data[0], 8, 8);
+    *val = WORD_FIELD_GET(data[0], 16, 16);
 
     return ret;
 }
 
-static int32_t bcmpkt_ifa_header_t_flags_set(uint32_t *data, int profile, uint32_t val) {
+static int32_t bcmpkt_ifa_metadata_b_t_egress_port_id_set(uint32_t *data, int profile, uint32_t val) {
     int32_t ret = SHR_E_NONE;
 
-    WORD_FIELD_SET(data[0], 8, 8, val);
+    WORD_FIELD_SET(data[0], 16, 16, val);
     return ret;
 }
 
-static int32_t bcmpkt_ifa_header_t_gns_get(uint32_t *data, int profile, uint32_t *val) {
+static int32_t bcmpkt_ifa_metadata_b_t_ingress_port_id_get(uint32_t *data, int profile, uint32_t *val) {
     int32_t ret = SHR_E_NONE;
 
-    *val = WORD_FIELD_GET(data[0], 24, 4);
+    *val = WORD_FIELD_GET(data[0], 0, 16);
 
     return ret;
 }
 
-static int32_t bcmpkt_ifa_header_t_gns_set(uint32_t *data, int profile, uint32_t val) {
+static int32_t bcmpkt_ifa_metadata_b_t_ingress_port_id_set(uint32_t *data, int profile, uint32_t val) {
     int32_t ret = SHR_E_NONE;
 
-    WORD_FIELD_SET(data[0], 24, 4, val);
+    WORD_FIELD_SET(data[0], 0, 16, val);
     return ret;
 }
 
-static int32_t bcmpkt_ifa_header_t_max_length_get(uint32_t *data, int profile, uint32_t *val) {
+static int32_t bcmpkt_ifa_metadata_b_t_mmu_stat_0_get(uint32_t *data, int profile, uint32_t *val) {
     int32_t ret = SHR_E_NONE;
 
-    *val = WORD_FIELD_GET(data[0], 0, 8);
-
-    return ret;
-}
-
-static int32_t bcmpkt_ifa_header_t_max_length_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
+    ret = SHR_E_PARAM;
 
-    WORD_FIELD_SET(data[0], 0, 8, val);
     return ret;
 }
 
-static int32_t bcmpkt_ifa_header_t_next_hdr_get(uint32_t *data, int profile, uint32_t *val) {
+static int32_t bcmpkt_ifa_metadata_b_t_mmu_stat_0_set(uint32_t *data, int profile, uint32_t val) {
     int32_t ret = SHR_E_NONE;
 
-    *val = WORD_FIELD_GET(data[0], 16, 8);
-
-    return ret;
-}
-
-static int32_t bcmpkt_ifa_header_t_next_hdr_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
+    ret = SHR_E_PARAM;
 
-    WORD_FIELD_SET(data[0], 16, 8, val);
     return ret;
 }
 
-static int32_t bcmpkt_ifa_header_t_ver_get(uint32_t *data, int profile, uint32_t *val) {
+static int32_t bcmpkt_ifa_metadata_b_t_mmu_stat_1_get(uint32_t *data, int profile, uint32_t *val) {
     int32_t ret = SHR_E_NONE;
 
-    *val = WORD_FIELD_GET(data[0], 28, 4);
+    ret = SHR_E_PARAM;
 
     return ret;
 }
 
-static int32_t bcmpkt_ifa_header_t_ver_set(uint32_t *data, int profile, uint32_t val) {
+static int32_t bcmpkt_ifa_metadata_b_t_mmu_stat_1_set(uint32_t *data, int profile, uint32_t val) {
     int32_t ret = SHR_E_NONE;
 
-    WORD_FIELD_SET(data[0], 28, 4, val);
+    ret = SHR_E_PARAM;
+
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_ifa_header_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_HEADER_T_FID_COUNT] = {
-    bcmpkt_ifa_header_t_flags_get,
-    bcmpkt_ifa_header_t_gns_get,
-    bcmpkt_ifa_header_t_max_length_get,
-    bcmpkt_ifa_header_t_next_hdr_get,
-    bcmpkt_ifa_header_t_ver_get,
-};
-
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_ifa_header_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_HEADER_T_FID_COUNT] = {
-    bcmpkt_ifa_header_t_flags_set,
-    bcmpkt_ifa_header_t_gns_set,
-    bcmpkt_ifa_header_t_max_length_set,
-    bcmpkt_ifa_header_t_next_hdr_set,
-    bcmpkt_ifa_header_t_ver_set,
-};
-
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_ifa_header_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_HEADER_T_FIELD_NAME_MAP_INIT
-};
-
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_ifa_header_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_HEADER_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_ifa_header_t_field_data,
-};
-
-
-static int32_t bcmpkt_ifa_md_base_t_action_vector_get(uint32_t *data, int profile, uint32_t *val) {
+static int32_t bcmpkt_ifa_metadata_b_t_residence_time_nanosec_get(uint32_t *data, int profile, uint32_t *val) {
     int32_t ret = SHR_E_NONE;
 
-    *val = WORD_FIELD_GET(data[0], 16, 8);
+    ret = SHR_E_PARAM;
 
     return ret;
 }
 
-static int32_t bcmpkt_ifa_md_base_t_action_vector_set(uint32_t *data, int profile, uint32_t val) {
+static int32_t bcmpkt_ifa_metadata_b_t_residence_time_nanosec_set(uint32_t *data, int profile, uint32_t val) {
     int32_t ret = SHR_E_NONE;
 
-    WORD_FIELD_SET(data[0], 16, 8, val);
+    ret = SHR_E_PARAM;
+
     return ret;
 }
 
-static int32_t bcmpkt_ifa_md_base_t_hop_limit_current_length_get(uint32_t *data, int profile, uint32_t *val) {
+static int32_t bcmpkt_ifa_metadata_b_t_rx_timestamp_nanosec_get(uint32_t *data, int profile, uint32_t *val) {
     int32_t ret = SHR_E_NONE;
 
-    *val = WORD_FIELD_GET(data[0], 0, 16);
+    ret = SHR_E_PARAM;
 
     return ret;
 }
 
-static int32_t bcmpkt_ifa_md_base_t_hop_limit_current_length_set(uint32_t *data, int profile, uint32_t val) {
+static int32_t bcmpkt_ifa_metadata_b_t_rx_timestamp_nanosec_set(uint32_t *data, int profile, uint32_t val) {
     int32_t ret = SHR_E_NONE;
 
-    WORD_FIELD_SET(data[0], 0, 16, val);
+    ret = SHR_E_PARAM;
+
     return ret;
 }
 
-static int32_t bcmpkt_ifa_md_base_t_request_vector_get(uint32_t *data, int profile, uint32_t *val) {
+static int32_t bcmpkt_ifa_metadata_b_t_tx_queue_byte_count_get(uint32_t *data, int profile, uint32_t *val) {
     int32_t ret = SHR_E_NONE;
 
-    *val = WORD_FIELD_GET(data[0], 24, 8);
+    ret = SHR_E_PARAM;
 
     return ret;
 }
 
-static int32_t bcmpkt_ifa_md_base_t_request_vector_set(uint32_t *data, int profile, uint32_t val) {
+static int32_t bcmpkt_ifa_metadata_b_t_tx_queue_byte_count_set(uint32_t *data, int profile, uint32_t val) {
     int32_t ret = SHR_E_NONE;
 
-    WORD_FIELD_SET(data[0], 24, 8, val);
+    ret = SHR_E_PARAM;
+
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_ifa_md_base_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_MD_BASE_T_FID_COUNT] = {
-    bcmpkt_ifa_md_base_t_action_vector_get,
-    bcmpkt_ifa_md_base_t_hop_limit_current_length_get,
-    bcmpkt_ifa_md_base_t_request_vector_get,
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_ifa_metadata_b_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_B_T_FID_COUNT] = {
+    bcmpkt_ifa_metadata_b_t_egress_port_id_get,
+    bcmpkt_ifa_metadata_b_t_ingress_port_id_get,
+    bcmpkt_ifa_metadata_b_t_mmu_stat_0_get,
+    bcmpkt_ifa_metadata_b_t_mmu_stat_1_get,
+    bcmpkt_ifa_metadata_b_t_residence_time_nanosec_get,
+    bcmpkt_ifa_metadata_b_t_rx_timestamp_nanosec_get,
+    bcmpkt_ifa_metadata_b_t_tx_queue_byte_count_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_ifa_md_base_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_MD_BASE_T_FID_COUNT] = {
-    bcmpkt_ifa_md_base_t_action_vector_set,
-    bcmpkt_ifa_md_base_t_hop_limit_current_length_set,
-    bcmpkt_ifa_md_base_t_request_vector_set,
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_ifa_metadata_b_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_B_T_FID_COUNT] = {
+    bcmpkt_ifa_metadata_b_t_egress_port_id_set,
+    bcmpkt_ifa_metadata_b_t_ingress_port_id_set,
+    bcmpkt_ifa_metadata_b_t_mmu_stat_0_set,
+    bcmpkt_ifa_metadata_b_t_mmu_stat_1_set,
+    bcmpkt_ifa_metadata_b_t_residence_time_nanosec_set,
+    bcmpkt_ifa_metadata_b_t_rx_timestamp_nanosec_set,
+    bcmpkt_ifa_metadata_b_t_tx_queue_byte_count_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_ifa_md_base_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_MD_BASE_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_ifa_metadata_b_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_B_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_ifa_md_base_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_MD_BASE_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_ifa_md_base_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_ifa_metadata_b_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_B_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_ifa_metadata_b_t_field_data,
 };
 
 
-static int32_t bcmpkt_ifa_metadata_t_action_vector_get(uint32_t *data, int profile, uint32_t *val) {
+static int32_t bcmpkt_ifa_metadata_base_t_action_vector_get(uint32_t *data, int profile, uint32_t *val) {
     int32_t ret = SHR_E_NONE;
 
     *val = WORD_FIELD_GET(data[0], 16, 8);
@@ -6356,14 +6222,14 @@ static int32_t bcmpkt_ifa_metadata_t_action_vector_get(uint32_t *data, int profi
     return ret;
 }
 
-static int32_t bcmpkt_ifa_metadata_t_action_vector_set(uint32_t *data, int profile, uint32_t val) {
+static int32_t bcmpkt_ifa_metadata_base_t_action_vector_set(uint32_t *data, int profile, uint32_t val) {
     int32_t ret = SHR_E_NONE;
 
     WORD_FIELD_SET(data[0], 16, 8, val);
     return ret;
 }
 
-static int32_t bcmpkt_ifa_metadata_t_hop_limit_current_length_get(uint32_t *data, int profile, uint32_t *val) {
+static int32_t bcmpkt_ifa_metadata_base_t_hop_limit_current_length_get(uint32_t *data, int profile, uint32_t *val) {
     int32_t ret = SHR_E_NONE;
 
     *val = WORD_FIELD_GET(data[0], 0, 16);
@@ -6371,30 +6237,14 @@ static int32_t bcmpkt_ifa_metadata_t_hop_limit_current_length_get(uint32_t *data
     return ret;
 }
 
-static int32_t bcmpkt_ifa_metadata_t_hop_limit_current_length_set(uint32_t *data, int profile, uint32_t val) {
+static int32_t bcmpkt_ifa_metadata_base_t_hop_limit_current_length_set(uint32_t *data, int profile, uint32_t val) {
     int32_t ret = SHR_E_NONE;
 
     WORD_FIELD_SET(data[0], 0, 16, val);
     return ret;
 }
 
-static int32_t bcmpkt_ifa_metadata_t_metadata_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    ret = SHR_E_PARAM;
-
-    return ret;
-}
-
-static int32_t bcmpkt_ifa_metadata_t_metadata_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    ret = SHR_E_PARAM;
-
-    return ret;
-}
-
-static int32_t bcmpkt_ifa_metadata_t_request_vector_get(uint32_t *data, int profile, uint32_t *val) {
+static int32_t bcmpkt_ifa_metadata_base_t_request_vector_get(uint32_t *data, int profile, uint32_t *val) {
     int32_t ret = SHR_E_NONE;
 
     *val = WORD_FIELD_GET(data[0], 24, 8);
@@ -6402,34 +6252,32 @@ static int32_t bcmpkt_ifa_metadata_t_request_vector_get(uint32_t *data, int prof
     return ret;
 }
 
-static int32_t bcmpkt_ifa_metadata_t_request_vector_set(uint32_t *data, int profile, uint32_t val) {
+static int32_t bcmpkt_ifa_metadata_base_t_request_vector_set(uint32_t *data, int profile, uint32_t val) {
     int32_t ret = SHR_E_NONE;
 
     WORD_FIELD_SET(data[0], 24, 8, val);
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_ifa_metadata_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_METADATA_T_FID_COUNT] = {
-    bcmpkt_ifa_metadata_t_action_vector_get,
-    bcmpkt_ifa_metadata_t_hop_limit_current_length_get,
-    bcmpkt_ifa_metadata_t_metadata_get,
-    bcmpkt_ifa_metadata_t_request_vector_get,
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_ifa_metadata_base_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_BASE_T_FID_COUNT] = {
+    bcmpkt_ifa_metadata_base_t_action_vector_get,
+    bcmpkt_ifa_metadata_base_t_hop_limit_current_length_get,
+    bcmpkt_ifa_metadata_base_t_request_vector_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_ifa_metadata_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_METADATA_T_FID_COUNT] = {
-    bcmpkt_ifa_metadata_t_action_vector_set,
-    bcmpkt_ifa_metadata_t_hop_limit_current_length_set,
-    bcmpkt_ifa_metadata_t_metadata_set,
-    bcmpkt_ifa_metadata_t_request_vector_set,
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_ifa_metadata_base_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_BASE_T_FID_COUNT] = {
+    bcmpkt_ifa_metadata_base_t_action_vector_set,
+    bcmpkt_ifa_metadata_base_t_hop_limit_current_length_set,
+    bcmpkt_ifa_metadata_base_t_request_vector_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_ifa_metadata_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_METADATA_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_ifa_metadata_base_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_BASE_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_ifa_metadata_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IFA_METADATA_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_ifa_metadata_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_ifa_metadata_base_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IFA_METADATA_BASE_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_ifa_metadata_base_t_field_data,
 };
 
 
@@ -6494,27 +6342,27 @@ static int32_t bcmpkt_igmp_t_max_resp_time_set(uint32_t *data, int profile, uint
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_igmp_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IGMP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_igmp_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IGMP_T_FID_COUNT] = {
     bcmpkt_igmp_t_checksum_get,
     bcmpkt_igmp_t_group_address_get,
     bcmpkt_igmp_t_igmp_type_get,
     bcmpkt_igmp_t_max_resp_time_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_igmp_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IGMP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_igmp_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IGMP_T_FID_COUNT] = {
     bcmpkt_igmp_t_checksum_set,
     bcmpkt_igmp_t_group_address_set,
     bcmpkt_igmp_t_igmp_type_set,
     bcmpkt_igmp_t_max_resp_time_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_igmp_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IGMP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_igmp_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IGMP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_igmp_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IGMP_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_igmp_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_igmp_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IGMP_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_igmp_t_field_data,
 };
 
 
@@ -6624,7 +6472,7 @@ static int32_t bcmpkt_ioam_e2e_t_type_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_ioam_e2e_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IOAM_E2E_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_ioam_e2e_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IOAM_E2E_T_FID_COUNT] = {
     bcmpkt_ioam_e2e_t_ioam_e2e_data_get,
     bcmpkt_ioam_e2e_t_ioam_e2e_type_get,
     bcmpkt_ioam_e2e_t_ioam_hdr_len_get,
@@ -6634,7 +6482,7 @@ bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_ioam_e2e_t_fget[BCM56690_A0_D
     bcmpkt_ioam_e2e_t_type_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_ioam_e2e_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IOAM_E2E_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_ioam_e2e_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IOAM_E2E_T_FID_COUNT] = {
     bcmpkt_ioam_e2e_t_ioam_e2e_data_set,
     bcmpkt_ioam_e2e_t_ioam_e2e_type_set,
     bcmpkt_ioam_e2e_t_ioam_hdr_len_set,
@@ -6644,13 +6492,13 @@ bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_ioam_e2e_t_fset[BCM56690_A0_D
     bcmpkt_ioam_e2e_t_type_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_ioam_e2e_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IOAM_E2E_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_ioam_e2e_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IOAM_E2E_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_ioam_e2e_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IOAM_E2E_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_ioam_e2e_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_ioam_e2e_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IOAM_E2E_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_ioam_e2e_t_field_data,
 };
 
 
@@ -6732,7 +6580,7 @@ static int32_t bcmpkt_ipfix_t_version_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_ipfix_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPFIX_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_ipfix_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPFIX_T_FID_COUNT] = {
     bcmpkt_ipfix_t_export_time_get,
     bcmpkt_ipfix_t_length_get,
     bcmpkt_ipfix_t_obs_domain_id_get,
@@ -6740,7 +6588,7 @@ bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_ipfix_t_fget[BCM56690_A0_DNA_
     bcmpkt_ipfix_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_ipfix_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPFIX_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_ipfix_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPFIX_T_FID_COUNT] = {
     bcmpkt_ipfix_t_export_time_set,
     bcmpkt_ipfix_t_length_set,
     bcmpkt_ipfix_t_obs_domain_id_set,
@@ -6748,13 +6596,13 @@ bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_ipfix_t_fset[BCM56690_A0_DNA_
     bcmpkt_ipfix_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_ipfix_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_ipfix_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPFIX_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_ipfix_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPFIX_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_ipfix_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_ipfix_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPFIX_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_ipfix_t_field_data,
 };
 
 
@@ -6926,7 +6774,7 @@ static int32_t bcmpkt_ipv4_t_version_hdr_len_set(uint32_t *data, int profile, ui
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_ipv4_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV4_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_ipv4_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV4_T_FID_COUNT] = {
     bcmpkt_ipv4_t_da_get,
     bcmpkt_ipv4_t_flags_frag_offset_get,
     bcmpkt_ipv4_t_hdr_checksum_get,
@@ -6940,7 +6788,7 @@ bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_ipv4_t_fget[BCM56690_A0_DNA_6
     bcmpkt_ipv4_t_version_hdr_len_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_ipv4_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV4_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_ipv4_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV4_T_FID_COUNT] = {
     bcmpkt_ipv4_t_da_set,
     bcmpkt_ipv4_t_flags_frag_offset_set,
     bcmpkt_ipv4_t_hdr_checksum_set,
@@ -6954,13 +6802,13 @@ bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_ipv4_t_fset[BCM56690_A0_DNA_6
     bcmpkt_ipv4_t_version_hdr_len_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_ipv4_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_ipv4_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV4_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_ipv4_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV4_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_ipv4_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_ipv4_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV4_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_ipv4_t_field_data,
 };
 
 
@@ -7086,7 +6934,7 @@ static int32_t bcmpkt_ipv6_t_version_set(uint32_t *data, int profile, uint32_t v
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_ipv6_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV6_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_ipv6_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV6_T_FID_COUNT] = {
     bcmpkt_ipv6_t_da_get,
     bcmpkt_ipv6_t_flow_label_get,
     bcmpkt_ipv6_t_hop_limit_get,
@@ -7097,7 +6945,7 @@ bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_ipv6_t_fget[BCM56690_A0_DNA_6
     bcmpkt_ipv6_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_ipv6_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV6_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_ipv6_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV6_T_FID_COUNT] = {
     bcmpkt_ipv6_t_da_set,
     bcmpkt_ipv6_t_flow_label_set,
     bcmpkt_ipv6_t_hop_limit_set,
@@ -7108,13 +6956,13 @@ bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_ipv6_t_fset[BCM56690_A0_DNA_6
     bcmpkt_ipv6_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_ipv6_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_ipv6_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV6_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_ipv6_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_IPV6_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_ipv6_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_ipv6_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_IPV6_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_ipv6_t_field_data,
 };
 
 
@@ -7150,23 +6998,23 @@ static int32_t bcmpkt_l2_t_macsa_set(uint32_t *data, int profile, uint32_t val)
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_l2_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_L2_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_l2_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_L2_T_FID_COUNT] = {
     bcmpkt_l2_t_macda_get,
     bcmpkt_l2_t_macsa_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_l2_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_L2_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_l2_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_L2_T_FID_COUNT] = {
     bcmpkt_l2_t_macda_set,
     bcmpkt_l2_t_macsa_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_l2_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_L2_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_l2_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_L2_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_l2_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_L2_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_l2_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_l2_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_L2_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_l2_t_field_data,
 };
 
 
@@ -7186,21 +7034,21 @@ static int32_t bcmpkt_mirror_erspan_sn_t_seq_num_set(uint32_t *data, int profile
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_mirror_erspan_sn_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_mirror_erspan_sn_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
     bcmpkt_mirror_erspan_sn_t_seq_num_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_mirror_erspan_sn_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_mirror_erspan_sn_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT] = {
     bcmpkt_mirror_erspan_sn_t_seq_num_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_mirror_erspan_sn_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_mirror_erspan_sn_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MIRROR_ERSPAN_SN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_mirror_erspan_sn_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_mirror_erspan_sn_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_mirror_erspan_sn_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MIRROR_ERSPAN_SN_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_mirror_erspan_sn_t_field_data,
 };
 
 
@@ -7220,21 +7068,21 @@ static int32_t bcmpkt_mirror_transport_t_data_set(uint32_t *data, int profile, u
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_mirror_transport_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_mirror_transport_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
     bcmpkt_mirror_transport_t_data_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_mirror_transport_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_mirror_transport_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT] = {
     bcmpkt_mirror_transport_t_data_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_mirror_transport_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_mirror_transport_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MIRROR_TRANSPORT_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_mirror_transport_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_mirror_transport_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_mirror_transport_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MIRROR_TRANSPORT_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_mirror_transport_t_field_data,
 };
 
 
@@ -7298,27 +7146,27 @@ static int32_t bcmpkt_mpls_ach_t_version_set(uint32_t *data, int profile, uint32
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_mpls_ach_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_ACH_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_mpls_ach_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_ACH_T_FID_COUNT] = {
     bcmpkt_mpls_ach_t_channel_type_get,
     bcmpkt_mpls_ach_t_cw_type_get,
     bcmpkt_mpls_ach_t_reserved_get,
     bcmpkt_mpls_ach_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_mpls_ach_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_ACH_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_mpls_ach_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_ACH_T_FID_COUNT] = {
     bcmpkt_mpls_ach_t_channel_type_set,
     bcmpkt_mpls_ach_t_cw_type_set,
     bcmpkt_mpls_ach_t_reserved_set,
     bcmpkt_mpls_ach_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_mpls_ach_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_ACH_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_mpls_ach_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_ACH_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_mpls_ach_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_ACH_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_mpls_ach_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_mpls_ach_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_ACH_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_mpls_ach_t_field_data,
 };
 
 
@@ -7338,21 +7186,21 @@ static int32_t bcmpkt_mpls_bv_t_value_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_mpls_bv_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_BV_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_mpls_bv_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_BV_T_FID_COUNT] = {
     bcmpkt_mpls_bv_t_value_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_mpls_bv_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_BV_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_mpls_bv_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_BV_T_FID_COUNT] = {
     bcmpkt_mpls_bv_t_value_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_mpls_bv_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_BV_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_mpls_bv_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_BV_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_mpls_bv_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_BV_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_mpls_bv_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_mpls_bv_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_BV_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_mpls_bv_t_field_data,
 };
 
 
@@ -7401,25 +7249,25 @@ static int32_t bcmpkt_mpls_cw_t_seq_number_set(uint32_t *data, int profile, uint
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_mpls_cw_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_CW_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_mpls_cw_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_CW_T_FID_COUNT] = {
     bcmpkt_mpls_cw_t_cw_type_get,
     bcmpkt_mpls_cw_t_reserved_get,
     bcmpkt_mpls_cw_t_seq_number_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_mpls_cw_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_CW_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_mpls_cw_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_CW_T_FID_COUNT] = {
     bcmpkt_mpls_cw_t_cw_type_set,
     bcmpkt_mpls_cw_t_reserved_set,
     bcmpkt_mpls_cw_t_seq_number_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_mpls_cw_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_CW_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_mpls_cw_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_CW_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_mpls_cw_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_CW_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_mpls_cw_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_mpls_cw_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_CW_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_mpls_cw_t_field_data,
 };
 
 
@@ -7483,27 +7331,27 @@ static int32_t bcmpkt_mpls_t_ttl_set(uint32_t *data, int profile, uint32_t val)
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_mpls_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_mpls_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_T_FID_COUNT] = {
     bcmpkt_mpls_t_bos_get,
     bcmpkt_mpls_t_exp_get,
     bcmpkt_mpls_t_label_get,
     bcmpkt_mpls_t_ttl_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_mpls_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_mpls_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_T_FID_COUNT] = {
     bcmpkt_mpls_t_bos_set,
     bcmpkt_mpls_t_exp_set,
     bcmpkt_mpls_t_label_set,
     bcmpkt_mpls_t_ttl_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_mpls_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_mpls_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_mpls_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_MPLS_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_mpls_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_mpls_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_MPLS_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_mpls_t_field_data,
 };
 
 
@@ -7720,7 +7568,7 @@ static int32_t bcmpkt_p_1588_t_version_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_p_1588_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_P_1588_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_p_1588_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_P_1588_T_FID_COUNT] = {
     bcmpkt_p_1588_t_cntrl_get,
     bcmpkt_p_1588_t_correction_get,
     bcmpkt_p_1588_t_domain_nb_get,
@@ -7737,7 +7585,7 @@ bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_p_1588_t_fget[BCM56690_A0_DNA
     bcmpkt_p_1588_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_p_1588_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_P_1588_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_p_1588_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_P_1588_T_FID_COUNT] = {
     bcmpkt_p_1588_t_cntrl_set,
     bcmpkt_p_1588_t_correction_set,
     bcmpkt_p_1588_t_domain_nb_set,
@@ -7754,13 +7602,13 @@ bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_p_1588_t_fset[BCM56690_A0_DNA
     bcmpkt_p_1588_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_p_1588_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_P_1588_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_p_1588_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_P_1588_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_p_1588_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_P_1588_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_p_1588_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_p_1588_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_P_1588_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_p_1588_t_field_data,
 };
 
 
@@ -7810,25 +7658,25 @@ static int32_t bcmpkt_prog_ext_hdr_t_option_set(uint32_t *data, int profile, uin
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_prog_ext_hdr_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PROG_EXT_HDR_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_prog_ext_hdr_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT] = {
     bcmpkt_prog_ext_hdr_t_hdr_ext_len_get,
     bcmpkt_prog_ext_hdr_t_next_header_get,
     bcmpkt_prog_ext_hdr_t_option_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_prog_ext_hdr_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PROG_EXT_HDR_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_prog_ext_hdr_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT] = {
     bcmpkt_prog_ext_hdr_t_hdr_ext_len_set,
     bcmpkt_prog_ext_hdr_t_next_header_set,
     bcmpkt_prog_ext_hdr_t_option_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_prog_ext_hdr_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PROG_EXT_HDR_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_prog_ext_hdr_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PROG_EXT_HDR_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_prog_ext_hdr_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PROG_EXT_HDR_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_prog_ext_hdr_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_prog_ext_hdr_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PROG_EXT_HDR_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_prog_ext_hdr_t_field_data,
 };
 
 
@@ -7924,7 +7772,7 @@ static int32_t bcmpkt_psamp_0_t_template_id_set(uint32_t *data, int profile, uin
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_psamp_0_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_psamp_0_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_0_T_FID_COUNT] = {
     bcmpkt_psamp_0_t_flowset_get,
     bcmpkt_psamp_0_t_length_get,
     bcmpkt_psamp_0_t_next_hop_index_get,
@@ -7933,7 +7781,7 @@ bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_psamp_0_t_fget[BCM56690_A0_DN
     bcmpkt_psamp_0_t_template_id_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_psamp_0_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_psamp_0_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_0_T_FID_COUNT] = {
     bcmpkt_psamp_0_t_flowset_set,
     bcmpkt_psamp_0_t_length_set,
     bcmpkt_psamp_0_t_next_hop_index_set,
@@ -7942,13 +7790,13 @@ bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_psamp_0_t_fset[BCM56690_A0_DN
     bcmpkt_psamp_0_t_template_id_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_psamp_0_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_psamp_0_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_psamp_0_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_0_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_psamp_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_psamp_0_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_0_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_psamp_0_t_field_data,
 };
 
 
@@ -8057,7 +7905,7 @@ static int32_t bcmpkt_psamp_1_t_variable_flag_set(uint32_t *data, int profile, u
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_psamp_1_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_1_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_psamp_1_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_1_T_FID_COUNT] = {
     bcmpkt_psamp_1_t_dlb_id_get,
     bcmpkt_psamp_1_t_egress_port_get,
     bcmpkt_psamp_1_t_epoch_get,
@@ -8067,7 +7915,7 @@ bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_psamp_1_t_fget[BCM56690_A0_DN
     bcmpkt_psamp_1_t_variable_flag_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_psamp_1_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_1_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_psamp_1_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_1_T_FID_COUNT] = {
     bcmpkt_psamp_1_t_dlb_id_set,
     bcmpkt_psamp_1_t_egress_port_set,
     bcmpkt_psamp_1_t_epoch_set,
@@ -8077,13 +7925,13 @@ bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_psamp_1_t_fset[BCM56690_A0_DN
     bcmpkt_psamp_1_t_variable_flag_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_psamp_1_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_1_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_psamp_1_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_1_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_psamp_1_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_1_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_psamp_1_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_psamp_1_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_1_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_psamp_1_t_field_data,
 };
 
 
@@ -8195,7 +8043,7 @@ static int32_t bcmpkt_psamp_mirror_on_drop_0_t_template_id_set(uint32_t *data, i
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_psamp_mirror_on_drop_0_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_psamp_mirror_on_drop_0_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_0_t_egress_mod_port_get,
     bcmpkt_psamp_mirror_on_drop_0_t_ingress_port_get,
     bcmpkt_psamp_mirror_on_drop_0_t_length_get,
@@ -8205,7 +8053,7 @@ bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_psamp_mirror_on_drop_0_t_fget
     bcmpkt_psamp_mirror_on_drop_0_t_template_id_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_psamp_mirror_on_drop_0_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_psamp_mirror_on_drop_0_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT] = {
     bcmpkt_psamp_mirror_on_drop_0_t_egress_mod_port_set,
     bcmpkt_psamp_mirror_on_drop_0_t_ingress_port_set,
     bcmpkt_psamp_mirror_on_drop_0_t_length_set,
@@ -8215,13 +8063,13 @@ bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_psamp_mirror_on_drop_0_t_fset
     bcmpkt_psamp_mirror_on_drop_0_t_template_id_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_psamp_mirror_on_drop_0_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_psamp_mirror_on_drop_0_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_psamp_mirror_on_drop_0_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_psamp_mirror_on_drop_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_psamp_mirror_on_drop_0_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_0_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_psamp_mirror_on_drop_0_t_field_data,
 };
 
 
@@ -8323,40 +8171,332 @@ static int32_t bcmpkt_psamp_mirror_on_drop_3_t_var_len_indicator_get(uint32_t *d
     return ret;
 }
 
-static int32_t bcmpkt_psamp_mirror_on_drop_3_t_var_len_indicator_set(uint32_t *data, int profile, uint32_t val) {
+static int32_t bcmpkt_psamp_mirror_on_drop_3_t_var_len_indicator_set(uint32_t *data, int profile, uint32_t val) {
+    int32_t ret = SHR_E_NONE;
+
+    WORD_FIELD_SET(data[1], 16, 8, val);
+    return ret;
+}
+
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_psamp_mirror_on_drop_3_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT] = {
+    bcmpkt_psamp_mirror_on_drop_3_t_drop_reason_get,
+    bcmpkt_psamp_mirror_on_drop_3_t_reserved_0_get,
+    bcmpkt_psamp_mirror_on_drop_3_t_sampled_length_get,
+    bcmpkt_psamp_mirror_on_drop_3_t_smod_state_get,
+    bcmpkt_psamp_mirror_on_drop_3_t_uc_cos__color__prob_idx_get,
+    bcmpkt_psamp_mirror_on_drop_3_t_user_meta_data_get,
+    bcmpkt_psamp_mirror_on_drop_3_t_var_len_indicator_get,
+};
+
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_psamp_mirror_on_drop_3_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT] = {
+    bcmpkt_psamp_mirror_on_drop_3_t_drop_reason_set,
+    bcmpkt_psamp_mirror_on_drop_3_t_reserved_0_set,
+    bcmpkt_psamp_mirror_on_drop_3_t_sampled_length_set,
+    bcmpkt_psamp_mirror_on_drop_3_t_smod_state_set,
+    bcmpkt_psamp_mirror_on_drop_3_t_uc_cos__color__prob_idx_set,
+    bcmpkt_psamp_mirror_on_drop_3_t_user_meta_data_set,
+    bcmpkt_psamp_mirror_on_drop_3_t_var_len_indicator_set,
+};
+
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_psamp_mirror_on_drop_3_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FIELD_NAME_MAP_INIT
+};
+
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_psamp_mirror_on_drop_3_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_psamp_mirror_on_drop_3_t_field_data,
+};
+
+
+static int32_t bcmpkt_psamp_postcard_0_t_egress_mod_port_get(uint32_t *data, int profile, uint32_t *val) {
+    int32_t ret = SHR_E_NONE;
+
+    *val = WORD_FIELD_GET(data[3], 0, 16);
+
+    return ret;
+}
+
+static int32_t bcmpkt_psamp_postcard_0_t_egress_mod_port_set(uint32_t *data, int profile, uint32_t val) {
+    int32_t ret = SHR_E_NONE;
+
+    WORD_FIELD_SET(data[3], 0, 16, val);
+    return ret;
+}
+
+static int32_t bcmpkt_psamp_postcard_0_t_ingress_port_get(uint32_t *data, int profile, uint32_t *val) {
+    int32_t ret = SHR_E_NONE;
+
+    *val = WORD_FIELD_GET(data[3], 16, 16);
+
+    return ret;
+}
+
+static int32_t bcmpkt_psamp_postcard_0_t_ingress_port_set(uint32_t *data, int profile, uint32_t val) {
+    int32_t ret = SHR_E_NONE;
+
+    WORD_FIELD_SET(data[3], 16, 16, val);
+    return ret;
+}
+
+static int32_t bcmpkt_psamp_postcard_0_t_obs_time_ns_get(uint32_t *data, int profile, uint32_t *val) {
+    int32_t ret = SHR_E_NONE;
+
+    ret = SHR_E_PARAM;
+
+    return ret;
+}
+
+static int32_t bcmpkt_psamp_postcard_0_t_obs_time_ns_set(uint32_t *data, int profile, uint32_t val) {
+    int32_t ret = SHR_E_NONE;
+
+    ret = SHR_E_PARAM;
+
+    return ret;
+}
+
+static int32_t bcmpkt_psamp_postcard_0_t_obs_time_s_get(uint32_t *data, int profile, uint32_t *val) {
+    int32_t ret = SHR_E_NONE;
+
+    ret = SHR_E_PARAM;
+
+    return ret;
+}
+
+static int32_t bcmpkt_psamp_postcard_0_t_obs_time_s_set(uint32_t *data, int profile, uint32_t val) {
+    int32_t ret = SHR_E_NONE;
+
+    ret = SHR_E_PARAM;
+
+    return ret;
+}
+
+static int32_t bcmpkt_psamp_postcard_0_t_psamp_length_get(uint32_t *data, int profile, uint32_t *val) {
+    int32_t ret = SHR_E_NONE;
+
+    *val = WORD_FIELD_GET(data[0], 0, 16);
+
+    return ret;
+}
+
+static int32_t bcmpkt_psamp_postcard_0_t_psamp_length_set(uint32_t *data, int profile, uint32_t val) {
+    int32_t ret = SHR_E_NONE;
+
+    WORD_FIELD_SET(data[0], 0, 16, val);
+    return ret;
+}
+
+static int32_t bcmpkt_psamp_postcard_0_t_template_id_get(uint32_t *data, int profile, uint32_t *val) {
+    int32_t ret = SHR_E_NONE;
+
+    *val = WORD_FIELD_GET(data[0], 16, 16);
+
+    return ret;
+}
+
+static int32_t bcmpkt_psamp_postcard_0_t_template_id_set(uint32_t *data, int profile, uint32_t val) {
+    int32_t ret = SHR_E_NONE;
+
+    WORD_FIELD_SET(data[0], 16, 16, val);
+    return ret;
+}
+
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_psamp_postcard_0_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_0_T_FID_COUNT] = {
+    bcmpkt_psamp_postcard_0_t_egress_mod_port_get,
+    bcmpkt_psamp_postcard_0_t_ingress_port_get,
+    bcmpkt_psamp_postcard_0_t_obs_time_ns_get,
+    bcmpkt_psamp_postcard_0_t_obs_time_s_get,
+    bcmpkt_psamp_postcard_0_t_psamp_length_get,
+    bcmpkt_psamp_postcard_0_t_template_id_get,
+};
+
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_psamp_postcard_0_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_0_T_FID_COUNT] = {
+    bcmpkt_psamp_postcard_0_t_egress_mod_port_set,
+    bcmpkt_psamp_postcard_0_t_ingress_port_set,
+    bcmpkt_psamp_postcard_0_t_obs_time_ns_set,
+    bcmpkt_psamp_postcard_0_t_obs_time_s_set,
+    bcmpkt_psamp_postcard_0_t_psamp_length_set,
+    bcmpkt_psamp_postcard_0_t_template_id_set,
+};
+
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_psamp_postcard_0_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_0_T_FIELD_NAME_MAP_INIT
+};
+
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_psamp_postcard_0_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_0_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_psamp_postcard_0_t_field_data,
+};
+
+
+static int32_t bcmpkt_psamp_postcard_1_t_color_idx_cos_droploc_get(uint32_t *data, int profile, uint32_t *val) {
+    int32_t ret = SHR_E_NONE;
+
+    *val = WORD_FIELD_GET(data[0], 16, 16);
+
+    return ret;
+}
+
+static int32_t bcmpkt_psamp_postcard_1_t_color_idx_cos_droploc_set(uint32_t *data, int profile, uint32_t val) {
+    int32_t ret = SHR_E_NONE;
+
+    WORD_FIELD_SET(data[0], 16, 16, val);
+    return ret;
+}
+
+static int32_t bcmpkt_psamp_postcard_1_t_drop_reason_code_get(uint32_t *data, int profile, uint32_t *val) {
+    int32_t ret = SHR_E_NONE;
+
+    *val = WORD_FIELD_GET(data[0], 8, 8);
+
+    return ret;
+}
+
+static int32_t bcmpkt_psamp_postcard_1_t_drop_reason_code_set(uint32_t *data, int profile, uint32_t val) {
+    int32_t ret = SHR_E_NONE;
+
+    WORD_FIELD_SET(data[0], 8, 8, val);
+    return ret;
+}
+
+static int32_t bcmpkt_psamp_postcard_1_t_mmu_stat_0_get(uint32_t *data, int profile, uint32_t *val) {
+    int32_t ret = SHR_E_NONE;
+
+    ret = SHR_E_PARAM;
+
+    return ret;
+}
+
+static int32_t bcmpkt_psamp_postcard_1_t_mmu_stat_0_set(uint32_t *data, int profile, uint32_t val) {
+    int32_t ret = SHR_E_NONE;
+
+    ret = SHR_E_PARAM;
+
+    return ret;
+}
+
+static int32_t bcmpkt_psamp_postcard_1_t_mmu_stat_1_get(uint32_t *data, int profile, uint32_t *val) {
+    int32_t ret = SHR_E_NONE;
+
+    ret = SHR_E_PARAM;
+
+    return ret;
+}
+
+static int32_t bcmpkt_psamp_postcard_1_t_mmu_stat_1_set(uint32_t *data, int profile, uint32_t val) {
+    int32_t ret = SHR_E_NONE;
+
+    ret = SHR_E_PARAM;
+
+    return ret;
+}
+
+static int32_t bcmpkt_psamp_postcard_1_t_queue_id_get(uint32_t *data, int profile, uint32_t *val) {
+    int32_t ret = SHR_E_NONE;
+
+    *val = WORD_FIELD_GET(data[0], 0, 8);
+
+    return ret;
+}
+
+static int32_t bcmpkt_psamp_postcard_1_t_queue_id_set(uint32_t *data, int profile, uint32_t val) {
+    int32_t ret = SHR_E_NONE;
+
+    WORD_FIELD_SET(data[0], 0, 8, val);
+    return ret;
+}
+
+static int32_t bcmpkt_psamp_postcard_1_t_reserved_1_get(uint32_t *data, int profile, uint32_t *val) {
+    int32_t ret = SHR_E_NONE;
+
+    *val = WORD_FIELD_GET(data[4], 24, 8);
+
+    return ret;
+}
+
+static int32_t bcmpkt_psamp_postcard_1_t_reserved_1_set(uint32_t *data, int profile, uint32_t val) {
+    int32_t ret = SHR_E_NONE;
+
+    WORD_FIELD_SET(data[4], 24, 8, val);
+    return ret;
+}
+
+static int32_t bcmpkt_psamp_postcard_1_t_residence_time_get(uint32_t *data, int profile, uint32_t *val) {
+    int32_t ret = SHR_E_NONE;
+
+    ret = SHR_E_PARAM;
+
+    return ret;
+}
+
+static int32_t bcmpkt_psamp_postcard_1_t_residence_time_set(uint32_t *data, int profile, uint32_t val) {
+    int32_t ret = SHR_E_NONE;
+
+    ret = SHR_E_PARAM;
+
+    return ret;
+}
+
+static int32_t bcmpkt_psamp_postcard_1_t_sampled_length_get(uint32_t *data, int profile, uint32_t *val) {
+    int32_t ret = SHR_E_NONE;
+
+    *val = WORD_FIELD_GET(data[4], 0, 16);
+
+    return ret;
+}
+
+static int32_t bcmpkt_psamp_postcard_1_t_sampled_length_set(uint32_t *data, int profile, uint32_t val) {
+    int32_t ret = SHR_E_NONE;
+
+    WORD_FIELD_SET(data[4], 0, 16, val);
+    return ret;
+}
+
+static int32_t bcmpkt_psamp_postcard_1_t_var_len_indicator_get(uint32_t *data, int profile, uint32_t *val) {
+    int32_t ret = SHR_E_NONE;
+
+    *val = WORD_FIELD_GET(data[4], 16, 8);
+
+    return ret;
+}
+
+static int32_t bcmpkt_psamp_postcard_1_t_var_len_indicator_set(uint32_t *data, int profile, uint32_t val) {
     int32_t ret = SHR_E_NONE;
 
-    WORD_FIELD_SET(data[1], 16, 8, val);
+    WORD_FIELD_SET(data[4], 16, 8, val);
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_psamp_mirror_on_drop_3_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT] = {
-    bcmpkt_psamp_mirror_on_drop_3_t_drop_reason_get,
-    bcmpkt_psamp_mirror_on_drop_3_t_reserved_0_get,
-    bcmpkt_psamp_mirror_on_drop_3_t_sampled_length_get,
-    bcmpkt_psamp_mirror_on_drop_3_t_smod_state_get,
-    bcmpkt_psamp_mirror_on_drop_3_t_uc_cos__color__prob_idx_get,
-    bcmpkt_psamp_mirror_on_drop_3_t_user_meta_data_get,
-    bcmpkt_psamp_mirror_on_drop_3_t_var_len_indicator_get,
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_psamp_postcard_1_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_1_T_FID_COUNT] = {
+    bcmpkt_psamp_postcard_1_t_color_idx_cos_droploc_get,
+    bcmpkt_psamp_postcard_1_t_drop_reason_code_get,
+    bcmpkt_psamp_postcard_1_t_mmu_stat_0_get,
+    bcmpkt_psamp_postcard_1_t_mmu_stat_1_get,
+    bcmpkt_psamp_postcard_1_t_queue_id_get,
+    bcmpkt_psamp_postcard_1_t_reserved_1_get,
+    bcmpkt_psamp_postcard_1_t_residence_time_get,
+    bcmpkt_psamp_postcard_1_t_sampled_length_get,
+    bcmpkt_psamp_postcard_1_t_var_len_indicator_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_psamp_mirror_on_drop_3_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT] = {
-    bcmpkt_psamp_mirror_on_drop_3_t_drop_reason_set,
-    bcmpkt_psamp_mirror_on_drop_3_t_reserved_0_set,
-    bcmpkt_psamp_mirror_on_drop_3_t_sampled_length_set,
-    bcmpkt_psamp_mirror_on_drop_3_t_smod_state_set,
-    bcmpkt_psamp_mirror_on_drop_3_t_uc_cos__color__prob_idx_set,
-    bcmpkt_psamp_mirror_on_drop_3_t_user_meta_data_set,
-    bcmpkt_psamp_mirror_on_drop_3_t_var_len_indicator_set,
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_psamp_postcard_1_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_1_T_FID_COUNT] = {
+    bcmpkt_psamp_postcard_1_t_color_idx_cos_droploc_set,
+    bcmpkt_psamp_postcard_1_t_drop_reason_code_set,
+    bcmpkt_psamp_postcard_1_t_mmu_stat_0_set,
+    bcmpkt_psamp_postcard_1_t_mmu_stat_1_set,
+    bcmpkt_psamp_postcard_1_t_queue_id_set,
+    bcmpkt_psamp_postcard_1_t_reserved_1_set,
+    bcmpkt_psamp_postcard_1_t_residence_time_set,
+    bcmpkt_psamp_postcard_1_t_sampled_length_set,
+    bcmpkt_psamp_postcard_1_t_var_len_indicator_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_psamp_mirror_on_drop_3_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_psamp_postcard_1_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_1_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_psamp_mirror_on_drop_3_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_PSAMP_MIRROR_ON_DROP_3_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_psamp_mirror_on_drop_3_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_psamp_postcard_1_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_PSAMP_POSTCARD_1_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_psamp_postcard_1_t_field_data,
 };
 
 
@@ -8499,7 +8639,7 @@ static int32_t bcmpkt_rarp_t_target_ip_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_rarp_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RARP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_rarp_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RARP_T_FID_COUNT] = {
     bcmpkt_rarp_t_hardware_len_get,
     bcmpkt_rarp_t_hardware_type_get,
     bcmpkt_rarp_t_operation_get,
@@ -8511,7 +8651,7 @@ bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_rarp_t_fget[BCM56690_A0_DNA_6
     bcmpkt_rarp_t_target_ip_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_rarp_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RARP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_rarp_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RARP_T_FID_COUNT] = {
     bcmpkt_rarp_t_hardware_len_set,
     bcmpkt_rarp_t_hardware_type_set,
     bcmpkt_rarp_t_operation_set,
@@ -8523,13 +8663,13 @@ bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_rarp_t_fset[BCM56690_A0_DNA_6
     bcmpkt_rarp_t_target_ip_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_rarp_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_rarp_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RARP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_rarp_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RARP_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_rarp_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_rarp_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RARP_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_rarp_t_field_data,
 };
 
 
@@ -8609,7 +8749,7 @@ static int32_t bcmpkt_routing_t_segments_left_set(uint32_t *data, int profile, u
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_routing_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ROUTING_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_routing_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ROUTING_T_FID_COUNT] = {
     bcmpkt_routing_t_data_get,
     bcmpkt_routing_t_hdr_ext_len_get,
     bcmpkt_routing_t_next_header_get,
@@ -8617,7 +8757,7 @@ bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_routing_t_fget[BCM56690_A0_DN
     bcmpkt_routing_t_segments_left_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_routing_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ROUTING_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_routing_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ROUTING_T_FID_COUNT] = {
     bcmpkt_routing_t_data_set,
     bcmpkt_routing_t_hdr_ext_len_set,
     bcmpkt_routing_t_next_header_set,
@@ -8625,13 +8765,13 @@ bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_routing_t_fset[BCM56690_A0_DN
     bcmpkt_routing_t_segments_left_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_routing_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ROUTING_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_routing_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ROUTING_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_routing_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_ROUTING_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_routing_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_routing_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_ROUTING_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_routing_t_field_data,
 };
 
 
@@ -8665,294 +8805,23 @@ static int32_t bcmpkt_rspan_t_tpid_set(uint32_t *data, int profile, uint32_t val
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_rspan_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RSPAN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_rspan_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RSPAN_T_FID_COUNT] = {
     bcmpkt_rspan_t_tag_get,
     bcmpkt_rspan_t_tpid_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_rspan_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RSPAN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_rspan_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RSPAN_T_FID_COUNT] = {
     bcmpkt_rspan_t_tag_set,
     bcmpkt_rspan_t_tpid_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_rspan_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RSPAN_T_FIELD_NAME_MAP_INIT
-};
-
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_rspan_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_RSPAN_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_rspan_t_field_data,
-};
-
-
-static int32_t bcmpkt_segment_routing_srh_t_flags_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[1], 16, 8);
-
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_srh_t_flags_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[1], 16, 8, val);
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_srh_t_hdr_ext_len_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[0], 16, 8);
-
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_srh_t_hdr_ext_len_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[0], 16, 8, val);
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_srh_t_last_entry_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[1], 24, 8);
-
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_srh_t_last_entry_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[1], 24, 8, val);
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_srh_t_next_header_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[0], 24, 8);
-
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_srh_t_next_header_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[0], 24, 8, val);
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_srh_t_routing_type_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[0], 8, 8);
-
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_srh_t_routing_type_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[0], 8, 8, val);
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_srh_t_segments_left_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[0], 0, 8);
-
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_srh_t_segments_left_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[0], 0, 8, val);
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_srh_t_tag_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[1], 0, 16);
-
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_srh_t_tag_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[1], 0, 16, val);
-    return ret;
-}
-
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_segment_routing_srh_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_SRH_T_FID_COUNT] = {
-    bcmpkt_segment_routing_srh_t_flags_get,
-    bcmpkt_segment_routing_srh_t_hdr_ext_len_get,
-    bcmpkt_segment_routing_srh_t_last_entry_get,
-    bcmpkt_segment_routing_srh_t_next_header_get,
-    bcmpkt_segment_routing_srh_t_routing_type_get,
-    bcmpkt_segment_routing_srh_t_segments_left_get,
-    bcmpkt_segment_routing_srh_t_tag_get,
-};
-
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_segment_routing_srh_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_SRH_T_FID_COUNT] = {
-    bcmpkt_segment_routing_srh_t_flags_set,
-    bcmpkt_segment_routing_srh_t_hdr_ext_len_set,
-    bcmpkt_segment_routing_srh_t_last_entry_set,
-    bcmpkt_segment_routing_srh_t_next_header_set,
-    bcmpkt_segment_routing_srh_t_routing_type_set,
-    bcmpkt_segment_routing_srh_t_segments_left_set,
-    bcmpkt_segment_routing_srh_t_tag_set,
-};
-
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_segment_routing_srh_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_SRH_T_FIELD_NAME_MAP_INIT
-};
-
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_segment_routing_srh_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_SRH_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_segment_routing_srh_t_field_data,
-};
-
-
-static int32_t bcmpkt_segment_routing_t_hdr_ext_len_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[0], 16, 8);
-
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_t_hdr_ext_len_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[0], 16, 8, val);
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_t_last_entry_flags_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[1], 16, 16);
-
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_t_last_entry_flags_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[1], 16, 16, val);
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_t_next_header_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[0], 24, 8);
-
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_t_next_header_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[0], 24, 8, val);
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_t_routing_type_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[0], 8, 8);
-
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_t_routing_type_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[0], 8, 8, val);
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_t_seg_list_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    ret = SHR_E_PARAM;
-
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_t_seg_list_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    ret = SHR_E_PARAM;
-
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_t_segments_left_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[0], 0, 8);
-
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_t_segments_left_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[0], 0, 8, val);
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_t_tag_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    *val = WORD_FIELD_GET(data[1], 0, 16);
-
-    return ret;
-}
-
-static int32_t bcmpkt_segment_routing_t_tag_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    WORD_FIELD_SET(data[1], 0, 16, val);
-    return ret;
-}
-
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_segment_routing_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_T_FID_COUNT] = {
-    bcmpkt_segment_routing_t_hdr_ext_len_get,
-    bcmpkt_segment_routing_t_last_entry_flags_get,
-    bcmpkt_segment_routing_t_next_header_get,
-    bcmpkt_segment_routing_t_routing_type_get,
-    bcmpkt_segment_routing_t_seg_list_get,
-    bcmpkt_segment_routing_t_segments_left_get,
-    bcmpkt_segment_routing_t_tag_get,
-};
-
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_segment_routing_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_T_FID_COUNT] = {
-    bcmpkt_segment_routing_t_hdr_ext_len_set,
-    bcmpkt_segment_routing_t_last_entry_flags_set,
-    bcmpkt_segment_routing_t_next_header_set,
-    bcmpkt_segment_routing_t_routing_type_set,
-    bcmpkt_segment_routing_t_seg_list_set,
-    bcmpkt_segment_routing_t_segments_left_set,
-    bcmpkt_segment_routing_t_tag_set,
-};
-
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_segment_routing_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_rspan_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RSPAN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_segment_routing_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SEGMENT_ROUTING_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_segment_routing_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_rspan_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_RSPAN_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_rspan_t_field_data,
 };
 
 
@@ -9002,25 +8871,25 @@ static int32_t bcmpkt_sflow_shim_0_t_version_set(uint32_t *data, int profile, ui
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_sflow_shim_0_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_sflow_shim_0_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT] = {
     bcmpkt_sflow_shim_0_t_sys_destination_get,
     bcmpkt_sflow_shim_0_t_sys_source_get,
     bcmpkt_sflow_shim_0_t_version_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_sflow_shim_0_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_sflow_shim_0_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT] = {
     bcmpkt_sflow_shim_0_t_sys_destination_set,
     bcmpkt_sflow_shim_0_t_sys_source_set,
     bcmpkt_sflow_shim_0_t_version_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_sflow_shim_0_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_0_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_sflow_shim_0_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_0_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_sflow_shim_0_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_sflow_shim_0_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_sflow_shim_0_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_0_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_sflow_shim_0_t_field_data,
 };
 
 
@@ -9144,7 +9013,7 @@ static int32_t bcmpkt_sflow_shim_1_t_sys_opcode_set(uint32_t *data, int profile,
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_sflow_shim_1_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_sflow_shim_1_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT] = {
     bcmpkt_sflow_shim_1_t_flag_dest_sample_get,
     bcmpkt_sflow_shim_1_t_flag_discarded_get,
     bcmpkt_sflow_shim_1_t_flag_flex_sample_get,
@@ -9155,7 +9024,7 @@ bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_sflow_shim_1_t_fget[BCM56690_
     bcmpkt_sflow_shim_1_t_sys_opcode_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_sflow_shim_1_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_sflow_shim_1_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT] = {
     bcmpkt_sflow_shim_1_t_flag_dest_sample_set,
     bcmpkt_sflow_shim_1_t_flag_discarded_set,
     bcmpkt_sflow_shim_1_t_flag_flex_sample_set,
@@ -9166,13 +9035,13 @@ bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_sflow_shim_1_t_fset[BCM56690_
     bcmpkt_sflow_shim_1_t_sys_opcode_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_sflow_shim_1_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_1_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_sflow_shim_1_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_1_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_sflow_shim_1_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_sflow_shim_1_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_sflow_shim_1_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_1_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_sflow_shim_1_t_field_data,
 };
 
 
@@ -9207,23 +9076,23 @@ static int32_t bcmpkt_sflow_shim_2_t_user_meta_data_set(uint32_t *data, int prof
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_sflow_shim_2_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_sflow_shim_2_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT] = {
     bcmpkt_sflow_shim_2_t_sequence_num_get,
     bcmpkt_sflow_shim_2_t_user_meta_data_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_sflow_shim_2_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_sflow_shim_2_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT] = {
     bcmpkt_sflow_shim_2_t_sequence_num_set,
     bcmpkt_sflow_shim_2_t_user_meta_data_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_sflow_shim_2_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_2_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_sflow_shim_2_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_2_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_sflow_shim_2_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_sflow_shim_2_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_sflow_shim_2_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SFLOW_SHIM_2_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_sflow_shim_2_t_field_data,
 };
 
 
@@ -9258,57 +9127,23 @@ static int32_t bcmpkt_snap_llc_t_snap_llc_set(uint32_t *data, int profile, uint3
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_snap_llc_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SNAP_LLC_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_snap_llc_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SNAP_LLC_T_FID_COUNT] = {
     bcmpkt_snap_llc_t_length_get,
     bcmpkt_snap_llc_t_snap_llc_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_snap_llc_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SNAP_LLC_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_snap_llc_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SNAP_LLC_T_FID_COUNT] = {
     bcmpkt_snap_llc_t_length_set,
     bcmpkt_snap_llc_t_snap_llc_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_snap_llc_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SNAP_LLC_T_FIELD_NAME_MAP_INIT
-};
-
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_snap_llc_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_SNAP_LLC_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_snap_llc_t_field_data,
-};
-
-
-static int32_t bcmpkt_std_segment_id_t_data_get(uint32_t *data, int profile, uint32_t *val) {
-    int32_t ret = SHR_E_NONE;
-
-    ret = SHR_E_PARAM;
-
-    return ret;
-}
-
-static int32_t bcmpkt_std_segment_id_t_data_set(uint32_t *data, int profile, uint32_t val) {
-    int32_t ret = SHR_E_NONE;
-
-    ret = SHR_E_PARAM;
-
-    return ret;
-}
-
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_std_segment_id_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_STD_SEGMENT_ID_T_FID_COUNT] = {
-    bcmpkt_std_segment_id_t_data_get,
-};
-
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_std_segment_id_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_STD_SEGMENT_ID_T_FID_COUNT] = {
-    bcmpkt_std_segment_id_t_data_set,
-};
-
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_std_segment_id_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_STD_SEGMENT_ID_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_snap_llc_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SNAP_LLC_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_std_segment_id_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_STD_SEGMENT_ID_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_std_segment_id_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_snap_llc_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_SNAP_LLC_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_snap_llc_t_field_data,
 };
 
 
@@ -9342,23 +9177,23 @@ static int32_t bcmpkt_tcp_first_4bytes_t_src_port_set(uint32_t *data, int profil
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_tcp_first_4bytes_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_tcp_first_4bytes_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_first_4bytes_t_dst_port_get,
     bcmpkt_tcp_first_4bytes_t_src_port_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_tcp_first_4bytes_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_tcp_first_4bytes_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_first_4bytes_t_dst_port_set,
     bcmpkt_tcp_first_4bytes_t_src_port_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_tcp_first_4bytes_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_tcp_first_4bytes_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_TCP_FIRST_4BYTES_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_tcp_first_4bytes_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_tcp_first_4bytes_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_tcp_first_4bytes_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_TCP_FIRST_4BYTES_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_tcp_first_4bytes_t_field_data,
 };
 
 
@@ -9454,7 +9289,7 @@ static int32_t bcmpkt_tcp_last_16bytes_t_win_size_set(uint32_t *data, int profil
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_tcp_last_16bytes_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_tcp_last_16bytes_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_last_16bytes_t_ack_num_get,
     bcmpkt_tcp_last_16bytes_t_checksum_get,
     bcmpkt_tcp_last_16bytes_t_hdr_len_and_flags_get,
@@ -9463,7 +9298,7 @@ bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_tcp_last_16bytes_t_fget[BCM56
     bcmpkt_tcp_last_16bytes_t_win_size_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_tcp_last_16bytes_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_tcp_last_16bytes_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT] = {
     bcmpkt_tcp_last_16bytes_t_ack_num_set,
     bcmpkt_tcp_last_16bytes_t_checksum_set,
     bcmpkt_tcp_last_16bytes_t_hdr_len_and_flags_set,
@@ -9472,13 +9307,13 @@ bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_tcp_last_16bytes_t_fset[BCM56
     bcmpkt_tcp_last_16bytes_t_win_size_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_tcp_last_16bytes_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_tcp_last_16bytes_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_TCP_LAST_16BYTES_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_tcp_last_16bytes_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_tcp_last_16bytes_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_tcp_last_16bytes_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_TCP_LAST_16BYTES_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_tcp_last_16bytes_t_field_data,
 };
 
 
@@ -9542,27 +9377,27 @@ static int32_t bcmpkt_udp_t_udp_length_set(uint32_t *data, int profile, uint32_t
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_udp_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UDP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_udp_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UDP_T_FID_COUNT] = {
     bcmpkt_udp_t_checksum_get,
     bcmpkt_udp_t_dst_port_get,
     bcmpkt_udp_t_src_port_get,
     bcmpkt_udp_t_udp_length_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_udp_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UDP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_udp_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UDP_T_FID_COUNT] = {
     bcmpkt_udp_t_checksum_set,
     bcmpkt_udp_t_dst_port_set,
     bcmpkt_udp_t_src_port_set,
     bcmpkt_udp_t_udp_length_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_udp_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_udp_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UDP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_udp_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UDP_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_udp_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_udp_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UDP_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_udp_t_field_data,
 };
 
 
@@ -9598,23 +9433,23 @@ static int32_t bcmpkt_unknown_l3_t_next_16bytes_of_l3_payload_set(uint32_t *data
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_unknown_l3_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_unknown_l3_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
     bcmpkt_unknown_l3_t_first_16bytes_of_l3_payload_get,
     bcmpkt_unknown_l3_t_next_16bytes_of_l3_payload_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_unknown_l3_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_unknown_l3_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT] = {
     bcmpkt_unknown_l3_t_first_16bytes_of_l3_payload_set,
     bcmpkt_unknown_l3_t_next_16bytes_of_l3_payload_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_unknown_l3_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_unknown_l3_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L3_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_unknown_l3_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L3_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_unknown_l3_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_unknown_l3_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L3_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_unknown_l3_t_field_data,
 };
 
 
@@ -9634,21 +9469,21 @@ static int32_t bcmpkt_unknown_l4_t_first_4bytes_of_l4_payload_set(uint32_t *data
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_unknown_l4_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_unknown_l4_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
     bcmpkt_unknown_l4_t_first_4bytes_of_l4_payload_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_unknown_l4_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_unknown_l4_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT] = {
     bcmpkt_unknown_l4_t_first_4bytes_of_l4_payload_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_unknown_l4_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_unknown_l4_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L4_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_unknown_l4_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L4_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_unknown_l4_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_unknown_l4_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L4_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_unknown_l4_t_field_data,
 };
 
 
@@ -9713,27 +9548,27 @@ static int32_t bcmpkt_unknown_l5_t_l5_bytes_8_9_set(uint32_t *data, int profile,
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_unknown_l5_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_unknown_l5_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
     bcmpkt_unknown_l5_t_l5_bytes_0_1_get,
     bcmpkt_unknown_l5_t_l5_bytes_2_3_get,
     bcmpkt_unknown_l5_t_l5_bytes_4_7_get,
     bcmpkt_unknown_l5_t_l5_bytes_8_9_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_unknown_l5_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_unknown_l5_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT] = {
     bcmpkt_unknown_l5_t_l5_bytes_0_1_set,
     bcmpkt_unknown_l5_t_l5_bytes_2_3_set,
     bcmpkt_unknown_l5_t_l5_bytes_4_7_set,
     bcmpkt_unknown_l5_t_l5_bytes_8_9_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_unknown_l5_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_unknown_l5_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L5_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_unknown_l5_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_UNKNOWN_L5_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_unknown_l5_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_unknown_l5_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_UNKNOWN_L5_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_unknown_l5_t_field_data,
 };
 
 
@@ -9797,27 +9632,27 @@ static int32_t bcmpkt_vlan_t_vid_set(uint32_t *data, int profile, uint32_t val)
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_vlan_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_VLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_vlan_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_VLAN_T_FID_COUNT] = {
     bcmpkt_vlan_t_cfi_get,
     bcmpkt_vlan_t_pcp_get,
     bcmpkt_vlan_t_tpid_get,
     bcmpkt_vlan_t_vid_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_vlan_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_VLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_vlan_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_VLAN_T_FID_COUNT] = {
     bcmpkt_vlan_t_cfi_set,
     bcmpkt_vlan_t_pcp_set,
     bcmpkt_vlan_t_tpid_set,
     bcmpkt_vlan_t_vid_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_vlan_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_vlan_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_VLAN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_vlan_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_VLAN_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_vlan_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_vlan_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_VLAN_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_vlan_t_field_data,
 };
 
 
@@ -9867,25 +9702,25 @@ static int32_t bcmpkt_vxlan_t_vn_id_set(uint32_t *data, int profile, uint32_t va
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_vxlan_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_VXLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_vxlan_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_VXLAN_T_FID_COUNT] = {
     bcmpkt_vxlan_t_flags_reserved_1_get,
     bcmpkt_vxlan_t_reserved2_get,
     bcmpkt_vxlan_t_vn_id_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_vxlan_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_VXLAN_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_vxlan_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_VXLAN_T_FID_COUNT] = {
     bcmpkt_vxlan_t_flags_reserved_1_set,
     bcmpkt_vxlan_t_reserved2_set,
     bcmpkt_vxlan_t_vn_id_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_vxlan_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_vxlan_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_VXLAN_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_vxlan_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_VXLAN_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_vxlan_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_vxlan_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_VXLAN_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_vxlan_t_field_data,
 };
 
 
@@ -9997,7 +9832,7 @@ static int32_t bcmpkt_wesp_t_wesp_iv_set(uint32_t *data, int profile, uint32_t v
     return ret;
 }
 
-bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_wesp_t_fget[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_WESP_T_FID_COUNT] = {
+bcmpkt_flex_field_get_f bcm78800_a0_dna_6_5_31_5_0_wesp_t_fget[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_WESP_T_FID_COUNT] = {
     bcmpkt_wesp_t_flags_get,
     bcmpkt_wesp_t_header_len_get,
     bcmpkt_wesp_t_next_header_get,
@@ -10007,7 +9842,7 @@ bcmpkt_flex_field_get_f bcm56690_a0_dna_6_5_29_0_1_wesp_t_fget[BCM56690_A0_DNA_6
     bcmpkt_wesp_t_wesp_iv_get,
 };
 
-bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_wesp_t_fset[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_WESP_T_FID_COUNT] = {
+bcmpkt_flex_field_set_f bcm78800_a0_dna_6_5_31_5_0_wesp_t_fset[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_WESP_T_FID_COUNT] = {
     bcmpkt_wesp_t_flags_set,
     bcmpkt_wesp_t_header_len_set,
     bcmpkt_wesp_t_next_header_set,
@@ -10017,536 +9852,508 @@ bcmpkt_flex_field_set_f bcm56690_a0_dna_6_5_29_0_1_wesp_t_fset[BCM56690_A0_DNA_6
     bcmpkt_wesp_t_wesp_iv_set,
 };
 
-static bcmpkt_flex_field_metadata_t bcm56690_a0_dna_6_5_29_0_1_wesp_t_field_data[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_WESP_T_FIELD_NAME_MAP_INIT
+static bcmpkt_flex_field_metadata_t bcm78800_a0_dna_6_5_31_5_0_wesp_t_field_data[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_WESP_T_FIELD_NAME_MAP_INIT
 };
 
-static bcmpkt_flex_field_info_t bcm56690_a0_dna_6_5_29_0_1_wesp_t_field_info = {
-    .num_fields = BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_WESP_T_FID_COUNT,
-    .info = bcm56690_a0_dna_6_5_29_0_1_wesp_t_field_data,
+static bcmpkt_flex_field_info_t bcm78800_a0_dna_6_5_31_5_0_wesp_t_field_info = {
+    .num_fields = BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_WESP_T_FID_COUNT,
+    .info = bcm78800_a0_dna_6_5_31_5_0_wesp_t_field_data,
 };
 
-static bcmpkt_flex_pmd_info_t bcm56690_a0_dna_6_5_29_0_1_flexhdr_info_list[BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_FLEXHDR_COUNT] = {
-    {
-        .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_arp_t_field_info,
-        .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_arp_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_arp_t_fset,
-    },
-    {
-        .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_authen_t_field_info,
-        .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_authen_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_authen_t_fset,
-    },
-    {
-        .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_bfd_t_field_info,
-        .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_bfd_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_bfd_t_fset,
-    },
-    {
-        .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_cntag_t_field_info,
-        .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_cntag_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_cntag_t_fset,
-    },
+static bcmpkt_flex_pmd_info_t bcm78800_a0_dna_6_5_31_5_0_flexhdr_info_list[BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_FLEXHDR_COUNT] = {
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_cpu_composites_0_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_arp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_cpu_composites_0_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_cpu_composites_0_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_arp_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_arp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_cpu_composites_1_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_authen_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_cpu_composites_1_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_cpu_composites_1_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_authen_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_authen_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_dest_option_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_bfd_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_dest_option_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_dest_option_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_bfd_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_bfd_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_ep_nih_header_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_cntag_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_ep_nih_header_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_ep_nih_header_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_cntag_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_cntag_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_erspan3_fixed_hdr_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_cpu_composites_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_erspan3_fixed_hdr_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_erspan3_fixed_hdr_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_cpu_composites_0_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_cpu_composites_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_erspan3_subhdr_5_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_cpu_composites_1_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_erspan3_subhdr_5_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_erspan3_subhdr_5_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_cpu_composites_1_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_cpu_composites_1_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_esp_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_dcn_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_esp_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_esp_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_dcn_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_dcn_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_ethertype_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_dest_option_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_ethertype_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_ethertype_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_dest_option_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_dest_option_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_frag_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_ep_nih_header_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_frag_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_frag_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_ep_nih_header_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_ep_nih_header_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_gbp_ethernet_shim_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_erspan3_fixed_hdr_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_gbp_ethernet_shim_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_gbp_ethernet_shim_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_erspan3_fixed_hdr_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_erspan3_fixed_hdr_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_generic_loopback_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_erspan3_subhdr_5_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_generic_loopback_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_generic_loopback_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_erspan3_subhdr_5_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_erspan3_subhdr_5_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_gpe_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_esp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_gpe_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_gpe_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_esp_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_esp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_gre_chksum_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_ethertype_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_gre_chksum_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_gre_chksum_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_ethertype_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_ethertype_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_gre_key_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_frag_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_gre_key_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_gre_key_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_frag_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_frag_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_gre_rout_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_gbp_ethernet_shim_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_gre_rout_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_gre_rout_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_gbp_ethernet_shim_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_gbp_ethernet_shim_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_gre_seq_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_generic_loopback_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_gre_seq_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_gre_seq_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_generic_loopback_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_generic_loopback_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_gre_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_gpe_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_gre_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_gre_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_gpe_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_gpe_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_hg3_base_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_gre_chksum_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_hg3_base_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_hg3_base_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_gre_chksum_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_gre_chksum_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_hg3_extension_0_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_gre_key_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_hg3_extension_0_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_hg3_extension_0_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_gre_key_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_gre_key_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_hop_by_hop_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_gre_rout_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_hop_by_hop_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_hop_by_hop_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_gre_rout_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_gre_rout_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_icmp_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_gre_seq_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_icmp_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_icmp_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_gre_seq_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_gre_seq_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_0_a_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_gre_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_0_a_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_0_a_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_gre_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_gre_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_0_b_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_hg3_base_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_0_b_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_0_b_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_hg3_base_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_hg3_base_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_1_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_hg3_extension_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_1_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_1_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_hg3_extension_0_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_hg3_extension_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_2_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_hop_by_hop_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_2_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_2_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_hop_by_hop_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_hop_by_hop_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_3_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_icmp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_3_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_ifa_flex_md_3_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_icmp_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_icmp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_ifa_header_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_ifa_header_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_ifa_header_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_ifa_header_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_ifa_header_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_ifa_header_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_ifa_md_base_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_ifa_metadata_a_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_ifa_md_base_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_ifa_md_base_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_ifa_metadata_a_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_ifa_metadata_a_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_ifa_metadata_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_ifa_metadata_b_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_ifa_metadata_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_ifa_metadata_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_ifa_metadata_b_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_ifa_metadata_b_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_igmp_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_ifa_metadata_base_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_igmp_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_igmp_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_ifa_metadata_base_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_ifa_metadata_base_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_ioam_e2e_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_igmp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_ioam_e2e_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_ioam_e2e_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_igmp_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_igmp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_ipfix_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_ioam_e2e_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_ipfix_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_ipfix_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_ioam_e2e_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_ioam_e2e_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_ipv4_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_ipfix_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_ipv4_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_ipv4_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_ipfix_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_ipfix_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_ipv6_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_ipv4_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_ipv6_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_ipv6_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_ipv4_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_ipv4_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_l2_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_ipv6_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_l2_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_l2_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_ipv6_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_ipv6_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_mirror_erspan_sn_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_l2_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_mirror_erspan_sn_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_mirror_erspan_sn_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_l2_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_l2_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_mirror_transport_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_mirror_erspan_sn_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_mirror_transport_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_mirror_transport_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_mirror_erspan_sn_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_mirror_erspan_sn_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_mpls_ach_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_mirror_transport_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_mpls_ach_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_mpls_ach_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_mirror_transport_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_mirror_transport_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_mpls_bv_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_mpls_ach_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_mpls_bv_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_mpls_bv_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_mpls_ach_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_mpls_ach_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_mpls_cw_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_mpls_bv_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_mpls_cw_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_mpls_cw_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_mpls_bv_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_mpls_bv_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_mpls_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_mpls_cw_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_mpls_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_mpls_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_mpls_cw_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_mpls_cw_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_p_1588_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_mpls_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_p_1588_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_p_1588_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_mpls_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_mpls_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_prog_ext_hdr_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_p_1588_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_prog_ext_hdr_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_prog_ext_hdr_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_p_1588_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_p_1588_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_psamp_0_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_prog_ext_hdr_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_psamp_0_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_psamp_0_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_prog_ext_hdr_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_prog_ext_hdr_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_psamp_1_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_psamp_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_psamp_1_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_psamp_1_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_psamp_0_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_psamp_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_psamp_mirror_on_drop_0_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_psamp_1_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_psamp_mirror_on_drop_0_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_psamp_mirror_on_drop_0_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_psamp_1_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_psamp_1_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_psamp_mirror_on_drop_3_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_psamp_mirror_on_drop_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_psamp_mirror_on_drop_3_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_psamp_mirror_on_drop_3_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_psamp_mirror_on_drop_0_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_psamp_mirror_on_drop_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_rarp_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_psamp_mirror_on_drop_3_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_rarp_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_rarp_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_psamp_mirror_on_drop_3_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_psamp_mirror_on_drop_3_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_routing_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_psamp_postcard_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_routing_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_routing_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_psamp_postcard_0_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_psamp_postcard_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_rspan_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_psamp_postcard_1_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_rspan_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_rspan_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_psamp_postcard_1_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_psamp_postcard_1_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_segment_routing_srh_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_rarp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_segment_routing_srh_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_segment_routing_srh_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_rarp_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_rarp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_segment_routing_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_routing_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_segment_routing_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_segment_routing_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_routing_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_routing_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_sflow_shim_0_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_rspan_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_sflow_shim_0_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_sflow_shim_0_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_rspan_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_rspan_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_sflow_shim_1_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_sflow_shim_0_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_sflow_shim_1_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_sflow_shim_1_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_sflow_shim_0_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_sflow_shim_0_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_sflow_shim_2_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_sflow_shim_1_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_sflow_shim_2_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_sflow_shim_2_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_sflow_shim_1_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_sflow_shim_1_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_snap_llc_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_sflow_shim_2_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_snap_llc_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_snap_llc_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_sflow_shim_2_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_sflow_shim_2_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_std_segment_id_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_snap_llc_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_std_segment_id_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_std_segment_id_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_snap_llc_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_snap_llc_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_tcp_first_4bytes_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_tcp_first_4bytes_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_tcp_first_4bytes_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_tcp_first_4bytes_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_tcp_first_4bytes_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_tcp_first_4bytes_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_tcp_last_16bytes_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_tcp_last_16bytes_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_tcp_last_16bytes_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_tcp_last_16bytes_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_tcp_last_16bytes_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_tcp_last_16bytes_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_udp_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_udp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_udp_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_udp_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_udp_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_udp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_unknown_l3_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_unknown_l3_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_unknown_l3_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_unknown_l3_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_unknown_l3_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_unknown_l3_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_unknown_l4_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_unknown_l4_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_unknown_l4_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_unknown_l4_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_unknown_l4_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_unknown_l4_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_unknown_l5_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_unknown_l5_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_unknown_l5_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_unknown_l5_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_unknown_l5_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_unknown_l5_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_vlan_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_vlan_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_vlan_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_vlan_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_vlan_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_vlan_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_vxlan_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_vxlan_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_vxlan_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_vxlan_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_vxlan_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_vxlan_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_wesp_t_field_info,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_wesp_t_field_info,
         .reasons_info = NULL,
-        .flex_fget = bcm56690_a0_dna_6_5_29_0_1_wesp_t_fget,
-        .flex_fset = bcm56690_a0_dna_6_5_29_0_1_wesp_t_fset,
+        .flex_fget = bcm78800_a0_dna_6_5_31_5_0_wesp_t_fget,
+        .flex_fset = bcm78800_a0_dna_6_5_31_5_0_wesp_t_fset,
     },
     {
         .is_supported = TRUE,
-        .field_info = &bcm56690_a0_dna_6_5_29_0_1_rxpmd_flex_field_info,
-        .reasons_info = &bcm56690_a0_dna_6_5_29_0_1_rxpmd_flex_reasons_info,
-        .flex_common_fget = bcm56690_a0_rxpmd_flex_fget,
-        .flex_common_fset = bcm56690_a0_rxpmd_flex_fset,
+        .field_info = &bcm78800_a0_dna_6_5_31_5_0_rxpmd_flex_field_info,
+        .reasons_info = &bcm78800_a0_dna_6_5_31_5_0_rxpmd_flex_reasons_info,
+        .flex_common_fget = bcm78800_a0_rxpmd_flex_fget,
+        .flex_common_fset = bcm78800_a0_rxpmd_flex_fset,
     },
 };
 
-static shr_enum_map_t bcm56690_a0_dna_6_5_29_0_1_flexhdr_id_map[] = {
-    BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_FLEXHDR_NAME_MAP_INIT
+static shr_enum_map_t bcm78800_a0_dna_6_5_31_5_0_flexhdr_id_map[] = {
+    BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_FLEXHDR_NAME_MAP_INIT
 };
 
-shr_enum_map_t * bcm56690_a0_dna_6_5_29_0_1_flexhdr_map_get(void)
+shr_enum_map_t * bcm78800_a0_dna_6_5_31_5_0_flexhdr_map_get(void)
 {
-    return bcm56690_a0_dna_6_5_29_0_1_flexhdr_id_map;
+    return bcm78800_a0_dna_6_5_31_5_0_flexhdr_id_map;
 }
 
-bcmpkt_flex_pmd_info_t * bcm56690_a0_dna_6_5_29_0_1_flex_pmd_info_get(uint32_t hid)
+bcmpkt_flex_pmd_info_t * bcm78800_a0_dna_6_5_31_5_0_flex_pmd_info_get(uint32_t hid)
 {
-    if (hid >= BCM56690_A0_DNA_6_5_29_0_1_BCMPKT_FLEXHDR_COUNT) {
+    if (hid >= BCM78800_A0_DNA_6_5_31_5_0_BCMPKT_FLEXHDR_COUNT) {
         return NULL;
     }
 
-    return &bcm56690_a0_dna_6_5_29_0_1_flexhdr_info_list[hid];
+    return &bcm78800_a0_dna_6_5_31_5_0_flexhdr_info_list[hid];
 }
 
-int bcm56690_a0_dna_6_5_29_0_1_flexhdr_variant_support_map[BCMPKT_PMD_COUNT] = {
-    14,
-    21,
+int bcm78800_a0_dna_6_5_31_5_0_flexhdr_variant_support_map[BCMPKT_PMD_COUNT] = {
+    15,
     22,
-    70,
+    23,
+    66,
 };
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/bcmgenl/Kbuild b/platform/broadcom/saibcm-modules/sdklt/linux/bcmgenl/Kbuild
index 684e67081621..9f1edb67c0ab 100644
--- a/platform/broadcom/saibcm-modules/sdklt/linux/bcmgenl/Kbuild
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/bcmgenl/Kbuild
@@ -22,8 +22,7 @@ KNETCB_CPPFLAGS += -DKPMD
 
 obj-m := linux_bcmgenl.o
 
-ccflags-y := $(KNETCB_CPPFLAGS) $(LKM_CFLAGS) \
-	     $(SDK_PMD_KFLAGS) \
+ccflags-y := $(SDK_PMD_KFLAGS) $(LKM_CFLAGS) $(LKM_CPPFLAGS) \
 	     -I$(SDK)/shr/include \
 	     -I$(SDK)/bcmdrd/include \
 	     -I$(SDK)/bcmltd/include \
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/bcmgenl/bcmgenl_packet.c b/platform/broadcom/saibcm-modules/sdklt/linux/bcmgenl/bcmgenl_packet.c
index 4d097e7d052a..9a845d0b2c91 100644
--- a/platform/broadcom/saibcm-modules/sdklt/linux/bcmgenl/bcmgenl_packet.c
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/bcmgenl/bcmgenl_packet.c
@@ -225,7 +225,9 @@ bcmgenl_packet_filter_cb(struct sk_buff *skb, ngknet_filter_t **filt)
         return (NULL);
     }
     cbd = NGKNET_SKB_CB(skb);
-    match_filt = cbd->filt;
+    if (cbd) {
+        match_filt = cbd->filt;
+    }
 
     if (!cbd || !match_filt) {
         GENL_DBG_WARN("%s: cbd(0x%p) or match_filt(0x%p) is NULL\n",
@@ -235,18 +237,16 @@ bcmgenl_packet_filter_cb(struct sk_buff *skb, ngknet_filter_t **filt)
     }
 
     /* check if this packet is from the same filter */
-    if (!match_filt ||
-        (match_filt->dest_type != NGKNET_FILTER_DEST_T_CB) ||
-        (strncmp(match_filt->desc, BCMGENL_PACKET_NAME, NGKNET_FILTER_DESC_MAX) != 0)) {
+    if  (match_filt->dest_type != NGKNET_FILTER_DEST_T_CB) ||
+        (strncmp(match_filt->desc, BCMGENL_PACKET_NAME, NGKNET_FILTER_DESC_MAX) != 0) {
         return (skb);
     }
     dev_no = cbd->dinfo->dev_no;
     pkt = cbd->pmd + cbd->pmd_len;
-    pkt_len = cbd->pkt_len;
 
     GENL_DBG_VERB
         ("pkt size %d, match_filt->dest_id %d\n",
-         pkt_len, match_filt->dest_id);
+         cbd->pkt_len, match_filt->dest_id);
     GENL_DBG_VERB
         ("filter user data: 0x%08x\n", *(uint32_t *)match_filt->user_data);
     GENL_DBG_VERB
@@ -254,6 +254,7 @@ bcmgenl_packet_filter_cb(struct sk_buff *skb, ngknet_filter_t **filt)
     g_bcmgenl_packet_stats.pkts_f_packet_cb++;
 
     /* Adjust original pkt_len to remove 4B FCS */
+    pkt_len = cbd->pkt_len;
     if (pkt_len < FCS_SZ) {
         g_bcmgenl_packet_stats.pkts_d_invalid_size++;
         goto FILTER_CB_PKT_HANDLED;
@@ -375,7 +376,6 @@ bcmgenl_packet_filter_cb(struct sk_buff *skb, ngknet_filter_t **filt)
     if (rv == 1) {
         g_bcmgenl_packet_stats.pkts_f_handled++;
         /* Not sending to network protocol stack */
-        dev_kfree_skb_any(skb);
         skb = NULL;
     } else {
         g_bcmgenl_packet_stats.pkts_f_pass_through++;
@@ -669,13 +669,13 @@ bcmgenl_packet_proc_debug_write(
     char debug_str[40];
     char *ptr;
 
-    if (count > sizeof(debug_str)) {
+    if (count >= sizeof(debug_str)) {
         count = sizeof(debug_str) - 1;
-        debug_str[count] = '\0';
     }
     if (copy_from_user(debug_str, buf, count)) {
         return -EFAULT;
     }
+    debug_str[count] = '\0';
 
     if ((ptr = strstr(debug_str, "debug=")) != NULL) {
         ptr += 6;
@@ -715,7 +715,7 @@ genl_cb_proc_init(void)
 
     /* create procfs for generic */
     snprintf(packet_procfs_path, PROCFS_MAX_PATH, "%s/%s",
-             BCMGENL_PROCFS_PATH, BCMGENL_PACKET_NAME);
+             BCMGENL_MODULE_NAME, BCMGENL_PACKET_NAME);
     bcmgenl_packet_proc_root = proc_mkdir(packet_procfs_path, NULL);
 
     /* create procfs for generic stats */
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/bcmgenl/bcmgenl_psample.c b/platform/broadcom/saibcm-modules/sdklt/linux/bcmgenl/bcmgenl_psample.c
index 90060e69d821..bf5ff9a4f4a5 100644
--- a/platform/broadcom/saibcm-modules/sdklt/linux/bcmgenl/bcmgenl_psample.c
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/bcmgenl/bcmgenl_psample.c
@@ -277,7 +277,9 @@ bcmgenl_psample_filter_cb(struct sk_buff *skb, ngknet_filter_t **filt)
         return (NULL);
     }
     cbd = NGKNET_SKB_CB(skb);
-    match_filt = cbd->filt;
+    if (cbd) {
+        match_filt = cbd->filt;
+    }
 
     if (!cbd || !match_filt) {
         GENL_DBG_WARN("%s: cbd(0x%p) or match_filt(0x%p) is NULL\n",
@@ -287,9 +289,8 @@ bcmgenl_psample_filter_cb(struct sk_buff *skb, ngknet_filter_t **filt)
     }
 
     /* check if this packet is sampled packet (from sample filter) */
-    if (!match_filt ||
-        (match_filt->dest_type != NGKNET_FILTER_DEST_T_CB) ||
-        (strncmp(match_filt->desc, BCMGENL_PSAMPLE_NAME, NGKNET_FILTER_DESC_MAX) != 0)) {
+    if  (match_filt->dest_type != NGKNET_FILTER_DEST_T_CB ||
+        strncmp(match_filt->desc, BCMGENL_PSAMPLE_NAME, NGKNET_FILTER_DESC_MAX) != 0) {
         return (skb);
     }
     dev_no = cbd->dinfo->dev_no;
@@ -428,6 +429,7 @@ bcmgenl_psample_filter_cb(struct sk_buff *skb, ngknet_filter_t **filt)
             memcpy(skb_psample->data, pkt, meta.trunc_size);
         }
         skb_put(skb_psample, meta.trunc_size);
+        /* save original size for PSAMPLE_ATTR_ORIGSIZE in skb->len */
         skb_psample->len = pkt_len;
         psample_pkt->skb = skb_psample;
         if (debug & GENL_DBG_LVL_PDMP) {
@@ -453,7 +455,6 @@ bcmgenl_psample_filter_cb(struct sk_buff *skb, ngknet_filter_t **filt)
     if (bcmgenl_pkt.meta.sample_type != SAMPLE_TYPE_NONE) {
         g_bcmgenl_psample_stats.pkts_f_handled++;
         /* Not sending to network protocol stack */
-        dev_kfree_skb_any(skb);
         skb = NULL;
     } else {
         g_bcmgenl_psample_stats.pkts_f_pass_through++;
@@ -880,13 +881,13 @@ bcmgenl_psample_proc_debug_write(
     char debug_str[40];
     char *ptr;
 
-    if (count > sizeof(debug_str)) {
+    if (count >= sizeof(debug_str)) {
         count = sizeof(debug_str) - 1;
-        debug_str[count] = '\0';
     }
     if (copy_from_user(debug_str, buf, count)) {
         return -EFAULT;
     }
+    debug_str[count] = '\0';
 
     if ((ptr = strstr(debug_str, "debug=")) != NULL) {
         ptr += 6;
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/bde/Kbuild b/platform/broadcom/saibcm-modules/sdklt/linux/bde/Kbuild
index a566a8837897..368cef2e776d 100644
--- a/platform/broadcom/saibcm-modules/sdklt/linux/bde/Kbuild
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/bde/Kbuild
@@ -2,7 +2,7 @@
 #
 # Linux kernel BDE module.
 #
-# The NGBDE_CFLAGS variable is intended for configuring non-default
+# The BDE_CPPFLAGS variable is intended for configuring non-default
 # builds of the NGBDE kernel module, for example, using a different
 # default DMA pool size or turning off MSI interrupts.
 #
@@ -24,7 +24,7 @@
 
 obj-m := linux_ngbde.o
 
-ccflags-y := $(LKM_CFLAGS) $(NGBDE_CFLAGS) \
+ccflags-y := $(BDE_CPPFLAGS) $(LKM_CFLAGS) $(LKM_CPPFLAGS) \
              $(LKM_BUILD_INFO) \
              -I$(SDK)/linux/include \
              -I$(SDK)/linux/bde \
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_dma.c b/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_dma.c
index 92a5911b5b05..ca08428ff276 100644
--- a/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_dma.c
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/bde/ngbde_dma.c
@@ -58,6 +58,13 @@ MODULE_PARM_DESC(dma_pools,
 "Number of DMA memory pools to pre-allocate per device (default 1).");
 /*! \endcond */
 
+/*! \cond */
+static int dma_32bit = 0;
+module_param(dma_32bit, int, S_IRUSR);
+MODULE_PARM_DESC(dma_32bit,
+"Request DMA memory with 32-bit physical address (default 0).");
+/*! \endcond */
+
 /*!
  * \brief Allocate DMA memory via kernel API.
  *
@@ -72,8 +79,8 @@ ngbde_dmamem_kapi_alloc(ngbde_dmactrl_t *dmactrl, ngbde_dmamem_t *dmamem)
     void *vaddr;
     dma_addr_t baddr;
 
-    vaddr = dma_alloc_coherent(dmactrl->dev, dmactrl->size, &baddr,
-                               dmactrl->flags);
+    vaddr = dma_alloc_attrs(dmactrl->dev, dmactrl->size, &baddr,
+                            dmactrl->flags, DMA_FORCE_CONTIGUOUS);
     if (vaddr) {
         /* Store allocation information in dmamem structure */
         dmamem->vaddr = vaddr;
@@ -84,7 +91,7 @@ ngbde_dmamem_kapi_alloc(ngbde_dmactrl_t *dmactrl, ngbde_dmamem_t *dmamem)
         dmamem->baddr = baddr;
 
         /* Write small signature for debug purposes */
-        strcpy((char *)vaddr, "DMA_KAPI");
+        strlcpy((char *)vaddr, "DMA_KAPI", dmactrl->size);
 
         if (dma_debug) {
             printk("DMA: Allocated %d KB of KAPI memory at 0x%08lx\n",
@@ -131,7 +138,7 @@ ngbde_dmamem_pgmem_alloc(ngbde_dmactrl_t *dmactrl, ngbde_dmamem_t *dmamem)
         }
 
         /* Write small signature for debug purposes */
-        strcpy((char *)vaddr, "DMA_PGMEM");
+        strlcpy((char *)vaddr, "DMA_PGMEM", dmactrl->size);
 
         if (dma_debug) {
             printk("DMA: Allocated %d KB of PGMEM memory at 0x%08lx\n",
@@ -226,8 +233,9 @@ ngbde_dmamem_free(ngbde_dmamem_t *dmamem)
             printk("DMA: Freeing %d KB of KAPI memory\n",
                    (int)(dmamem->size / ONE_KB));
         }
-        dma_free_coherent(dmamem->dev, dmamem->size,
-                          dmamem->vaddr, dmamem->baddr);
+        dma_free_attrs(dmamem->dev, dmamem->size,
+                       dmamem->vaddr, dmamem->baddr,
+                       DMA_FORCE_CONTIGUOUS);
         memset(dmamem, 0, sizeof(*dmamem));
         break;
     case NGBDE_DMA_T_PGMEM:
@@ -329,7 +337,14 @@ ngbde_dma_init(void)
             dmapool->dmactrl.dev = swdev[idx].dma_dev;
             dmapool->dmactrl.size = dma_size * ONE_MB;
             dmapool->dmactrl.pref_type = dma_type;
-            dmapool->dmactrl.flags = GFP_KERNEL | GFP_DMA32;
+            dmapool->dmactrl.flags = GFP_KERNEL;
+            if (dma_32bit) {
+                dmapool->dmactrl.flags |= GFP_DMA32;
+            }
+            if (dma_type == NGBDE_DMA_T_AUTO && dma_debug == 0) {
+                /* Prevent warning if CMA is unavailable */
+                dmapool->dmactrl.flags |= __GFP_NOWARN;
+            }
         }
 
         /* Allocate DMA pools */
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/edk/Kbuild b/platform/broadcom/saibcm-modules/sdklt/linux/edk/Kbuild
new file mode 100755
index 000000000000..d70336f2ac64
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/edk/Kbuild
@@ -0,0 +1,17 @@
+# -*- Kbuild -*-
+#
+# Linux KNET Callback module.
+#
+# $Copyright:.$
+#
+
+obj-m := linux_ngedk.o
+
+ccflags-y := $(LKM_CFLAGS) \
+             -I$(SDK)/shr/include \
+             -I$(SDK)/bcmdrd/include \
+             -I$(SDK)/linux/include \
+             -I$(SDK)/linux/knet/include \
+             -I$(SDK)/linux/knet
+
+linux_ngedk-y := ngedk_main.o
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/edk/Makefile b/platform/broadcom/saibcm-modules/sdklt/linux/edk/Makefile
new file mode 100755
index 000000000000..2eb52d53a469
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/edk/Makefile
@@ -0,0 +1,19 @@
+#
+# $Copyright: Broadcom Ltd.$
+#
+# Linux KNET Callback module.
+#
+
+include Kbuild
+
+ifeq ($(KERNELRELEASE),)
+
+MOD_NAME = linux_ngedk
+
+include $(SDK)/make/lkm.mk
+
+endif
+
+.PHONY: distclean
+
+distclean::
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/edk/ngedk_main.c b/platform/broadcom/saibcm-modules/sdklt/linux/edk/ngedk_main.c
new file mode 100755
index 000000000000..7155da0e74d2
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/edk/ngedk_main.c
@@ -0,0 +1,497 @@
+/*! \file ngedk_main.c
+ *
+ * EDK support module entry.
+ *
+ */
+/*
+ * $Copyright:.$
+ */
+
+#include <lkm/lkm.h>
+#include <lkm/ngbde_kapi.h>
+#include <lkm/ngedk_ioctl.h>
+#include <lkm/ngedk_kapi.h>
+
+/*! \cond */
+MODULE_AUTHOR("Broadcom");
+MODULE_DESCRIPTION("EDK Support Module");
+MODULE_LICENSE("GPL");
+/*! \endcond */
+
+/*! Maximum number of switch devices supported. */
+#ifndef NGEDK_NUM_SWDEV_MAX
+#define NGEDK_NUM_SWDEV_MAX     NGBDE_NUM_SWDEV_MAX
+#endif
+
+/*! Kernel DMA API (dma_alloc_coherent). */
+#define NGEDK_DMA_T_KAPI        1
+
+/*! Page allocator and map to physical address manually. */
+#define NGEDK_DMA_T_PGMEM       2
+
+/* Structure to hold info about interrupts handled by EDK */
+typedef struct edk_intr_s {
+
+    /*! Unit Level Enable */
+    uint32_t enable;
+
+    /*! Active cores */
+    uint32_t active_bmp;
+
+    /*! Timer interrupts status offset */
+    uint32_t timer_intrc_stat_reg;
+
+    /*! Timer interrupts disable offset */
+    uint32_t timer_intrc_disable_reg;
+
+    /*! Timer interrupts mask */
+    uint32_t timer_intrc_mask_val;
+
+    /*! Bitmap of cores that asserted SW Programmable Interrupt */
+    volatile unsigned long swi_intr_cores;
+
+    /*! EDK interrupt flags */
+    uint32_t flags;
+
+} edk_intr_t;
+
+/*! Switch device descriptor. */
+typedef struct edk_dev_s {
+
+    /*! Kernel device number (similar to user mode unit number). */
+    int kdev;
+
+    /* TODO: Keep DMArelated vars in a separate sub-structure ? */
+
+    /*! Logical address of DMA pool. */
+    void *dma_vaddr;
+
+    /*! Physical address of DMA pool. */
+    dma_addr_t dma_paddr;
+
+    /*! Bus address of DMA pool. */
+    dma_addr_t dma_baddr;
+
+    /*! Size of DMA memory (in bytes). */
+    size_t dma_size;
+
+    /*! DMA pool type. KNET or PGMEM */
+    int dma_type;
+
+    /*! Linux DMA device associated with DMA pool. */
+    struct device *dma_dev;
+
+    /* EDK Interrupt detail */
+    struct edk_intr_s edk_intr;
+
+    /*! Wait queue for edk interrupt thread. */
+    wait_queue_head_t edk_thread_wq;
+
+    /*! Flag to wake up edk interrupt thread. */
+    atomic_t run_edk_thread;
+
+    /*! Number of interrupts processed. */
+    unsigned long intr_cnt;
+
+} edk_dev_t;
+
+static edk_dev_t edkdevs[NGBDE_NUM_SWDEV_MAX];
+
+static int
+ngedk_dmamem_alloc(edk_dev_t *edkdev, size_t size)
+{
+    void *vaddr;
+    dma_addr_t baddr;
+
+    if (edkdev->dma_vaddr) {
+        /* Already allocated */
+        return 0;
+    }
+
+#ifdef CONFIG_CMA
+    vaddr = dma_alloc_coherent(edkdev->dma_dev, size, &baddr,
+                               GFP_KERNEL | GFP_DMA32);
+    if (vaddr) {
+        /* Store allocation information in the edk device */
+        edkdev->dma_vaddr = vaddr;
+        edkdev->dma_paddr = virt_to_phys(vaddr);
+        edkdev->dma_baddr = baddr;
+        edkdev->dma_size = size;
+        edkdev->dma_type = NGEDK_DMA_T_KAPI;
+        return 0;
+    }
+#endif
+    vaddr = ngbde_kapi_dma_alloc(size);
+    if (vaddr) {
+        /* Store allocation information in the edk device */
+        edkdev->dma_vaddr = vaddr;
+        edkdev->dma_paddr = virt_to_phys(vaddr);
+        edkdev->dma_size = size;
+        edkdev->dma_type = NGEDK_DMA_T_PGMEM;
+        baddr = dma_map_single(edkdev->dma_dev, edkdev->dma_vaddr,
+                               edkdev->dma_size, DMA_BIDIRECTIONAL);
+        if (dma_mapping_error(edkdev->dma_dev, baddr)) {
+            edkdev->dma_baddr = 0;
+            printk("EDK: Failed to map PGMEM memory\n");
+        } else {
+            edkdev->dma_baddr = baddr;
+        }
+        return 0;
+    }
+
+    edkdev->dma_vaddr = NULL;
+    return -1;
+}
+
+static void
+ngedk_dmamem_free(edk_dev_t *edkdev)
+{
+    if (edkdev->dma_type == NGEDK_DMA_T_KAPI) {
+        dma_free_coherent(edkdev->dma_dev, edkdev->dma_size,
+                          edkdev->dma_vaddr, edkdev->dma_baddr);
+    } else if (edkdev->dma_type == NGEDK_DMA_T_PGMEM) {
+
+        if (edkdev->dma_baddr) {
+            dma_unmap_single(edkdev->dma_dev, edkdev->dma_baddr,
+                             edkdev->dma_size, DMA_BIDIRECTIONAL);
+        }
+        ngbde_kapi_dma_free(edkdev->dma_vaddr);
+    }
+    edkdev->dma_type = 0;
+    edkdev->dma_vaddr = 0;
+}
+
+void *
+ngedk_dmamem_map_p2v(dma_addr_t paddr)
+{
+    struct edk_dev_s *ed;
+    ed = &edkdevs[0];
+    if ((paddr >= ed->dma_baddr) &&
+        (paddr < (ed->dma_baddr + ed->dma_size))) {
+        return (ed->dma_vaddr + (paddr - ed->dma_baddr));
+    } else {
+        return NULL;
+    }
+}
+EXPORT_SYMBOL(ngedk_dmamem_map_p2v);
+
+int
+ngedk_intr_wait(int kdev, uint32_t *uc_bmp)
+{
+    int32_t core;
+    struct edk_dev_s *ed = &edkdevs[kdev];
+
+    wait_event_interruptible(ed->edk_thread_wq,
+                             atomic_read(&ed->run_edk_thread) != 0);
+    atomic_set(&ed->run_edk_thread, 0);
+
+    *uc_bmp = 0;
+    if (ed->edk_intr.swi_intr_cores) {
+        /* We got a SW Interrupt */
+        for (core = 0; core < MCS_NUM_UC; core++) {
+            if (test_and_clear_bit(core, &(ed->edk_intr.swi_intr_cores))) {
+               /* FIXME: Check against active_bmp? Or leave it upto EDK-Host? */
+               *uc_bmp |= (1 << core);
+            }
+        }
+    }
+    return 0;
+}
+
+static int
+ngedk_swdev_init(int kdev)
+{
+    struct device *edk_dev;
+    struct edk_dev_s *ed = &edkdevs[kdev];
+
+    edk_dev = ngbde_kapi_dma_dev_get(kdev);
+    if (edk_dev) {
+        printk(KERN_INFO "Found EDK dev %d\n", kdev);
+        ed->kdev = kdev;
+        ed->dma_dev = edk_dev;
+        ed->edk_intr.swi_intr_cores = 0;
+        init_waitqueue_head(&ed->edk_thread_wq);
+        atomic_set(&ed->run_edk_thread, 0);
+    }
+
+    return 0;
+}
+
+static int
+ngedk_swdev_cleanup(int kdev)
+{
+    struct edk_dev_s *ed = &edkdevs[kdev];
+
+    if (ed->dma_dev) {
+        printk(KERN_INFO "Clean up EDK dev %d\n", kdev);
+        /* Wake up edk thread */
+        atomic_set(&ed->run_edk_thread, 1);
+        wake_up_interruptible(&ed->edk_thread_wq);
+    }
+    if (ed->dma_vaddr) {
+        ngedk_dmamem_free(ed);
+    }
+    memset(ed, 0, sizeof(*ed));
+
+    return 0;
+}
+
+static int
+ngedk_attach(void)
+{
+    int kdev;
+
+    for (kdev = 0; kdev < NGEDK_NUM_SWDEV_MAX; kdev++) {
+        ngedk_swdev_init(kdev);
+    }
+
+    return 0;
+}
+
+static int
+ngedk_detach(void)
+{
+    int kdev;
+
+    for (kdev = 0; kdev < NGEDK_NUM_SWDEV_MAX; kdev++) {
+        ngedk_swdev_cleanup(kdev);
+    }
+
+    return 0;
+}
+
+static int
+proc_show(struct seq_file *m, void *v)
+{
+    seq_printf(m, "Broadcom EDK Support (%s)\n", NGEDK_MODULE_NAME);
+
+    return 0;
+}
+
+static int
+proc_open(struct inode *inode, struct file *file)
+{
+    return single_open(file, proc_show, NULL);
+}
+
+static int
+proc_release(struct inode *inode, struct file *file)
+{
+    return single_release(inode, file);
+}
+
+static struct proc_ops proc_fops = {
+    PROC_OWNER(THIS_MODULE)
+    .proc_open =        proc_open,
+    .proc_read =        seq_read,
+    .proc_lseek =       seq_lseek,
+    .proc_release =     proc_release,
+};
+
+static int
+ngedk_procfs_init(void)
+{
+    struct proc_dir_entry *entry;
+
+    PROC_CREATE(entry, NGEDK_MODULE_NAME, 0666, NULL, &proc_fops);
+
+    if (entry == NULL) {
+        printk(KERN_ERR "ngedk: proc_create failed\n");
+        return -1;
+    }
+
+    return 0;
+}
+
+static int
+ngedk_procfs_cleanup(void)
+{
+    remove_proc_entry(NGEDK_MODULE_NAME, NULL);
+
+    return 0;
+}
+
+/*!
+ * Generic module functions
+ */
+
+static int
+ngedk_open(struct inode *inode, struct file *filp)
+{
+    return 0;
+}
+
+static int
+ngedk_release(struct inode *inode, struct file *filp)
+{
+    return 0;
+}
+
+static long
+ngedk_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+{
+    struct ngedk_ioc_cmd_s ioc;
+    struct edk_dev_s *ed;
+
+    if (copy_from_user(&ioc, (void *)arg, sizeof(ioc))) {
+        return -EFAULT;
+    }
+
+    ioc.rc = NGEDK_IOC_SUCCESS;
+
+    switch (cmd) {
+    case NGEDK_IOC_MOD_INFO:
+        ioc.op.mod_info.version = NGEDK_IOC_VERSION;
+        break;
+    case NGEDK_IOC_ATTACH_INST:
+        ed = &edkdevs[ioc.devid];
+        if (ngedk_dmamem_alloc(ed, ioc.op.attach_inst.size_mb) < 0) {
+            printk(KERN_WARNING "Unable to allocate DMA pool for EDK\n");
+            ioc.rc = NGEDK_IOC_FAIL;
+            break;
+        }
+        printk(KERN_INFO "ngedk: Attach unit %d hram %d\n",
+                          ioc.devid, ioc.op.attach_inst.size_mb);
+        break;
+    case NGEDK_IOC_GET_DMA_INFO:
+        ed = &edkdevs[ioc.devid];
+        ioc.op.dma_info.vaddr = (uintptr_t)ed->dma_vaddr;
+        ioc.op.dma_info.paddr = ed->dma_paddr;
+        ioc.op.dma_info.baddr = ed->dma_baddr;
+        ioc.op.dma_info.size = ed->dma_size;
+        break;
+    case NGEDK_IOC_INTR_WAIT:
+        if (ngedk_intr_wait(ioc.devid, &ioc.op.edk_intr.sw_intr_cores) < 0) {
+            ioc.rc = NGEDK_IOC_FAIL;
+        }
+        break;
+    case NGEDK_IOC_INTR_ENABLE:
+        ed = &edkdevs[ioc.devid];
+        ed->edk_intr.enable = 1;
+        break;
+    case NGEDK_IOC_INTR_DISABLE:
+        ed = &edkdevs[ioc.devid];
+        ed->edk_intr.enable = 0;
+        break;
+    case NGEDK_IOC_INTR_SET:
+        ed = &edkdevs[ioc.devid];
+
+        /* Active uCs */
+        ed->edk_intr.active_bmp = ioc.op.edk_intr.active_bmp;
+        /* To check if a timer interrupt is asserted */
+        ed->edk_intr.timer_intrc_stat_reg = ioc.op.edk_intr.timer_intrc_stat_reg;
+        ed->edk_intr.timer_intrc_disable_reg = ioc.op.edk_intr.timer_intrc_disable_reg;
+        ed->edk_intr.timer_intrc_mask_val = ioc.op.edk_intr.timer_intrc_mask_val;
+        ed->edk_intr.flags = ioc.op.edk_intr.flags;
+        break;
+    case NGEDK_IOC_TIMER_INTR:
+        ed = &edkdevs[ioc.devid];
+        /* Two cores may use one interrupt. Leave it to the EDK Host to Identify */
+        atomic_set(&ed->run_edk_thread, 1);
+        wake_up_interruptible(&ed->edk_thread_wq);
+        break;
+    case NGEDK_IOC_SW_INTR:
+        ed = &edkdevs[ioc.devid];
+        set_bit(ioc.op.sw_intr.uc, &(ed->edk_intr.swi_intr_cores));
+        atomic_set(&ed->run_edk_thread, 1);
+        wake_up_interruptible(&ed->edk_thread_wq);
+        break;
+    default:
+        printk(KERN_ERR "ngedk: invalid ioctl (%08x)\n", cmd);
+        ioc.rc = NGEDK_IOC_FAIL;
+        break;
+    }
+
+    if (copy_to_user((void *)arg, &ioc, sizeof(ioc))) {
+        return -EFAULT;
+    }
+
+    return 0;
+}
+
+static int
+ngedk_mmap(struct file *filp, struct vm_area_struct *vma)
+{
+    unsigned long paddr = vma->vm_pgoff << PAGE_SHIFT;
+    unsigned long size = vma->vm_end - vma->vm_start;
+    struct edk_dev_s *edkdev;
+    int kdev;
+    int range_valid = 0;
+    int map_noncached = 0;
+
+    /* Check for valid range */
+    for (kdev = 0; kdev < NGEDK_NUM_SWDEV_MAX; kdev++) {
+        edkdev = &edkdevs[kdev];
+        if (paddr >= edkdev->dma_paddr &&
+            (paddr + size) <= (edkdev->dma_paddr + edkdev->dma_size)) {
+            if (edkdev->dma_type == NGEDK_DMA_T_KAPI) {
+                map_noncached = 1;
+            }
+            range_valid = 1;
+            break;
+        }
+    }
+
+    if (!range_valid) {
+       printk("NGEDK: Invalid mmap range 0x%08lx/0x%lx\n", paddr, size);
+       return -EINVAL;
+    }
+
+    if (map_noncached) {
+        vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
+    }
+
+    if (remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
+                        size, vma->vm_page_prot)) {
+        printk("EDK: Failed to mmap phys range 0x%lx-0x%lx to 0x%lx-0x%lx\n",
+               paddr, paddr + size, vma->vm_start, vma->vm_end);
+        return -EAGAIN;
+    }
+
+    return 0;
+}
+
+static struct file_operations ngedk_fops = {
+    .open = ngedk_open,
+    .release = ngedk_release,
+    .unlocked_ioctl = ngedk_ioctl,
+    .compat_ioctl = ngedk_ioctl,
+    .mmap = ngedk_mmap,
+};
+
+static void __exit
+ngedk_exit_module(void)
+{
+    ngedk_detach();
+    ngedk_procfs_cleanup();
+    unregister_chrdev(NGEDK_MODULE_MAJOR, NGEDK_MODULE_NAME);
+    printk(KERN_INFO "Broadcom NGEDK unloaded successfully\n");
+}
+
+static int __init
+ngedk_init_module(void)
+{
+    int rv;
+
+    rv = register_chrdev(NGEDK_MODULE_MAJOR, NGEDK_MODULE_NAME, &ngedk_fops);
+    if (rv < 0) {
+        printk(KERN_WARNING "%s: can't get major %d\n",
+               NGEDK_MODULE_NAME, NGEDK_MODULE_MAJOR);
+        return rv;
+    }
+
+    rv = ngedk_procfs_init();
+    if (rv < 0) {
+        printk(KERN_WARNING "%s: Unable to initialize proc files\n",
+               NGEDK_MODULE_NAME);
+        return rv;
+    }
+
+    ngedk_attach();
+
+    printk(KERN_INFO "Broadcom NGEDK loaded successfully\n");
+    return 0;
+}
+
+module_exit(ngedk_exit_module);
+module_init(ngedk_init_module);
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/genl-packet/Kbuild b/platform/broadcom/saibcm-modules/sdklt/linux/genl-packet/Kbuild
index c0b31433648c..52556ce879bb 100644
--- a/platform/broadcom/saibcm-modules/sdklt/linux/genl-packet/Kbuild
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/genl-packet/Kbuild
@@ -8,6 +8,6 @@
 
 obj-m := genl-packet.o
 
-ccflags-y := $(LKM_CFLAGS) \
+ccflags-y := $(LKM_CFLAGS) $(LKM_CPPFLAGS) \
 	     -I$(SDK)/linux/include/lkm \
 	     -I$(SDK)/linux/include/kernel
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/include/lkm/lkm.h b/platform/broadcom/saibcm-modules/sdklt/linux/include/lkm/lkm.h
index bf838dd5856d..971629600078 100644
--- a/platform/broadcom/saibcm-modules/sdklt/linux/include/lkm/lkm.h
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/include/lkm/lkm.h
@@ -25,18 +25,13 @@
 
 #include <linux/init.h>
 #include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0)
 #error Kernel too old
 #endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)
 #include <linux/kconfig.h>
-#endif
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
 #include <linux/slab.h>
 #endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)
-#include <linux/smp_lock.h>
-#endif
 #include <linux/module.h>
 
 #include <linux/kernel.h>
@@ -138,6 +133,12 @@ static inline void page_ref_dec(struct page *page)
 }
 #endif
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,8,0)
+#define DMA_FORCE_CONTIGUOUS NULL
+#else
+#define DMA_FORCE_CONTIGUOUS DMA_ATTR_FORCE_CONTIGUOUS
+#endif
+
 #ifndef PCI_IRQ_LEGACY
 /* Emulate new IRQ API if not available */
 #define PCI_IRQ_LEGACY          (1 << 0)
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/knet/Kbuild b/platform/broadcom/saibcm-modules/sdklt/linux/knet/Kbuild
index 89610dd2b44d..a0d6cc0e9298 100644
--- a/platform/broadcom/saibcm-modules/sdklt/linux/knet/Kbuild
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/knet/Kbuild
@@ -24,7 +24,7 @@ ifneq ($(OUTPUT_DIR),)
 INCLUDES := -I$(OUTPUT_DIR)/knet/generated/include -I$(OUTPUT_DIR)/knet/generated
 endif
 
-ccflags-y := $(KNET_CPPFLAGS) $(LKM_CFLAGS) \
+ccflags-y := $(KNET_CPPFLAGS) $(LKM_CFLAGS) $(LKM_CPPFLAGS) \
              -I$(SDK)/shr/include \
              -I$(SDK)/bcmdrd/include \
              -I$(SDK)/linux/include \
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_callback.c b/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_callback.c
index 2766758d2c69..65965abfbf25 100644
--- a/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_callback.c
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_callback.c
@@ -29,6 +29,7 @@ static struct ngknet_callback_ctrl callback_ctrl;
 void
 ngknet_callback_init(struct ngknet_dev *devs)
 {
+    INIT_LIST_HEAD(&callback_ctrl.dev_init_cb_list);
     INIT_LIST_HEAD(&callback_ctrl.netif_create_cb_list);
     INIT_LIST_HEAD(&callback_ctrl.netif_destroy_cb_list);
     INIT_LIST_HEAD(&callback_ctrl.filter_cb_list);
@@ -38,10 +39,16 @@ ngknet_callback_init(struct ngknet_dev *devs)
 void
 ngknet_callback_cleanup(void)
 {
+    dev_cb_t *dev_cb;
     netif_cb_t *netif_cb;
     filter_cb_t *filter_cb;
 
-    /* Destroy any create/destroy netif which is not unregistered */
+    while (!list_empty(&callback_ctrl.dev_init_cb_list)) {
+        dev_cb = list_entry(callback_ctrl.dev_init_cb_list.next,
+                            dev_cb_t, list);
+        list_del(&dev_cb->list);
+        kfree(dev_cb);
+    }
     while (!list_empty(&callback_ctrl.netif_create_cb_list)) {
         netif_cb = list_entry(callback_ctrl.netif_create_cb_list.next,
                               netif_cb_t, list);
@@ -77,10 +84,26 @@ ngknet_callback_control_get(struct ngknet_callback_ctrl **cbc)
 int
 ngknet_dev_init_cb_register(ngknet_dev_init_cb_f dev_init_cb)
 {
-    if (callback_ctrl.dev_init_cb != NULL) {
+    struct list_head *list;
+    dev_cb_t *dev_cb;
+
+    if (dev_init_cb == NULL) {
         return -1;
     }
-    callback_ctrl.dev_init_cb = dev_init_cb;
+
+    list_for_each(list, &callback_ctrl.dev_init_cb_list) {
+        dev_cb = list_entry(list, dev_cb_t, list);
+        if (dev_cb->cb == dev_init_cb) {
+            return -1;
+        }
+    }
+
+    dev_cb = kmalloc(sizeof(*dev_cb), GFP_KERNEL);
+    if (dev_cb == NULL) {
+        return -1;
+    }
+    dev_cb->cb = dev_init_cb;
+    list_add_tail(&dev_cb->list, &callback_ctrl.dev_init_cb_list);
 
     return 0;
 }
@@ -88,12 +111,23 @@ ngknet_dev_init_cb_register(ngknet_dev_init_cb_f dev_init_cb)
 int
 ngknet_dev_init_cb_unregister(ngknet_dev_init_cb_f dev_init_cb)
 {
-    if (dev_init_cb == NULL || callback_ctrl.dev_init_cb != dev_init_cb) {
+    struct list_head *list, *list_next;
+    dev_cb_t *dev_cb;
+
+    if (dev_init_cb == NULL) {
         return -1;
     }
-    callback_ctrl.dev_init_cb = NULL;
 
-    return 0;
+    list_for_each_safe(list, list_next, &callback_ctrl.dev_init_cb_list) {
+        dev_cb = list_entry(list, dev_cb_t, list);
+        if (dev_cb->cb == dev_init_cb) {
+            list_del(list);
+            kfree(dev_cb);
+            return 0;
+        }
+    }
+
+    return -1;
 }
 
 int
@@ -281,7 +315,7 @@ ngknet_filter_cb_register_by_name(ngknet_filter_cb_f filter_cb, const char *desc
         return -1;
     }
     fcb->cb = filter_cb;
-    strcpy(fcb->desc, desc);
+    strlcpy(fcb->desc, desc, sizeof(fcb->desc));
     list_add_tail(&fcb->list, &callback_ctrl.filter_cb_list);
 
     /* Check if any existing filter matches the registered name */
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_callback.h b/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_callback.h
index 04b06500c792..53eed443671e 100644
--- a/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_callback.h
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_callback.h
@@ -25,6 +25,14 @@
 
 #include <lkm/ngknet_kapi.h>
 
+typedef struct dev_cb_s {
+    /*! List head */
+    struct list_head list;
+
+    /*! Device callback */
+    ngknet_dev_init_cb_f cb;
+} dev_cb_t;
+
 typedef struct netif_cb_s {
     /*! List head */
     struct list_head list;
@@ -47,8 +55,8 @@ typedef struct filter_cb_s {
  * \brief NGKNET callback control.
  */
 struct ngknet_callback_ctrl {
-    /*! Handle TX/RX callback initialization. */
-    ngknet_dev_init_cb_f dev_init_cb;
+    /*! Device initialization callback list */
+    struct list_head dev_init_cb_list;
 
     /*! Handle Rx packet */
     ngknet_rx_cb_f rx_cb;
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_linux.h b/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_linux.h
index bbda4df0a774..100e0e3894d5 100644
--- a/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_linux.h
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_linux.h
@@ -34,6 +34,14 @@
 
 #define MODULE_PARAM(n, t, p)   module_param(n, t, p)
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5,19,0))
+#define kal_netif_napi_add(_dev, _napi, _poll, _weight) \
+            netif_napi_add(_dev, _napi, _poll, _weight)
+#else
+#define kal_netif_napi_add(_dev, _napi, _poll, _weight) \
+            netif_napi_add_weight(_dev, _napi, _poll, _weight)
+#endif
+
 /*
  * The eth_hw_addr_set was added in Linux 5.15, but later backported
  * to various longterm releases, so we need a more advanced check with
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_main.c b/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_main.c
index d17e88d1c042..bdc93f90dbd8 100644
--- a/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_main.c
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_main.c
@@ -362,17 +362,19 @@ ngknet_rx_frame_process(struct net_device *ndev, struct sk_buff **oskb)
 {
     struct ngknet_private *priv = netdev_priv(ndev);
     struct ngknet_dev *dev = priv->bkn_dev;
+    struct pdma_dev *pdev = &dev->pdma_dev;
     struct sk_buff *skb = *oskb;
     struct ngknet_rcpu_hdr *rch = (struct ngknet_rcpu_hdr *)skb->data;
     struct pkt_hdr *pkh = (struct pkt_hdr *)skb->data;
     uint8_t meta_len = pkh->meta_len;
+    uint8_t fcs_len = pdev->flags & PDMA_NO_FCS ? 0 : ETH_FCS_LEN;
 #if SAI_FIXUP && KNET_SVTAG_HOTFIX
     int offset;
 #endif
 
     /* Remove FCS from packet length */
-    skb_trim(skb, skb->len - ETH_FCS_LEN);
-    pkh->data_len -= ETH_FCS_LEN;
+    skb_trim(skb, skb->len - fcs_len);
+    pkh->data_len -= fcs_len;
 
     if (priv->netif.flags & NGKNET_NETIF_F_RCPU_ENCAP) {
         /* Set up RCPU header */
@@ -403,7 +405,7 @@ ngknet_rx_frame_process(struct net_device *ndev, struct sk_buff **oskb)
         ngknet_ptp_rx_hwts_set(ndev, skb);
     }
 
-         /* Check to ensure ngknet_callback_desc struct fits in sk_buff->cb */
+    /* Check to ensure ngknet_callback_desc struct fits in sk_buff->cb */
     BUILD_BUG_ON(sizeof(struct ngknet_callback_desc) > sizeof(skb->cb));
 #if SAI_FIXUP && KNET_SVTAG_HOTFIX /* SONIC-76482 */
     /* Strip SVTAG from the packets injected by the MACSEC block */
@@ -568,9 +570,14 @@ ngknet_frame_recv(struct pdma_dev *pdev, int queue, void *buf)
 
     /* Populate header, checksum status, VLAN, and protocol */
     priv = netdev_priv(ndev);
-    if (!netif_carrier_ok(ndev) ||
-        SHR_FAILURE(ngknet_netif_recv(ndev, skb))) {
-        priv->stats.rx_dropped++;
+    if (netif_carrier_ok(ndev)) {
+        if (SHR_FAILURE(ngknet_netif_recv(ndev, skb))) {
+            dev_kfree_skb_any(skb);
+            if (!netif_queue_stopped(ndev)) {
+                priv->stats.rx_dropped++;
+            }
+        }
+    } else {
         dev_kfree_skb_any(skb);
     }
 
@@ -584,9 +591,14 @@ ngknet_frame_recv(struct pdma_dev *pdev, int queue, void *buf)
     /* Handle mirrored packet */
     if (mndev && mskb) {
         priv = netdev_priv(mndev);
-        if (!netif_carrier_ok(mndev) ||
-            SHR_FAILURE(ngknet_netif_recv(mndev, mskb))) {
-            priv->stats.rx_dropped++;
+        if (netif_carrier_ok(mndev)) {
+            if (SHR_FAILURE(ngknet_netif_recv(mndev, mskb))) {
+                dev_kfree_skb_any(mskb);
+                if (!netif_queue_stopped(mndev)) {
+                    priv->stats.rx_dropped++;
+                }
+            }
+        } else {
             dev_kfree_skb_any(mskb);
         }
         spin_lock_irqsave(&dev->lock, flags);
@@ -704,19 +716,21 @@ ngknet_tx_frame_process(struct net_device *ndev, struct sk_buff **oskb)
 {
     struct ngknet_private *priv = netdev_priv(ndev);
     struct ngknet_dev *dev = priv->bkn_dev;
+    struct pdma_dev *pdev = &dev->pdma_dev;
     struct sk_buff *skb = *oskb;
     struct ngknet_rcpu_hdr *rch = (struct ngknet_rcpu_hdr *)skb->data;
     struct pkt_hdr *pkh = (struct pkt_hdr *)skb->data;
     struct sk_buff *nskb = NULL;
     char *data = NULL;
     uint32_t copy_len, meta_len, data_len, pkt_len, tag_len, pad_len;
+    uint16_t fcs_len = pdev->flags & PDMA_NO_FCS ? 0 : ETH_FCS_LEN;
     uint16_t tpid;
 
     /* Set up packet header */
     if (priv->netif.flags & NGKNET_NETIF_F_RCPU_ENCAP) {
         /* RCPU encapsulation packet */
         data_len = pkh->attrs & PDMA_TX_HDR_COOKED ?
-                   pkh->data_len - ETH_FCS_LEN : ntohs(rch->data_len);
+                   pkh->data_len - fcs_len : ntohs(rch->data_len);
         pkt_len = PKT_HDR_SIZE + rch->meta_len + data_len;
         if (skb->len != pkt_len || skb->len < (PKT_HDR_SIZE + ETH_HLEN)) {
             DBG_WARN(("Tx drop: Invalid packet length\n"));
@@ -730,7 +744,7 @@ ngknet_tx_frame_process(struct net_device *ndev, struct sk_buff **oskb)
             /* Resumed packet */
             return SHR_E_NONE;
         }
-        pkh->data_len = data_len + ETH_FCS_LEN;
+        pkh->data_len = data_len + fcs_len;
         pkh->meta_len = rch->meta_len;
         pkh->attrs = 0;
         if (rch->flags & RCPU_FLAG_MODHDR) {
@@ -750,7 +764,7 @@ ngknet_tx_frame_process(struct net_device *ndev, struct sk_buff **oskb)
         }
     } else {
         /* Non-RCPU encapsulation packet */
-        data_len = pkh->data_len - ETH_FCS_LEN;
+        data_len = pkh->data_len - fcs_len;
         pkt_len = PKT_HDR_SIZE + pkh->meta_len + data_len;
         if (skb->len == pkt_len && pkh->attrs & PDMA_TX_HDR_COOKED &&
             pkh->pkt_sig == dev->rcpu_ctrl.pkt_sig) {
@@ -767,9 +781,9 @@ ngknet_tx_frame_process(struct net_device *ndev, struct sk_buff **oskb)
         }
         if (skb_header_cloned(skb) ||
             skb_headroom(skb) < (PKT_HDR_SIZE + meta_len + VLAN_HLEN) ||
-            skb_tailroom(skb) < ETH_FCS_LEN) {
+            skb_tailroom(skb) < fcs_len) {
             nskb = skb_copy_expand(skb, PKT_HDR_SIZE + meta_len + VLAN_HLEN,
-                                   ETH_FCS_LEN, GFP_ATOMIC);
+                                   fcs_len, GFP_ATOMIC);
             if (!nskb) {
                 return SHR_E_MEMORY;
             }
@@ -780,7 +794,7 @@ ngknet_tx_frame_process(struct net_device *ndev, struct sk_buff **oskb)
         skb_push(skb, PKT_HDR_SIZE + meta_len);
         memset(skb->data, 0, PKT_HDR_SIZE + meta_len);
         pkh = (struct pkt_hdr *)skb->data;
-        pkh->data_len = skb->len - PKT_HDR_SIZE - meta_len + ETH_FCS_LEN;
+        pkh->data_len = skb->len - PKT_HDR_SIZE - meta_len + fcs_len;
         pkh->meta_len = meta_len;
         pkh->attrs = 0;
         if (priv->netif.type == NGKNET_NETIF_T_PORT) {
@@ -883,15 +897,15 @@ ngknet_tx_frame_process(struct net_device *ndev, struct sk_buff **oskb)
             return SHR_E_UNAVAIL;
         }
         pkh = (struct pkt_hdr *)skb->data;
-        pkh->data_len = skb->len - PKT_HDR_SIZE - pkh->meta_len + ETH_FCS_LEN;
+        pkh->data_len = skb->len - PKT_HDR_SIZE - pkh->meta_len + fcs_len;
     }
 
     /* Pad packet if needed */
-    pad_len = ETH_ZLEN + ETH_FCS_LEN + tag_len;
+    pad_len = ETH_ZLEN + tag_len + fcs_len;
     if (pkh->data_len < pad_len && !(pkh->attrs & PDMA_TX_NO_PAD)) {
         pkh->data_len = pad_len;
         if (skb_padto(skb,
-                      PKT_HDR_SIZE + pkh->meta_len + pkh->data_len - ETH_FCS_LEN)) {
+                      PKT_HDR_SIZE + pkh->meta_len + pkh->data_len - fcs_len)) {
             if (!nskb) {
                 *oskb = NULL;
             }
@@ -1348,6 +1362,7 @@ ngknet_enet_open(struct net_device *ndev)
     /* Prevent tx timeout */
     kal_netif_trans_update(ndev);
 
+    netif_carrier_on(ndev);
     netif_tx_wake_all_queues(ndev);
 
     return 0;
@@ -1367,6 +1382,7 @@ ngknet_enet_stop(struct net_device *ndev)
     int gi, qi;
 
     netif_tx_stop_all_queues(ndev);
+    netif_carrier_off(ndev);
 
     if (priv->netif.id <= 0) {
         /* Stop rate limit */
@@ -2022,8 +2038,8 @@ ngknet_dev_probe(int dn, ngknet_netif_t *netif)
             hdl = &pdev->ctrl.grp[gi].intr_hdl[qi];
             priv_hdl[hdl->unit][hdl->chan].hdl = hdl;
             hdl->priv = &priv_hdl[hdl->unit][hdl->chan];
-            netif_napi_add(ndev, (struct napi_struct *)hdl->priv,
-                           ngknet_poll);
+            kal_netif_napi_add(ndev, (struct napi_struct *)hdl->priv,
+                               ngknet_poll, pdev->ctrl.budget);
             if (pdev->flags & PDMA_GROUP_INTR) {
                 break;
             }
@@ -2459,6 +2475,8 @@ ngknet_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
     ngknet_chan_cfg_t *chan_cfg = &iod.chan_cfg;
     ngknet_netif_t *netif = &iod.netif;
     ngknet_filter_t *filter = &iod.filter;
+    struct list_head *list = NULL;
+    dev_cb_t *dev_cb = NULL;
     char *data = NULL;
     int dt, gi, qi;
 
@@ -2573,10 +2591,10 @@ ngknet_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         if (SHR_FAILURE((int)ioc.rc)) {
             break;
         }
-        if (dev->cbc->dev_init_cb) {
-            dev->cbc->dev_init_cb(&dev->dev_info);
+        list_for_each(list, &dev->cbc->dev_init_cb_list) {
+            dev_cb = list_entry(list, dev_cb_t, list);
+            dev_cb->cb(&dev->dev_info);
         }
-
         if (kal_copy_to_user((void *)(unsigned long)ioc.op.data.buf, dev_cfg,
                              ioc.op.data.len, sizeof(*dev_cfg))) {
             return -EFAULT;
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/knetcb/Kbuild b/platform/broadcom/saibcm-modules/sdklt/linux/knetcb/Kbuild
index d8ed4c27468e..739743f7b0f3 100644
--- a/platform/broadcom/saibcm-modules/sdklt/linux/knetcb/Kbuild
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/knetcb/Kbuild
@@ -37,6 +37,5 @@ ccflags-y := $(KNETCB_CPPFLAGS) $(LKM_CFLAGS) \
              -I$(SDK)/linux/knet/generated \
              $(INCLUDES)
 
-
 linux_ngknetcb-y := $(SDK_PMD_KOBJS) \
                     ngknetcb_main.o
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/knetcb/ngknetcb_main.c b/platform/broadcom/saibcm-modules/sdklt/linux/knetcb/ngknetcb_main.c
index f7501cf2962f..eab43fe6ab02 100644
--- a/platform/broadcom/saibcm-modules/sdklt/linux/knetcb/ngknetcb_main.c
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/knetcb/ngknetcb_main.c
@@ -1,15 +1,44 @@
 /*! \file ngknetcb_main.c
  *
  * NGKNET Callback module entry.
+ *
  */
 /*
- * $Copyright: (c) 2024 Broadcom.
- * Broadcom Proprietary and Confidential. All rights reserved.$
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * version 2 as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
  */
 
 #include <lkm/lkm.h>
+#include <lkm/ngknet_kapi.h>
+#include <ngknet_linux.h>
 #include <ngknet_callback.h>
 #include "bcmcnet/bcmcnet_core.h"
+
+#ifdef KPMD
+#include <bcmpkt/bcmpkt_flexhdr_internal.h>
+#include <bcmpkt/bcmpkt_flexhdr_field.h>
+#include <bcmpkt/bcmpkt_higig_defs.h>
+#include <bcmpkt/bcmpkt_lbhdr_field.h>
+#include <bcmpkt/bcmpkt_rxpmd.h>
+#include <bcmpkt/bcmpkt_rxpmd_defs.h>
+#include <bcmpkt/bcmpkt_rxpmd_fid.h>
+#include <bcmpkt/bcmpkt_rxpmd_field.h>
+#include <bcmpkt/bcmpkt_rxpmd_match_id.h>
+#include <bcmpkt/bcmpkt_txpmd_field.h>
+#endif /* KPMD */
+
 /*! \cond */
 MODULE_AUTHOR("Broadcom Corporation");
 MODULE_DESCRIPTION("NGKNET Callback Module");
@@ -35,6 +64,138 @@ MODULE_PARM_DESC(debug,
 #define FILTER_TAG_KEEP  1
 #define FILTER_TAG_ORIGINAL 2
 
+#define NGKNET_CB_DBG_LVL_VERB       0x0001
+#define NGKNET_CB_DBG_LVL_PDMP       0x0002
+#define NGKNET_CB_DBG_LVL_WARN       0x0004
+
+#ifndef KPMD
+#define BCMDRD_DEVLIST_ENTRY(_nm,_vn,_dv,_rv,_md,_pi,_bd,_bc,_fn,_cn,_pf,_pd,_r0,_r1) \
+    BCMDRD_DEV_T_##_bd,
+/*! Enumeration for all base device types. */
+typedef enum {
+    BCMDRD_DEV_T_NONE = 0,
+/*! \cond */
+#include <bcmdrd/bcmdrd_devlist.h>
+/*! \endcond */
+    BCMDRD_DEV_T_COUNT
+} bcmdrd_dev_type_t;
+
+/*! Create enumeration values from list of supported variants. */
+#define BCMLRD_VARIANT_ENTRY(_bd,_bu,_va,_ve,_vu,_vv,_vo,_vd,_r0,_r1)\
+    BCMLRD_VARIANT_T_##_bd##_##_ve,
+
+/*! Enumeration for all device variants. */
+typedef enum bcmlrd_variant_e {
+    BCMLRD_VARIANT_T_NONE = 0,
+/*! \cond */
+#include <bcmlrd/chip/bcmlrd_chip_variant.h>
+/*! \endcond */
+     BCMLRD_VARIANT_T_COUNT
+} bcmlrd_variant_t;
+#endif /* !KPMD */
+
+typedef struct ngknetcb_dev_s {
+    bool initialized;
+    bcmdrd_dev_type_t dev_type;
+    bcmlrd_variant_t var_type;
+} ngknetcb_dev_t;
+
+static ngknetcb_dev_t cb_dev[NUM_PDMA_DEV_MAX];
+
+#define BCMDRD_DEVLIST_ENTRY(_nm,_vn,_dv,_rv,_md,_pi,_bd,_bc,_fn,_cn,_pf,_pd,_r0,_r1) \
+    {#_bd, BCMDRD_DEV_T_##_bd},
+static const struct {
+    char *name;
+    bcmdrd_dev_type_t dev;
+} device_types[] = {
+    {"device_none", BCMDRD_DEV_T_NONE},
+#include <bcmdrd/bcmdrd_devlist.h>
+    {"device_count", BCMDRD_DEV_T_COUNT}
+};
+
+#define BCMLRD_VARIANT_ENTRY(_bd,_bu,_va,_ve,_vu,_vv,_vo,_vd,_r0,_r1)\
+    {#_bd, #_ve, BCMLRD_VARIANT_T_##_bd##_##_ve},
+static const struct {
+    char *dev_name;
+    char *var_name;
+    bcmlrd_variant_t var;
+} variant_types[] = {
+    {"device_none", "variant_none", BCMLRD_VARIANT_T_NONE},
+#include <bcmlrd/chip/bcmlrd_chip_variant.h>
+    {"device_count", "variant_count", BCMLRD_VARIANT_T_COUNT}
+};
+
+#ifdef KPMD
+/*
+  Change this structure to reflect the match_ids of interest.
+  This is an example of how it can be used.
+*/
+typedef struct cb_match_id_s {
+    int egress_pkt_fwd_l2_hdr_etag;
+    int egress_pkt_fwd_l2_hdr_l2;
+    int ingress_pkt_inner_l2_hdr_l2;
+    int ingress_pkt_fwd_l2_hdr_etag;
+    int ingress_pkt_outer_l2_hdr_itag;
+    int ingress_pkt_outer_l2_hdr_otag;
+} cb_match_id_t;
+
+static cb_match_id_t match_id;
+
+struct name_value_pair_s {
+    char *name;
+    int value;
+};
+
+static struct name_value_pair_s rxpmd_info[] = {
+    BCMPKT_RXPMD_FIELD_NAME_MAP_INIT
+};
+
+static const shr_enum_map_t reason_names[] =
+{
+    BCMPKT_REASON_NAME_MAP_INIT
+};
+
+static void
+print_all_rxpmd_fields(
+    bcmdrd_dev_type_t dev_type,
+    const uint8_t *rxpmd)
+{
+    int rv, fid;
+    bcmpkt_rxpmd_fid_support_t support;
+    uint32_t val;
+
+    printk("\n[RX metadata information]:\n");
+    bcmpkt_rxpmd_fid_support_get(dev_type, &support);
+
+    BCMPKT_RXPMD_FID_SUPPORT_ITER(support, fid) {
+        rv = bcmpkt_rxpmd_field_get
+            (dev_type, (uint32_t *)rxpmd, fid, &val);
+        if (rv == 0) {
+            printk("  %-26s = %10d [0x%X]\n", rxpmd_info[fid].name, val, val);
+        }
+    }
+}
+
+
+static void
+print_all_rx_reason(bcmdrd_dev_type_t dev_type, uint32_t *rxpmd)
+{
+    int reason, rv;
+    bcmpkt_rx_reasons_t reasons;
+
+    if (rxpmd) {
+        BCMPKT_RX_REASON_CLEAR_ALL(reasons);
+        rv = bcmpkt_rxpmd_reasons_get(dev_type, rxpmd, &reasons);
+        if (rv == 0) {
+            BCMPKT_RX_REASON_ITER(reasons, reason) {
+                printk("  %s\n", reason_names[reason].name);
+            }
+        }
+    }
+}
+#endif /* KPMD */
+
+
 /* Maintain tag strip statistics */
 struct strip_stats_s {
     unsigned long stripped;     /* Number of packets that have been stripped */
@@ -63,176 +224,131 @@ strip_vlan_tag(struct sk_buff *skb)
     }
 }
 
-static uint32_t
-dev_id_get(char* dev_type)
-{
-    uint32_t dev_id = 0xb880;
-
-    if (0 == strcmp(dev_type, "bcm56880_a0"))
-    {
-        dev_id = 0xb880;
-    }
-    else if (0 == strcmp(dev_type, "bcm56780_a0"))
-    {
-        dev_id = 0xb780;
-    }
-    else if ((0 == strcmp(dev_type, "bcm56990_a0")) ||
-            (0 == strcmp(dev_type, "bcm56990_b0")))
-    {
-        dev_id = 0xb990;
-    }
-    else if ((0 == strcmp(dev_type, "bcm56996_a0")) ||
-            (0 == strcmp(dev_type, "bcm56996_b0")))
-    {
-        dev_id = 0xb996;
-    }
-    else if ((0== strcmp(dev_type, "bcm56995_a0")) ||
-            (0== strcmp(dev_type, "bcm56999_a0")))
-    {
-        dev_id = 0xb999;
-    }
-    else if ((0== strcmp(dev_type, "bcm56993_b0")) ||
-            (0== strcmp(dev_type, "bcm56998_a0")))
-    {
-        dev_id = 0xb993;
-    }
-    else if (0== strcmp(dev_type, "bcm78900_b0"))
-    {
-        dev_id = 0xf900;
-    }
-    else if (0== strcmp(dev_type, "bcm78905_a0"))
-    {
-        dev_id = 0xf905;
-    }
-    else if (0== strcmp(dev_type, "bcm78800_a0"))
-    {
-        dev_id = 0xf800;
-    }
-    return dev_id;
-}
-
 /*
  * The function get_tag_status() returns the tag status.
- * 0 = Untagged
- * 1 = Single inner-tag
- * 2 = Single outer-tag
- * 3 = Double tagged.
+ * 0  = Untagged
+ * 1  = Single inner-tag
+ * 2  = Single outer-tag
+ * 3  = Double tagged.
  * -1 = Unsupported type
  */
 static int
-get_tag_status(char* dev_type, char* dev_var, void *meta)
+get_tag_status(uint32_t dev_type, uint32_t variant, void *rxpmd)
 {
-    uint32_t  *valptr;
-    uint32_t  fd_index;
-    uint32_t  outer_l2_hdr;
+    int rv;
+    const char *tag_type[4] = {
+        "Untagged",
+        "Inner Tagged",
+        "Outer Tagged",
+        "Double Tagged"
+    };
     int tag_status = -1;
-    uint32_t  match_id_minbit = 1;
-    uint32_t  outer_tag_match = 0x10;
-    uint32_t dev_id = 0xb880;
-
-    dev_id = dev_id_get(dev_type);
-#ifdef KNET_CB_DEBUG
-    if (debug & 0x1) {
-        printk("dev_type %s dev_var %s\n", dev_type, dev_var);
-    }
-#endif
-
-    if ((0xb880 == dev_id ) || (0xb780 == dev_id) || (0xf800 == dev_id))
-    {
-        /* Field BCM_PKTIO_RXPMD_MATCH_ID_LO has tag status in RX PMD */
-        fd_index = 2;
-        valptr = (uint32_t *)meta;
-        match_id_minbit = (dev_id == 0xb780) ? 2 : 1;        
-        outer_l2_hdr = (valptr[fd_index] >> match_id_minbit & 0xFF);
-        outer_tag_match = (((dev_id == 0xb780) &&
-                           (((strncmp(dev_var, "DNA_", 4)) == 0)||
-                            ((strncmp(dev_var, "HNA_", 4)) == 0))) ? 0x8 : 0x10);
-        if (outer_l2_hdr & 0x1) {
-#ifdef KNET_CB_DEBUG
-            if (debug & 0x1) {
-                printk("  L2 Header Present\n");
-            }
-#endif
-            tag_status = 0;
-            if (outer_l2_hdr & 0x4) {
-#ifdef KNET_CB_DEBUG
-                if (debug & 0x1) {
-                    printk("  SNAP/LLC\n");
-                }
-#endif
-                tag_status = 0;
-            }
-            if (outer_l2_hdr & outer_tag_match) {
+    bcmpkt_rxpmd_fid_support_t support;
+    uint32_t val = 0;
+
+    bcmpkt_rxpmd_fid_support_get(dev_type, &support);
+
+    if (BCMPKT_RXPMD_FID_SUPPORT_GET(support, BCMPKT_RXPMD_ING_TAG_TYPE)) {
+        rv = bcmpkt_rxpmd_field_get(dev_type, (uint32_t *)rxpmd,
+                                    BCMPKT_RXPMD_ING_TAG_TYPE, &val);
+        /* Tomahawk4 family */
+
+        /*
+         * Indicates the incoming tag status (INCOMING_TAG_STATUS):
+         * For single tag device:
+         *   0: untagged, 1: tagged
+         * For double tag device:
+         *   0: untagged, 1: single inner-tag, 2: single outer-tag, 3: double tagged
+         */
+        if (SHR_SUCCESS(rv)) {
+            if (1 == val) {
 #ifdef KNET_CB_DEBUG
-                if (debug & 0x1) {
-                    printk("  Outer Tagged\n");
+                if (debug & 0x1){
+                    printk("  Incoming frame tagged\n");
                 }
 #endif
-                tag_status = 2;    
-                if (outer_l2_hdr & 0x20) {
+                tag_status = 2;
+            } else if (0 == val) {
 #ifdef KNET_CB_DEBUG
-                    if (debug & 0x1) {
-                        printk("  Double Tagged\n");
-                    }
-#endif
-                    tag_status = 3;
+                if (debug & 0x1){
+                    printk("  Incoming frame untagged\n");
                 }
-            }
-            else if (outer_l2_hdr & 0x20) {
-#ifdef KNET_CB_DEBUG
-                if (debug & 0x1) {
-                    printk("  Inner Tagged\n");
-        }
 #endif
-                tag_status = 1;
+                tag_status = 0;
             }
         }
-    }
-    else if ((dev_id == 0xb990)|| (dev_id == 0xb996) || 
-             (dev_id == 0xb999)|| (dev_id == 0xb993) ||
-             (dev_id == 0xf900)|| (dev_id == 0xf905))
-    {
-        fd_index = 9;
-        valptr = (uint32_t *)meta;
-        /* On TH4, outer_l2_header means INCOMING_TAG_STATUS.
-         * TH4 only supports single tagging, so if TAG_STATUS
-         * says there's a tag, then we don't want to strip.
-         * Otherwise, we do.
-         */
-        if ((dev_id == 0xf900) || (dev_id == 0xf905))
-        {
-            outer_l2_hdr = (valptr[fd_index]) & 1;
+    } else if (BCMPKT_RXPMD_FID_SUPPORT_GET(support, BCMPKT_RXPMD_MATCH_ID_LO) &&
+               BCMPKT_RXPMD_FID_SUPPORT_GET(support, BCMPKT_RXPMD_MATCH_ID_HI)) {
+        /* Trident4 family. */
+        uint32_t match_id_data[2];
+        bool itag = false, otag = false;
+        
+        bcmpkt_rxpmd_field_get(dev_type, rxpmd, BCMPKT_RXPMD_MATCH_ID_LO,
+                               &match_id_data[0]);
+        bcmpkt_rxpmd_field_get(dev_type, rxpmd, BCMPKT_RXPMD_MATCH_ID_HI,
+                               &match_id_data[1]);
+        rv = bcmpkt_rxpmd_match_id_present(variant, match_id_data, 2,
+                                           match_id.ingress_pkt_outer_l2_hdr_itag);
+        if (SHR_SUCCESS(rv)) {
+            itag = true;
         }
-        else 
-        {
-            outer_l2_hdr = (valptr[fd_index] >> 13) & 3;
+        rv = bcmpkt_rxpmd_match_id_present(variant, match_id_data, 2,
+                                           match_id.ingress_pkt_outer_l2_hdr_otag);
+        if (SHR_SUCCESS(rv)) {
+            otag = true;
         }
-        if (outer_l2_hdr)
-        {
+        if (itag && otag) {
+            tag_status = 3;
+        } else if (itag) {
+            tag_status = 1;
+        } else if (otag) {
             tag_status = 2;
-#ifdef KNET_CB_DEBUG
-            if (debug & 0x1)
-            {
-                printk("  Incoming frame tagged\n");
-            }
-#endif
+        } else {
+            tag_status = 0;
+        }
+    } else if (BCMPKT_RXPMD_FID_SUPPORT_GET(support, BCMPKT_RXPMD_ARC_ID_LO) &&
+               BCMPKT_RXPMD_FID_SUPPORT_GET(support, BCMPKT_RXPMD_ARC_ID_HI)){
+        /* Trident5 Family*/
+        uint32_t match_id_data[2];
+        bool itag = false, otag = false;
+
+        bcmpkt_rxpmd_field_get(dev_type, rxpmd, BCMPKT_RXPMD_ARC_ID_LO,
+                               &match_id_data[0]);
+        bcmpkt_rxpmd_field_get(dev_type, rxpmd, BCMPKT_RXPMD_ARC_ID_HI,
+                               &match_id_data[1]);
+        rv = bcmpkt_rxpmd_match_id_from_arc_id_present(variant, match_id_data, 2,
+                                           match_id.ingress_pkt_outer_l2_hdr_itag);
+        if (SHR_SUCCESS(rv)) {
+            itag = true;
+        }
+        rv = bcmpkt_rxpmd_match_id_from_arc_id_present(variant, match_id_data, 2,
+                                           match_id.ingress_pkt_outer_l2_hdr_otag);
+        if (SHR_SUCCESS(rv)) {
+            otag = true;
         }
-        else
-        {
+        if (itag && otag) {
+            tag_status = 3;
+        } else if (itag) {
+            tag_status = 1;
+        } else if (otag) {
+            tag_status = 2;
+        } else {
             tag_status = 0;
+        }
+    }
 #ifdef KNET_CB_DEBUG
-            if (debug & 0x1)
-            {
+    if (debug & NGKNET_CB_DBG_LVL_VERB) {
+        if (tag_status != -1) {
+            if (tag_status == 0) {
                 printk("  Incoming frame untagged\n");
+            } else {
+                printk("  Incoming frame tagged: %s\n", tag_type[tag_status]);
             }
-#endif
+        } else {
+            printk("  Unsupported tag type\n");
         }
     }
-#ifdef KNET_CB_DEBUG
-    if (debug & 0x1) {
-        printk("%s; Device Type: %s; tag status: %d\n", __func__, dev_type, tag_status);
-    }
-#endif
+#endif /* KNET_CB_DEBUG */
     return tag_status;
 }
 
@@ -284,24 +400,29 @@ strip_tag_rx_cb(struct sk_buff *skb)
 {
     const struct ngknet_callback_desc *cbd = NGKNET_SKB_CB(skb);
     int rcpu_mode = 0;
-    int tag_status;
-
+    int tag_status, unit;
+    uint32_t dev_type = 0;
+    bcmlrd_variant_t var_type;
+    uint32_t *rxpmd = NULL;
+   
+    unit = cbd->dinfo->dev_no;
+    rxpmd = (uint32_t *)cbd->pmd;
     rcpu_mode = (cbd->netif->flags & NGKNET_NETIF_F_RCPU_ENCAP)? 1 : 0;
 #ifdef KNET_CB_DEBUG
     if (debug & 0x1)
     {
         printk(KERN_INFO
-               "\n%4u --------------------------------------------------------------------------------\n",
-               rx_count);
+                "\n%4u --------------------------------------------------------------------------------\n",
+                rx_count);
         printk(KERN_INFO
-               "RX KNET callback: dev_no=%1d; dev_id=:%6s; type_str=%4s; RCPU: %3s \n",
-               cbd->dinfo->dev_no, cbd->dinfo->var_str, cbd->dinfo->type_str, rcpu_mode ? "yes" : "no");
+                "RX KNET callback: dev_no=%1d; dev_id=:%6s; type_str=%4s; RCPU: %3s \n",
+                cbd->dinfo->dev_no, cbd->dinfo->var_str, cbd->dinfo->type_str, rcpu_mode ? "yes" : "no");
         printk(KERN_INFO "                  pkt_len=%4d; pmd_len=%2d; SKB len: %4d\n",
-               cbd->pkt_len, cbd->pmd_len, skb->len);
-    if (cbd->filt) {
+                cbd->pkt_len, cbd->pmd_len, skb->len);
+        if (cbd->filt) {
             printk(KERN_INFO "Filter user data: 0x%08x\n",
-                   *(uint32_t *) cbd->filt->user_data);
-    }
+                    *(uint32_t *) cbd->filt->user_data);
+        }
         printk(KERN_INFO "Before SKB (%d bytes):\n", skb->len);
         dump_buffer(skb->data, skb->len);
         printk("rx_cb for dev %d: id %s, %s\n", cbd->dinfo->dev_no, cbd->dinfo->var_str, cbd->dinfo->type_str);
@@ -322,23 +443,39 @@ strip_tag_rx_cb(struct sk_buff *skb)
 #endif
 
     if ((!rcpu_mode) && (cbd->filt)) {
-        if (FILTER_TAG_ORIGINAL == cbd->filt->user_data[0]) {
-            tag_status = get_tag_status(cbd->dinfo->type_str,
-                                        cbd->dinfo->var_str,
-                                        (void *)cbd->pmd);
-            if (tag_status < 0) {
-                strip_stats.skipped++;
-                goto _strip_tag_rx_cb_exit;
+        if (cb_dev[unit].initialized) {
+            dev_type = cb_dev[unit].dev_type;
+            var_type = cb_dev[unit].var_type;
+            if (FILTER_TAG_ORIGINAL == cbd->filt->user_data[0]) {
+                tag_status = get_tag_status(dev_type, var_type,
+                        (void *)rxpmd);
+                if (tag_status < 0) {
+                    strip_stats.skipped++;
+                    goto _strip_tag_rx_cb_exit;
+                }
+                strip_stats.checked++;
+                if (tag_status < 2) {
+                    strip_stats.stripped++;
+                    strip_vlan_tag(skb);
+                }
             }
-            strip_stats.checked++;
-            if (tag_status < 2) {
+            if (FILTER_TAG_STRIP == cbd->filt->user_data[0]) {
                 strip_stats.stripped++;
                 strip_vlan_tag(skb);
             }
-        }
-        if (FILTER_TAG_STRIP == cbd->filt->user_data[0]) {
-            strip_stats.stripped++;
-            strip_vlan_tag(skb);
+#ifdef KNET_CB_DEBUG
+            if (debug & 0x1) {
+                printk("ngknetcb_main for dev %d:", cbd->dinfo->dev_no);
+                printk("type_str:%s dev_id: 0x%x variant: %s\n",
+                        cbd->dinfo->type_str, cbd->dinfo->dev_id, variant_types[var_type].var_name);
+                printk("dev_type: %d\n", dev_type);
+                printk("variant: %d\n", var_type);
+
+                print_all_rxpmd_fields(dev_type, (void *)rxpmd);
+                printk("\n[RX reasons]:\n");
+                print_all_rx_reason(dev_type, (void *)rxpmd);
+            }
+#endif
         }
     }
 _strip_tag_rx_cb_exit:
@@ -361,7 +498,7 @@ strip_tag_tx_cb(struct sk_buff *skb)
     struct ngknet_callback_desc *cbd = NGKNET_SKB_CB(skb);
 
     if (debug & 0x1) {
-    printk("tx_cb for dev %d: %s\n", cbd->dinfo->dev_no, cbd->dinfo->type_str);
+        printk("tx_cb for dev %d: %s\n", cbd->dinfo->dev_no, cbd->dinfo->type_str);
     }
     show_pmd(cbd->pmd, cbd->pmd_len);
     show_mac(cbd->pmd + cbd->pmd_len);
@@ -454,6 +591,103 @@ static struct proc_ops ngknetcb_proc_ops = {
     .proc_mmap = ngknetcb_mmap,
 };
 
+#ifdef KPMD
+/*
+  Initialize the desired match_ids for use later in the code.
+*/
+static void
+init_match_ids(int unit)
+{
+    uint32_t val;
+
+    match_id.egress_pkt_fwd_l2_hdr_etag  = -1;
+    match_id.egress_pkt_fwd_l2_hdr_l2    = -1;
+    match_id.ingress_pkt_inner_l2_hdr_l2 = -1;
+    match_id.ingress_pkt_fwd_l2_hdr_etag = -1;
+    match_id.ingress_pkt_outer_l2_hdr_itag = -1;
+    match_id.ingress_pkt_outer_l2_hdr_otag = -1;
+    if (bcmpkt_rxpmd_match_id_get(cb_dev[unit].var_type,
+                                  "EGRESS_PKT_FWD_L2_HDR_ETAG", &val) == 0) {
+        match_id.egress_pkt_fwd_l2_hdr_etag = val;
+        printk("EGRESS_PKT_FWD_L2_HDR_ETAG: %d\n", val);
+    }
+    if (bcmpkt_rxpmd_match_id_get(cb_dev[unit].var_type,
+                                  "EGRESS_PKT_FWD_L2_HDR_L2", &val) == 0) {
+        match_id.egress_pkt_fwd_l2_hdr_l2 = val;
+        printk("EGRESS_PKT_FWD_L2_HDR_L2: %d\n", val);
+    }
+    if (bcmpkt_rxpmd_match_id_get(cb_dev[unit].var_type,
+                                  "INGRESS_PKT_INNER_L2_HDR_L2", &val) == 0) {
+        match_id.ingress_pkt_inner_l2_hdr_l2 = val;
+        printk("INGRESS_PKT_INNER_L2_HDR_L2: %d\n", val);
+    }
+    if (bcmpkt_rxpmd_match_id_get(cb_dev[unit].var_type,
+                                  "INGRESS_PKT_FWD_L2_HDR_ETAG", &val) == 0) {
+        match_id.ingress_pkt_fwd_l2_hdr_etag = val;
+        printk("INGRESS_PKT_FWD_L2_HDR_ETAG: %d\n", val);
+    }
+    if (bcmpkt_rxpmd_match_id_get(cb_dev[unit].var_type,
+                                  "INGRESS_PKT_OUTER_L2_HDR_ITAG", &val) == 0) {
+        match_id.ingress_pkt_outer_l2_hdr_itag = val;
+        printk("INGRESS_PKT_OUTER_L2_HDR_ITAG: %d\n", val);
+    }
+    if (bcmpkt_rxpmd_match_id_get(cb_dev[unit].var_type,
+                                  "INGRESS_PKT_OUTER_L2_HDR_OTAG", &val) == 0) {
+        match_id.ingress_pkt_outer_l2_hdr_otag = val;
+        printk("INGRESS_PKT_OUTER_L2_HDR_OTAG: %d\n", val);
+    }
+}
+#endif
+/*!
+ * \brief Device Initialization Callback.
+ *
+ * The device initialization callback allows an external module to
+ * perform device-specific initialization in preparation for Tx and Rx
+ * packet processing.
+ *
+ * \param [in] dinfo Device information.
+ *
+ */
+static void
+init_cb(ngknet_dev_info_t *dinfo)
+{
+    int unit;
+    bcmdrd_dev_type_t dt;
+    bcmlrd_variant_t var;
+    unit = dinfo->dev_no;
+
+    if ((unsigned int)unit >= NUM_PDMA_DEV_MAX) {
+        return;
+    }
+    /* Update dev_type and variant type*/
+    for (dt = 0; dt < BCMDRD_DEV_T_COUNT; dt++) {
+        if (!strcasecmp(dinfo->type_str, device_types[dt].name)) {
+            cb_dev[unit].dev_type = dt;
+            break;
+        }
+    }
+
+    for (var = 0; var < BCMLRD_VARIANT_T_COUNT; var++) {
+        if ((!strcasecmp(dinfo->type_str, variant_types[var].dev_name)) &&
+            (!strcasecmp(dinfo->var_str, variant_types[var].var_name))) {
+            cb_dev[unit].var_type = var;
+            break;
+        }
+    }
+#ifdef KNET_CB_DEBUG
+    if (debug & 1) {
+        printk("init_cb unit %d, dev %s dev_id: 0x%x variant %s\n",
+               dinfo->dev_no, dinfo->type_str, dinfo->dev_id, dinfo->var_str);
+        printk("dev_type: %d\n", cb_dev[unit].dev_type);
+        printk("variant: %d\n", cb_dev[unit].var_type);
+    }
+#endif /* KNET_CB_DEBUG */
+    cb_dev[unit].initialized = true;
+#ifdef KPMD
+    init_match_ids(unit);
+#endif /* KPMD */
+}
+
 static int __init
 ngknetcb_init_module(void)
 {
@@ -472,7 +706,7 @@ ngknetcb_init_module(void)
         printk(KERN_ERR "%s: proc_mkdir failed\n",
                 NGKNETCB_MODULE_NAME);
     }
-
+    ngknet_dev_init_cb_register(init_cb);
     ngknet_rx_cb_register(ngknet_rx_cb);
     ngknet_tx_cb_register(ngknet_tx_cb);
 
@@ -482,6 +716,7 @@ ngknetcb_init_module(void)
 static void __exit
 ngknetcb_exit_module(void)
 {
+    ngknet_dev_init_cb_unregister(init_cb);
     ngknet_rx_cb_unregister(ngknet_rx_cb);
     ngknet_tx_cb_unregister(ngknet_tx_cb);
 
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/ptpclock/Kbuild b/platform/broadcom/saibcm-modules/sdklt/linux/ptpclock/Kbuild
new file mode 100644
index 000000000000..2a260731f071
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/ptpclock/Kbuild
@@ -0,0 +1,17 @@
+# -*- Kbuild -*-
+#
+# Linux PTP Clock module.
+#
+# $Copyright:.$
+#
+
+obj-m := linux_ngptpclock.o
+
+ccflags-y := $(LKM_CFLAGS) \
+             -I$(SDK)/shr/include \
+             -I$(SDK)/bcmdrd/include \
+             -I$(SDK)/linux/include \
+             -I$(SDK)/linux/knet/include \
+             -I$(SDK)/linux/knet
+
+linux_ngptpclock-y := ngptpclock_main.o
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/ptpclock/Makefile b/platform/broadcom/saibcm-modules/sdklt/linux/ptpclock/Makefile
new file mode 100644
index 000000000000..9757bbff804f
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/ptpclock/Makefile
@@ -0,0 +1,19 @@
+#
+# $Copyright: Broadcom Ltd.$
+#
+# Linux PTP clock module.
+#
+
+include Kbuild
+
+ifeq ($(KERNELRELEASE),)
+
+MOD_NAME = linux_ngptpclock
+
+include $(SDK)/make/lkm.mk
+
+endif
+
+.PHONY: distclean
+
+distclean::
diff --git a/platform/broadcom/saibcm-modules/sdklt/linux/ptpclock/ngptpclock_main.c b/platform/broadcom/saibcm-modules/sdklt/linux/ptpclock/ngptpclock_main.c
new file mode 100644
index 000000000000..2ed0e48fcf09
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/sdklt/linux/ptpclock/ngptpclock_main.c
@@ -0,0 +1,3042 @@
+/*! \file ngptpclock_main.c
+ *
+ * NGPTPCLOCK module.
+ *
+ */
+/*
+ * Copyright 2018-2024 Broadcom. All rights reserved.
+ * The term 'Broadcom' refers to Broadcom Inc. and/or its subsidiaries.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * A copy of the GNU General Public License version 2 (GPLv2) can
+ * be found in the LICENSES folder.
+ */
+
+#include <linux/module.h>
+#include <linux/version.h>
+#include <lkm/ngptpclock_ioctl.h>
+
+MODULE_AUTHOR("Broadcom Corporation");
+MODULE_DESCRIPTION("PTP Clock Driver for Broadcom XGS Switch");
+MODULE_LICENSE("GPL");
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0)
+#define NGPTPCLOCK_SUPPORT
+#endif
+
+#ifdef NGPTPCLOCK_SUPPORT
+#include <lkm/lkm.h>
+#include <lkm/ngknet_kapi.h>
+#include <lkm/ngedk_kapi.h>
+#include <linux/time64.h>
+#include <linux/delay.h>
+#include <linux/etherdevice.h>
+#include <linux/netdevice.h>
+#include <linux/sysfs.h>
+#include <linux/net_tstamp.h>
+
+#include <linux/random.h>
+#include <linux/seq_file.h>
+#include <linux/if_vlan.h>
+#include <linux/ptp_clock_kernel.h>
+#include <shr/shr_error.h>
+
+/* Configuration Parameters */
+static int debug;
+module_param(debug, int, 0);
+MODULE_PARM_DESC(debug,
+        "Debug level (default 0)");
+
+static int network_transport;
+module_param(network_transport, int, 0);
+MODULE_PARM_DESC(network_transport,
+        "Transport Type (default - Detect from packet)");
+
+static char *base_dev_name = "ptp0";
+module_param(base_dev_name, charp, 0);
+MODULE_PARM_DESC(base_dev_name,
+        "Base device name like ptp0, ptp1, etc.(default ptp0)");
+
+static int fw_core;
+module_param(fw_core, int, 0);
+MODULE_PARM_DESC(fw_core,
+        "Firmware core (default 0)");
+
+static int pci_cos;
+
+/* Debug levels */
+#define DBG_LVL_VERB    0x1
+#define DBG_LVL_WARN    0x2
+#define DBG_LVL_TXTS    0x4
+#define DBG_LVL_CMDS    0x8
+#define DBG_LVL_TX      0x10
+#define DBG_LVL_RX      0x20
+#define DBG_LVL_TX_DUMP 0x40
+#define DBG_LVL_RX_DUMP 0x80
+
+#define DBG_VERB(_s)    do { if (debug & DBG_LVL_VERB) printk _s; } while (0)
+#define DBG_WARN(_s)    do { if (debug & DBG_LVL_WARN) printk _s; } while (0)
+#define DBG_TXTS(_s)    do { if (debug & DBG_LVL_TXTS) printk _s; } while (0)
+#define DBG_CMDS(_s)    do { if (debug & DBG_LVL_CMDS) printk _s; } while (0)
+#define DBG_TX(_s)      do { if (debug & DBG_LVL_TX) printk _s; } while (0)
+#define DBG_RX(_s)      do { if (debug & DBG_LVL_RX) printk _s; } while (0)
+#define DBG_TX_DUMP(_s) do { if (debug & DBG_LVL_TX_DUMP) printk _s; } while (0)
+#define DBG_RX_DUMP(_s) do { if (debug & DBG_LVL_RX_DUMP) printk _s; } while (0)
+#define DBG_ERR(_s)     do { if (1) printk _s; } while (0)
+
+#define DMA_DEV                         device
+#define DMA_ALLOC_COHERENT(d,s,h)       dma_alloc_coherent(d,s,h,GFP_ATOMIC|GFP_DMA32)
+#define DMA_FREE_COHERENT(d,s,a,h)      dma_free_coherent(d,s,a,h)
+
+/* Type length in bytes */
+#define NGPTPCLOCK_PACKLEN_U8     1
+#define NGPTPCLOCK_PACKLEN_U16    2
+#define NGPTPCLOCK_PACKLEN_U24    3
+#define NGPTPCLOCK_PACKLEN_U32    4
+
+#define NGPTPCLOCK_UNPACK_U8(_buf, _var) \
+    _var = *_buf++
+
+#define NGPTPCLOCK_UNPACK_U16(_buf, _var) \
+    do { \
+        (_var) = (((_buf)[0] << 8) | \
+                (_buf)[1]); \
+        (_buf) += NGPTPCLOCK_PACKLEN_U16; \
+    } while (0)
+
+#define NGPTPCLOCK_UNPACK_U24(_buf, _var) \
+    do { \
+        (_var) = (((_buf)[0] << 16) | \
+                ((_buf)[1] << 8)  | \
+                (_buf)[2]); \
+        (_buf) += NGPTPCLOCK_PACKLEN_U24; \
+    } while (0)
+
+#define NGPTPCLOCK_UNPACK_U32(_buf, _var) \
+    do { \
+        (_var) = (((_buf)[0] << 24) | \
+                ((_buf)[1] << 16) | \
+                ((_buf)[2] << 8)  | \
+                (_buf)[3]); \
+        (_buf) += NGPTPCLOCK_PACKLEN_U32; \
+    } while (0)
+
+
+/* FIXME : SDKLT-38745
+ * Check for cmic type dynamically
+ */
+#define CMICX_DEV_TYPE              1
+
+/* CMIC MCS-0 SCHAN Messaging registers */
+/* Core0:CMC1 Core1:CMC2 */
+#define CMIC_CMC_BASE \
+            (CMICX_DEV_TYPE ? (fw_core ? 0x10400 : 0x10300) : \
+                              (fw_core ? 0x33000 : 0x32000))
+
+#define CMIC_CMC_SCHAN_MESSAGE_10r(BASE) (BASE + 0x00000034)
+#define CMIC_CMC_SCHAN_MESSAGE_11r(BASE) (BASE + 0x00000038)
+#define CMIC_CMC_SCHAN_MESSAGE_12r(BASE) (BASE + 0x0000003c)
+#define CMIC_CMC_SCHAN_MESSAGE_13r(BASE) (BASE + 0x00000040)
+#define CMIC_CMC_SCHAN_MESSAGE_14r(BASE) (BASE + 0x00000044)
+#define CMIC_CMC_SCHAN_MESSAGE_15r(BASE) (BASE + 0x00000048)
+#define CMIC_CMC_SCHAN_MESSAGE_16r(BASE) (BASE + 0x0000004c)
+#define CMIC_CMC_SCHAN_MESSAGE_17r(BASE) (BASE + 0x00000050)
+#define CMIC_CMC_SCHAN_MESSAGE_18r(BASE) (BASE + 0x00000054)
+#define CMIC_CMC_SCHAN_MESSAGE_19r(BASE) (BASE + 0x00000058)
+#define CMIC_CMC_SCHAN_MESSAGE_20r(BASE) (BASE + 0x0000005c)
+#define CMIC_CMC_SCHAN_MESSAGE_21r(BASE) (BASE + 0x00000060)
+
+static u32 hostcmd_regs[5] = { 0 };
+
+#define NGPTPCLOCK_NUM_PORTS           128     /* NUM_PORTS where 2-step is supported. */
+#define NGPTPCLOCK_MAX_NUM_PORTS       256     /* Max ever NUM_PORTS in the system. */
+#define NGPTPCLOCK_MAX_MTP_IDX         8       /* Max number of mtps in the system. */
+
+/* Service request commands to Firmware. */
+enum {
+    NGPTPCLOCK_DONE                     = 0x0,
+    NGPTPCLOCK_INIT                     = 0x1,
+    NGPTPCLOCK_CLEANUP                  = 0x2,
+    NGPTPCLOCK_GETTIME                  = 0x3,
+    NGPTPCLOCK_SETTIME                  = 0x4,
+    NGPTPCLOCK_FREQCOR                  = 0x5,
+    NGPTPCLOCK_PBM_UPDATE               = 0x6,
+    NGPTPCLOCK_ADJTIME                  = 0x7,
+    NGPTPCLOCK_GET_TSTIME               = 0x8,
+    NGPTPCLOCK_MTP_TS_UPDATE_ENABLE     = 0x9,
+    NGPTPCLOCK_MTP_TS_UPDATE_DISABLE    = 0xa,
+    NGPTPCLOCK_ACK_TSTIME               = 0xb,
+    NGPTPCLOCK_SYSINFO                  = 0xc,
+    NGPTPCLOCK_BROADSYNC                = 0xd,
+    NGPTPCLOCK_GPIO                     = 0xe,
+    NGPTPCLOCK_EVLOG                    = 0xf,
+    NGPTPCLOCK_EXTTSLOG                 = 0x10,
+    NGPTPCLOCK_GET_EXTTS_BUFF           = 0x11,
+    NGPTPCLOCK_GPIO_PHASEOFFSET         = 0x12,
+};
+
+enum {
+    NGPTPCLOCK_SYSINFO_UC_PORT_NUM       = 0x1,
+    NGPTPCLOCK_SYSINFO_UC_PORT_SYSPORT   = 0x2,
+    NGPTPCLOCK_SYSINFO_HOST_CPU_PORT     = 0x3,
+    NGPTPCLOCK_SYSINFO_HOST_CPU_SYSPORT  = 0x4,
+    NGPTPCLOCK_SYSINFO_UDH_LEN           = 0x5,
+};
+
+enum {
+    NGPTPCLOCK_BROADSYNC_BS0_CONFIG      = 0x1,
+    NGPTPCLOCK_BROADSYNC_BS1_CONFIG      = 0x2,
+    NGPTPCLOCK_BROADSYNC_BS0_STATUS_GET  = 0x3,
+    NGPTPCLOCK_BROADSYNC_BS1_STATUS_GET  = 0x4,
+};
+
+enum {
+    NGPTPCLOCK_GPIO_0       = 0x1,
+    NGPTPCLOCK_GPIO_1       = 0x2,
+    NGPTPCLOCK_GPIO_2       = 0x3,
+    NGPTPCLOCK_GPIO_3       = 0x4,
+    NGPTPCLOCK_GPIO_4       = 0x5,
+    NGPTPCLOCK_GPIO_5       = 0x6,
+};
+
+/* 1588 message types. */
+enum
+{
+    IEEE1588_MSGTYPE_SYNC           = 0x0,
+    IEEE1588_MSGTYPE_DELREQ         = 0x1,
+    IEEE1588_MSGTYPE_PDELREQ        = 0x2,
+    IEEE1588_MSGTYPE_PDELRESP       = 0x3,
+    /* reserved                       0x4 */
+    /* reserved                       0x5 */
+    /* reserved                       0x6 */
+    /* reserved                       0x7 */
+    IEEE1588_MSGTYPE_FLWUP          = 0x8,
+    IEEE1588_MSGTYPE_DELRESP        = 0x9,
+    IEEE1588_MSGTYPE_PDELRES_FLWUP  = 0xA,
+    IEEE1588_MSGTYPE_ANNOUNCE       = 0xB,
+    IEEE1588_MSGTYPE_SGNLNG         = 0xC,
+    IEEE1588_MSGTYPE_MNGMNT         = 0xD
+    /* reserved                       0xE */
+    /* reserved                       0xF */
+};
+
+/* Usage macros */
+#define ONE_BILLION (1000000000)
+
+#define SKB_U16_GET(_skb, _pkt_offset) \
+            ((_skb->data[_pkt_offset] << 8) | _skb->data[_pkt_offset + 1])
+
+#define NGPTPCLOCK_PTP_EVENT_MSG(_ptp_msg_type) \
+            ((_ptp_msg_type == IEEE1588_MSGTYPE_DELREQ) || \
+             (_ptp_msg_type == IEEE1588_MSGTYPE_SYNC))
+
+/*
+ *  IEEE1588 packet hardware specific information.
+ *  4 words of information used from this data set.
+ *       0 -  3: 2-step untagged.
+ *       4 -  7: 2-step tagged.
+ *       8 - 11: 1-step untagged.
+ *      12 - 15: 1-step tagged.
+ *      16 - 19: 1-step untagged with ITS-set.
+ *      20 - 23: 1-step tagged with ITS-set.
+ *
+ *      Refer to device specific reg file for SOBMH header information.
+ *      Below fields are considered:
+ *      SOBMH => {
+ *      IEEE1588_ONE_STEP_ENABLE        -   OneStep
+ *      IEEE1588_REGEN_UDP_CHECKSUM     -   Regen UDP Checksum
+ *      IEEE1588_INGRESS_TIMESTAMP_SIGN -   ITS
+ *      TX_TS                           -   TwoStep
+ *      IEEE1588_TIMESTAMP_HDR_OFFSET   -   1588 header offset
+ *      }
+ *
+ */
+static uint32_t ieee1588_l2pkt_md[24] = {0};
+static uint32_t ieee1588_ipv4pkt_md[24] = {0};
+static uint32_t ieee1588_ipv6pkt_md[24] = {0};
+
+/* Driver Proc Entry root */
+static struct proc_dir_entry *ngptpclock_proc_root = NULL;
+
+/* Shared data structures with R5 */
+typedef struct ngptpclock_tx_ts_data_s {
+    u32 ts_valid;   /* Timestamp valid indication */
+    u32 port_id;    /* Port number */
+    u32 ts_seq_id;  /* Sequency Id */
+    u32 ts_cnt;
+    u64 timestamp;  /* Timestamp */
+} ngptpclock_tx_ts_data_t;
+
+typedef struct ngptpclock_info_s {
+    u32 ksyncinit;
+    u32 dev_id;
+    s64 freqcorr;
+    u64 portmap[NGPTPCLOCK_MAX_NUM_PORTS/64];  /* Two-step enabled ports */
+    u64 ptptime;
+    u64 reftime;
+    u64 ptptime_alt;
+    u64 reftime_alt;
+    s64 phase_offset;
+    ngptpclock_tx_ts_data_t port_ts_data[NGPTPCLOCK_MAX_NUM_PORTS];
+} ngptpclock_info_t;
+
+
+enum {
+    TS_EVENT_CPU       = 0,
+    TS_EVENT_BSHB_0    = 1,
+    TS_EVENT_BSHB_1    = 2,
+    TS_EVENT_GPIO_1    = 3,
+    TS_EVENT_GPIO_2    = 4,
+    TS_EVENT_GPIO_3    = 5,
+    TS_EVENT_GPIO_4    = 6,
+    TS_EVENT_GPIO_5    = 7,
+    TS_EVENT_GPIO_6    = 8,
+};
+
+#define NUM_TS_EVENTS 14
+
+/* FW timestamps.
+ *     This declaration has to match with HFT_t_TmStmp
+ *     defined in the firmware. Otherwise, DMA will fail.
+ */
+typedef struct fw_tstamp_s {
+    u64 sec;
+    u32 nsec;
+} __attribute__ ((packed)) fw_tstamp_t;
+
+typedef struct ngptpclock_fw_debug_event_tstamps_s {
+    fw_tstamp_t prv_tstamp;
+    fw_tstamp_t cur_tstamp;
+} __attribute__ ((packed)) ngptpclock_fw_debug_event_tstamps_t;
+
+typedef struct ngptpclock_evlog_s {
+    ngptpclock_fw_debug_event_tstamps_t event_timestamps[NUM_TS_EVENTS];
+} __attribute__ ((packed)) ngptpclock_evlog_t;
+
+
+/* Timestamps for EXTTS from Firmware */
+/* gpio0 = event0 ..... gpio5 = event5 */
+#define NUM_EXT_TS          6
+/* Directly mapped to PTP_MAX_TIMESTAMPS from ptp_private.h */
+#define NUM_EVENT_TS        128
+typedef struct ngptpclock_fw_extts_event_s {
+    u32         ts_event_id;
+    fw_tstamp_t tstamp;
+} __attribute__ ((packed)) ngptpclock_fw_extts_event_t;
+
+typedef struct ngptpclock_extts_log_s {
+    u32                     head;   /* Read pointer - Updated by HOST */
+    u32                     tail;   /* Write pointer - Updated by FW */
+    ngptpclock_fw_extts_event_t event_ts[NUM_EVENT_TS];
+    u32                     overflow;
+} __attribute__ ((packed)) ngptpclock_fw_extts_log_t;
+
+struct ngptpclock_extts_event {
+    int enable[NUM_EXT_TS];
+    int head;
+};
+
+typedef struct ngptpclock_port_stats_s {
+    u32 pkt_rxctr;             /* All ingress packets */
+    u32 pkt_txctr;             /* All egress packets  */
+    u32 pkt_txonestep;         /* 1-step Tx packets counter */
+    u32 tsts_match;            /* 2-Step tstamp req matches */
+    u32 tsts_timeout;          /* 2-Step tstamp req timeouts */
+    u32 tsts_discard;          /* 2-Step tstamp req discards */
+    u32 osts_event_pkts;       /* 1-step event packet counter */
+    u32 osts_tstamp_reqs;      /* 1-step events with tstamp request */
+    u32 fifo_rxctr;            /* 2-Step tstamp req matches */
+    u64 tsts_best_fetch_time;  /* 1-step events with tstamp request */
+    u64 tsts_worst_fetch_time; /* 1-step events with tstamp request */
+    u32 tsts_avg_fetch_time;   /* 1-step events with tstamp request */
+} ngptpclock_port_stats_t;
+
+typedef struct ngptpclock_init_info_s {
+    u32 pci_knetsync_cos;
+    u32 uc_port_num;
+    u32 uc_port_sysport;
+    u32 host_cpu_port;
+    u32 host_cpu_sysport;
+    u32 udh_len;
+} ngptpclock_init_info_t;
+
+typedef struct ngptpclock_bs_info_s {
+    u32 enable;
+    u32 mode;
+    u32 bc;
+    u32 hb;
+} ngptpclock_bs_info_t;
+
+typedef struct ngptpclock_gpio_info_s {
+    u32 enable;
+    u32 mode;
+    u32 period;
+    int64_t phase_offset;
+} ngptpclock_gpio_info_t;
+
+typedef struct ngptpclock_evlog_info_s {
+    u32 enable;
+} ngptpclock_evlog_info_t;
+
+/* Clock Private Data */
+struct ngptpclock_ptp_priv {
+    struct device dev;
+    int dcb_type;
+    struct ptp_clock *ptp_clock;
+    struct ptp_clock_info ptp_caps;
+    struct mutex ptp_lock;
+    int ptp_pair_lock;
+    volatile void *base_addr;   /* Address for PCI register access. */
+    volatile ngptpclock_info_t *shared_addr; /* address for shared memory access. */
+    volatile ngptpclock_evlog_t *evlog; /* dma-able address for fw updates. */
+    dma_addr_t dma_mem;
+    int dma_mem_size;
+    struct DMA_DEV *dma_dev; /* Required for DMA memory control. */
+    int num_pports;
+    int timekeep_status;
+    u32 mirror_encap_bmp;
+    struct delayed_work time_keep;
+    ngptpclock_port_stats_t *port_stats;
+    ngptpclock_init_info_t ngptpclock_init_info;
+    ngptpclock_bs_info_t ngptpclock_bs_info[2];
+    ngptpclock_gpio_info_t ngptpclock_gpio_info[6];
+    ngptpclock_evlog_info_t ngptpclock_evlog_info[NUM_TS_EVENTS];
+    volatile ngptpclock_fw_extts_log_t *extts_log;
+    struct ngptpclock_extts_event extts_event;
+    struct delayed_work extts_logging;
+    struct kobject *kobj;
+};
+
+static struct ngptpclock_ptp_priv *ptp_priv;
+static volatile int module_initialized;
+#if defined(TWO_STEP_SUPPORT)
+static int num_retries = 10;   /* Retry count */
+#endif
+
+static void ngptpclock_ptp_time_keep_init(void);
+static void ngptpclock_ptp_time_keep_cleanup(void);
+static int ngptpclock_ptp_gettime(struct ptp_clock_info *ptp,
+                                  struct timespec64 *ts);
+
+static void ngptpclock_ptp_extts_logging_init(void);
+static void ngptpclock_ptp_extts_logging_cleanup(void);
+
+#if defined(CMIC_SOFT_BYTE_SWAP)
+
+#define CMIC_SWAP32(_x)   ((((_x) & 0xff000000) >> 24) \
+        | (((_x) & 0x00ff0000) >>  8) \
+        | (((_x) & 0x0000ff00) <<  8) \
+        | (((_x) & 0x000000ff) << 24))
+
+#define DEV_READ32(_d, _a, _p) \
+    do { \
+        uint32_t _data; \
+        _data = (((volatile uint32_t *)(_d)->base_addr)[(_a)/4]); \
+        *(_p) = CMIC_SWAP32(_data); \
+    } while (0)
+
+#define DEV_WRITE32(_d, _a, _v) \
+    do { \
+        uint32_t _data = CMIC_SWAP32(_v); \
+        ((volatile uint32_t *)(_d)->base_addr)[(_a)/4] = (_data); \
+    } while (0)
+
+#else
+
+#define DEV_READ32(_d, _a, _p) \
+    do { \
+        *(_p) = (((volatile uint32_t *)(_d)->base_addr)[(_a)/4]); \
+    } while (0)
+
+#define DEV_WRITE32(_d, _a, _v) \
+    do { \
+        ((volatile uint32_t *)(_d)->base_addr)[(_a)/4] = (_v); \
+    } while (0)
+#endif  /* defined(CMIC_SOFT_BYTE_SWAP) */
+
+static void
+ptp_usleep(int usec)
+{
+    usleep_range(usec, usec+1);
+}
+
+static void
+ptp_sleep(int jiffies)
+{
+    wait_queue_head_t wq;
+    init_waitqueue_head(&wq);
+
+    wait_event_timeout(wq, 0, jiffies);
+}
+
+/**
+ * ngptpclock_hostcmd_data_op
+ *
+ * @setget: If valid then set and get the data.
+ * @d1: data pointer one.
+ * @d2: data pointer two.
+ *
+ * Description: This function is used send and receive the
+ * data from the FW.
+ */
+static void
+ngptpclock_hostcmd_data_op(int setget, u64 *d1, u64 *d2)
+{
+    u32 w0, w1;
+    u64 data;
+
+    if (!d1) {
+        return;
+    }
+
+    if (setget) {
+        if (d1) {
+            data = *d1;
+            w0 = (data & 0xFFFFFFFF);
+            w1 = (data >> 32);
+            DEV_WRITE32(ptp_priv, hostcmd_regs[1], w0);
+            DEV_WRITE32(ptp_priv, hostcmd_regs[2], w1);
+        }
+
+        if (d2) {
+            data = *d2;
+
+            w0 = (data & 0xFFFFFFFF);
+            w1 = (data >> 32);
+            DEV_WRITE32(ptp_priv, hostcmd_regs[3], w0);
+            DEV_WRITE32(ptp_priv, hostcmd_regs[4], w1);
+        }
+    } else {
+        if (d1) {
+            DEV_READ32(ptp_priv, hostcmd_regs[1], &w0);
+            DEV_READ32(ptp_priv, hostcmd_regs[2], &w1);
+            data = (((u64)w1 << 32) | (w0));
+            *d1 = data;
+        }
+
+        if (d2) {
+            DEV_READ32(ptp_priv, hostcmd_regs[3], &w0);
+            DEV_READ32(ptp_priv, hostcmd_regs[4], &w1);
+            data = (((u64)w1 << 32) | (w0));
+            *d2 = data;
+        }
+    }
+}
+
+static int
+ngptpclock_cmd_go(u32 cmd, void *data0, void *data1)
+{
+    int ret = -1;
+    int retry_cnt = 1000;
+    u32 cmd_status;
+    char cmd_str[48];
+    int port = 0;
+    uint32_t seq_id = 0;
+    ktime_t start, now;
+    u32 subcmd = 0;
+
+    if (ptp_priv == NULL || ptp_priv->shared_addr == NULL) {
+        return ret;
+    }
+
+    mutex_lock(&ptp_priv->ptp_lock);
+
+    if (cmd == NGPTPCLOCK_GET_TSTIME || cmd == NGPTPCLOCK_ACK_TSTIME) {
+        port = *((uint64_t *)data0) & 0xFFF;
+        seq_id = *((uint64_t*)data0) >> 16;
+    }
+    start = ktime_get();
+
+    ptp_priv->shared_addr->ksyncinit = cmd;
+
+    /* init data */
+    DEV_WRITE32(ptp_priv, hostcmd_regs[1], 0x0);
+    DEV_WRITE32(ptp_priv, hostcmd_regs[2], 0x0);
+    DEV_WRITE32(ptp_priv, hostcmd_regs[3], 0x0);
+    DEV_WRITE32(ptp_priv, hostcmd_regs[4], 0x0);
+
+    switch (cmd) {
+        case NGPTPCLOCK_INIT:
+            snprintf(cmd_str, sizeof(cmd_str), "NGPTPCLOCK_INIT");
+            ptp_priv->shared_addr->phase_offset  = 0;
+            ngptpclock_hostcmd_data_op(1,
+                                       (u64 *)&(ptp_priv->shared_addr->phase_offset),
+                                       0);
+            break;
+        case NGPTPCLOCK_FREQCOR:
+            snprintf(cmd_str, sizeof(cmd_str), "NGPTPCLOCK_FREQCORR");
+            ptp_priv->shared_addr->freqcorr  = *((s32 *)data0);
+            ngptpclock_hostcmd_data_op(1,
+                                       (u64 *)&(ptp_priv->shared_addr->freqcorr),
+                                       0);
+            break;
+        case NGPTPCLOCK_ADJTIME:
+            snprintf(cmd_str, sizeof(cmd_str), "NGPTPCLOCK_ADJTIME");
+            ptp_priv->shared_addr->phase_offset  = *((s64 *)data0);
+            ngptpclock_hostcmd_data_op(1,
+                                       (u64 *)&(ptp_priv->shared_addr->phase_offset),
+                                       0);
+            break;
+        case NGPTPCLOCK_GETTIME:
+            retry_cnt = (retry_cnt * 2);
+            snprintf(cmd_str, sizeof(cmd_str), "NGPTPCLOCK_GETTIME");
+            break;
+        case NGPTPCLOCK_GET_TSTIME:
+            retry_cnt = (retry_cnt * 2);
+            snprintf(cmd_str, sizeof(cmd_str), "NGPTPCLOCK_GET_TSTIME");
+            ngptpclock_hostcmd_data_op(1, data0, data1);
+            break;
+         case NGPTPCLOCK_ACK_TSTIME:
+            retry_cnt = (retry_cnt * 2);
+            snprintf(cmd_str, sizeof(cmd_str), "NGPTPCLOCK_ACK_TSTIME");
+            ngptpclock_hostcmd_data_op(1, data0, data1);
+            break;
+        case NGPTPCLOCK_SETTIME:
+            snprintf(cmd_str, sizeof(cmd_str), "NGPTPCLOCK_SETTIME");
+            ptp_priv->shared_addr->ptptime   = *((s64 *)data0);
+            ptp_priv->shared_addr->phase_offset = 0;
+            ngptpclock_hostcmd_data_op(1,
+                                       (u64 *)&(ptp_priv->shared_addr->ptptime),
+                                       (u64 *)&(ptp_priv->shared_addr->phase_offset));
+            break;
+        case NGPTPCLOCK_MTP_TS_UPDATE_ENABLE:
+            retry_cnt = (retry_cnt * 6);
+            snprintf(cmd_str, sizeof(cmd_str), "NGPTPCLOCK_MTP_TS_UPDATE_ENABLE");
+            ngptpclock_hostcmd_data_op(1, (u64 *)data0, 0);
+            break;
+        case NGPTPCLOCK_MTP_TS_UPDATE_DISABLE:
+            retry_cnt = (retry_cnt * 6);
+            snprintf(cmd_str, sizeof(cmd_str), "NGPTPCLOCK_MTP_TS_UPDATE_DISABLE");
+            ngptpclock_hostcmd_data_op(1, (u64 *)data0, 0);
+            break;
+        case NGPTPCLOCK_CLEANUP:
+            retry_cnt = (retry_cnt * 4);
+            snprintf(cmd_str, sizeof(cmd_str), "NGPTPCLOCK_CLEANUP");
+            break;
+        case NGPTPCLOCK_SYSINFO:
+            snprintf(cmd_str, sizeof(cmd_str), "NGPTPCLOCK_SYSINFO");
+            ngptpclock_hostcmd_data_op(1, (u64 *)data0, (u64 *)data1);
+            break;
+        case NGPTPCLOCK_BROADSYNC:
+            subcmd = *((u32 *)data0);
+            snprintf(cmd_str, sizeof(cmd_str), "NGPTPCLOCK_BROADSYNC");
+            ngptpclock_hostcmd_data_op(1, (u64 *)data0, (u64 *)data1);
+            break;
+        case NGPTPCLOCK_GPIO:
+            snprintf(cmd_str, sizeof(cmd_str), "NGPTPCLOCK_GPIO");
+            ngptpclock_hostcmd_data_op(1, (u64 *)data0, (u64 *)data1);
+            break;
+        case NGPTPCLOCK_EVLOG:
+            snprintf(cmd_str, sizeof(cmd_str), "NGPTPCLOCK_EVLOG");
+            ngptpclock_hostcmd_data_op(1, (u64 *)data0, (u64 *)data1);
+            break;
+        case NGPTPCLOCK_EXTTSLOG:
+            snprintf(cmd_str, sizeof(cmd_str), "NGPTPCLOCK_EXTTSLOG");
+            ngptpclock_hostcmd_data_op(1, (u64 *)data0, (u64 *)data1);
+            break;
+        case NGPTPCLOCK_GET_EXTTS_BUFF:
+            snprintf(cmd_str, sizeof(cmd_str), "NGPTPCLOCK_GET_EXTTS_BUFF");
+            ngptpclock_hostcmd_data_op(1, (u64 *)data0, (u64 *)data1);
+            break;
+        case NGPTPCLOCK_GPIO_PHASEOFFSET:
+            snprintf(cmd_str, sizeof(cmd_str), "NGPTPCLOCK_GPIO_PHASEOFFSET");
+            ngptpclock_hostcmd_data_op(1, (u64 *)data0, (u64 *)data1);
+            break;
+        default:
+            snprintf(cmd_str, sizeof(cmd_str), "NGPTPCLOCK_XXX");
+            break;
+    }
+
+    DEV_WRITE32(ptp_priv, hostcmd_regs[0], ptp_priv->shared_addr->ksyncinit);
+
+    do {
+        DEV_READ32(ptp_priv, hostcmd_regs[0], &cmd_status);
+        ptp_priv->shared_addr->ksyncinit = cmd_status;
+
+        if (cmd_status == NGPTPCLOCK_DONE) {
+            ret = 0;
+            switch (cmd) {
+                case NGPTPCLOCK_GET_TSTIME:
+                case NGPTPCLOCK_GETTIME:
+                    ngptpclock_hostcmd_data_op(0, (u64 *)data0, (u64 *)data1);
+                    break;
+                /* Get the host ram address from fw.*/
+                case NGPTPCLOCK_GET_EXTTS_BUFF:
+                    ngptpclock_hostcmd_data_op(0, (u64 *)data0, (u64 *)data1);
+                    break;
+                case NGPTPCLOCK_BROADSYNC:
+                    if ((subcmd == NGPTPCLOCK_BROADSYNC_BS0_STATUS_GET) ||
+                        (subcmd == NGPTPCLOCK_BROADSYNC_BS1_STATUS_GET)) {
+                        ngptpclock_hostcmd_data_op(0, (u64 *)data0, (u64 *)data1);
+                    }
+                    break;
+                default:
+                    break;
+            }
+            break;
+        }
+        ptp_usleep(100);
+        retry_cnt--;
+    } while (retry_cnt);
+
+    now = ktime_get();
+    mutex_unlock(&ptp_priv->ptp_lock);
+
+    if (retry_cnt == 0) {
+        DBG_ERR(("Timeout on response from R5 to cmd %s time taken %lld us\n",
+                    cmd_str, ktime_us_delta(now, start)));
+        if (cmd == NGPTPCLOCK_GET_TSTIME) {
+            DBG_TXTS(("Timeout Port %d SeqId %d\n", port, seq_id));
+        }
+    }
+
+    if (debug & DBG_LVL_CMDS) {
+        if (ktime_us_delta(now, start) > 5000)
+            DBG_CMDS(("R5 Command %s exceeded time expected (%lld us)\n",
+                        cmd_str, ktime_us_delta(now, start)));
+    }
+
+    DBG_CMDS(("ngptpclock_cmd_go: cmd:%s rv:%d\n", cmd_str, ret));
+
+    return ret;
+}
+
+
+/**
+ * ngptpclock_ptp_adjfreq
+ *
+ * @ptp: pointer to ptp_clock_info structure
+ * @ppb: frequency correction value
+ *
+ * Description: this function will set the frequency correction
+ */
+static int ngptpclock_ptp_adjfreq(struct ptp_clock_info *ptp, s32 ppb)
+{
+    int ret = -1;
+
+    ret = ngptpclock_cmd_go(NGPTPCLOCK_FREQCOR, &ppb, NULL);
+    DBG_VERB(("ptp_adjfreq: applying freq correction: %x; rv:%d\n", ppb, ret));
+
+    return ret;
+}
+
+/**
+ * ngptpclock_ptp_adjtime
+ *
+ * @ptp: pointer to ptp_clock_info structure
+ * @delta: desired change in nanoseconds
+ *
+ * Description: this function will shift/adjust the hardware clock time.
+ */
+static int ngptpclock_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)
+{
+    int ret = -1;
+
+    ret = ngptpclock_cmd_go(NGPTPCLOCK_ADJTIME, (void *)&delta, NULL);
+    DBG_VERB(("ptp_adjtime: adjtime: 0x%llx; rv:%d\n", delta, ret));
+
+    return ret;
+}
+
+/**
+ * ngptpclock_ptp_gettime
+ *
+ * @ptp: pointer to ptp_clock_info structure
+ * @ts: pointer to hold time/result
+ *
+ * Description: this function will read the current time from the
+ * hardware clock and store it in @ts.
+ */
+static int ngptpclock_ptp_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts)
+{
+    int ret = -1;
+    s64 reftime = 0;
+    s64 refctr = 0;
+    static u64 prv_reftime = 0, prv_refctr = 0;
+    u64 diff_reftime = 0, diff_refctr = 0;
+
+    ret = ngptpclock_cmd_go(NGPTPCLOCK_GETTIME, (void *)&reftime, (void *)&refctr);
+    if (ret == 0) {
+        DBG_VERB(("ptp_gettime: gettime: 0x%llx refctr:0x%llx\n", reftime, refctr));
+
+        ptp_priv->shared_addr->ptptime_alt = ptp_priv->shared_addr->ptptime;
+        ptp_priv->shared_addr->reftime_alt = ptp_priv->shared_addr->reftime;
+
+        ptp_priv->ptp_pair_lock = 1;
+        ptp_priv->shared_addr->ptptime = reftime;
+        ptp_priv->shared_addr->reftime = refctr;
+        ptp_priv->ptp_pair_lock = 0;
+
+        diff_reftime = reftime - prv_reftime;
+        diff_refctr = refctr - prv_refctr;
+
+        if (diff_reftime != diff_refctr) {
+            DBG_WARN(("PTP-GETTIME ptptime: 0x%llx reftime: 0x%llx "
+                        "prv_ptptime: 0x%llx prv_reftime: 0x%llx \n",
+                        ptp_priv->shared_addr->ptptime,
+                        ptp_priv->shared_addr->reftime,
+                        diff_reftime, diff_refctr));
+        }
+        prv_reftime = reftime;
+        prv_refctr = refctr;
+
+        *ts = ns_to_timespec64(reftime);
+    }
+    return ret;
+}
+
+
+/**
+ * ngptpclock_ptp_settime
+ *
+ * @ptp: pointer to ptp_clock_info structure
+ * @ts: time value to set
+ *
+ * Description: this function will set the current time on the
+ * hardware clock.
+ */
+static int ngptpclock_ptp_settime(struct ptp_clock_info *ptp,
+                              const struct timespec64 *ts)
+{
+    s64 reftime, phaseadj;
+    int ret = -1;
+
+    phaseadj = 0;
+    reftime = timespec64_to_ns(ts);
+
+    ret = ngptpclock_cmd_go(NGPTPCLOCK_SETTIME, (void *)&reftime, (void *)&phaseadj);
+    DBG_VERB(("ptp_settime: settime: 0x%llx; rv:%d\n", reftime, ret));
+
+    return ret;
+}
+
+static int ngptpclock_exttslog_cmd(int event, int enable)
+{
+    int ret;
+    u64 subcmd = 0, subcmd_data = 0;
+
+    if (NULL == ptp_priv->extts_log) {
+        ret = ngptpclock_cmd_go(NGPTPCLOCK_GET_EXTTS_BUFF,
+                                &subcmd, &subcmd_data);
+        DBG_VERB(("ngptpclock_exttslog_cmd: Get EXTTS buff: \
+                   subcmd_data:0x%llx\n", subcmd_data));
+
+        ptp_priv->extts_log =
+            (ngptpclock_fw_extts_log_t *)ngedk_dmamem_map_p2v(subcmd_data);
+        if (NULL == ptp_priv->extts_log) {
+            DBG_ERR(("Failed to get virtual addr for the physical address\n"));
+        }
+    }
+
+    /* upper 32b -> event
+     * lower 32b -> enable/disable */
+    subcmd = (u64)event << 32 | enable;
+
+    ret = ngptpclock_cmd_go(NGPTPCLOCK_EXTTSLOG, &subcmd, &subcmd_data);
+    DBG_VERB(("exttslog_cmd: subcmd: 0x%llx subcmd_data: 0x%llx rv:%d\n",
+                subcmd, subcmd_data, ret));
+
+    return ret;
+}
+
+static int ngptpclock_ptp_enable(struct ptp_clock_info *ptp,
+                             struct ptp_clock_request *rq, int on)
+{
+    int mapped_event = -1;
+    int enable = on ? 1 : 0;
+
+    switch (rq->type) {
+        case PTP_CLK_REQ_EXTTS:
+            if (rq->extts.index < NUM_EXT_TS) {
+                switch (rq->extts.index) {
+                    /* Map EXTTS event_id to FW event_id */
+                    case 0:
+                        mapped_event = TS_EVENT_GPIO_1;
+                        break;
+                    case 1:
+                        mapped_event = TS_EVENT_GPIO_2;
+                        break;
+                    case 2:
+                        mapped_event = TS_EVENT_GPIO_3;
+                        break;
+                    case 3:
+                        mapped_event = TS_EVENT_GPIO_4;
+                        break;
+                    case 4:
+                        mapped_event = TS_EVENT_GPIO_5;
+                        break;
+                    case 5:
+                        mapped_event = TS_EVENT_GPIO_6;
+                        break;
+                    default:
+                        return -EINVAL;
+                }
+
+                /* Reject request for unsupported flags */
+                if (rq->extts.flags & ~(PTP_ENABLE_FEATURE | PTP_RISING_EDGE)) {
+                        return -EOPNOTSUPP;
+                }
+
+                ptp_priv->extts_event.enable[rq->extts.index] = enable;
+
+                ngptpclock_exttslog_cmd(mapped_event, enable);
+
+                DBG_VERB(("Event state change req_index:%u state:%d\n",
+                            rq->extts.index, enable));
+            } else {
+                return -EINVAL;
+            }
+            break;
+        default:
+            return -EOPNOTSUPP;
+    }
+
+    return 0;
+}
+
+#if defined(MIRROR_ENCAP_SUPPORT)
+static int ngptpclock_ptp_mirror_encap_update(struct ptp_clock_info *ptp,
+                                          int mtp_idx, int start)
+{
+    int ret = -1;
+    u64 mirror_encap_idx;
+    u32 cmd_status;
+
+    if (mtp_idx > NGPTPCLOCK_MAX_MTP_IDX) {
+        return ret;
+    }
+
+    mirror_encap_idx = mtp_idx;
+    if (start) {
+        cmd_status = NGPTPCLOCK_MTP_TS_UPDATE_ENABLE;
+        ptp_priv->mirror_encap_bmp |= (1 << mtp_idx);
+    } else {
+        if (!(ptp_priv->mirror_encap_bmp & mtp_idx)) {
+            return ret;
+        }
+        cmd_status = NGPTPCLOCK_MTP_TS_UPDATE_DISABLE;
+        ptp_priv->mirror_encap_bmp &= ~mtp_idx;
+    }
+
+    ret = ngptpclock_cmd_go(cmd_status, &mirror_encap_idx, NULL);
+    DBG_VERB(("mirror_encap_update: %d, mpt_index: %d, ret:%d\n",
+              start, mtp_idx, ret));
+
+    return ret;
+
+}
+#endif
+
+/* structure describing a PTP hardware clock */
+static struct ptp_clock_info ngptpclock_ptp_caps = {
+    .owner = THIS_MODULE,
+    .name = "ptp_clock",
+    .max_adj = 200000,
+    .n_alarm = 0,
+    .n_ext_ts = NUM_EXT_TS,
+    .n_per_out = 0, /* will be overwritten in ngptpclock_ptp_register */
+    .n_pins = 0,
+    .pps = 0,
+    .adjfreq = ngptpclock_ptp_adjfreq,
+    .adjtime = ngptpclock_ptp_adjtime,
+    .gettime64 = ngptpclock_ptp_gettime,
+    .settime64 = ngptpclock_ptp_settime,
+    .enable = ngptpclock_ptp_enable,
+};
+
+/**
+ * ngptpclock_ptp_hw_tx_tstamp_config
+ *
+ * @dinfo: device information
+ * @netif: netif information
+ * @hwts_tx_type: TX Timestamp type
+ *
+ * Description: This is a callback function to enable/disable the TX timestamping port
+ * based.
+ */
+int ngptpclock_ptp_hw_tx_tstamp_config(ngknet_dev_info_t *dinfo,
+        ngknet_netif_t *netif,
+        int *hwts_tx_type)
+{
+#if defined(TWO_STEP_SUPPORT)
+    uint64_t portmap = 0;
+    int map = 0;
+#endif
+    int ret = SHR_E_CONFIG;
+
+    if (!module_initialized) {
+        ret = SHR_E_DISABLED;
+        goto exit;
+    }
+
+    DBG_VERB(("hw_tx_tstamp_config: Tx type %d\n", *hwts_tx_type));
+    if (*hwts_tx_type == HWTSTAMP_TX_ONESTEP_SYNC) {
+        DBG_VERB(("hw_tx_tstamp_config: Enabling 1-step\n"));
+        ngptpclock_ptp_time_keep_init();
+        ret = SHR_E_NONE;
+        goto exit;
+    } else if (*hwts_tx_type == HWTSTAMP_TX_OFF) {
+        DBG_VERB(("hw_tx_tstamp_config: Diabling 1-step\n"));
+        ret = SHR_E_NONE;
+        goto exit;
+    } else if (*hwts_tx_type == HWTSTAMP_TX_ON) {
+#if !defined(TWO_STEP_SUPPORT)
+        DBG_VERB(("hw_tx_tstamp_config: 2Step not supported\n"));
+        ret = SHR_E_UNAVAIL;
+        goto exit;
+#endif
+#if defined(TWO_STEP_SUPPORT)
+        DBG_VERB(("hw_tstamp_enable: Enabling 2-step(type:%d) TS on port:%d\n",
+                  tx_type, port));
+        if (port <= 0) {
+            ret = SHR_E_PARAM;
+            goto exit;
+        }
+
+        /* Update the shared structure member */
+        if (ptp_priv->shared_addr) {
+            if ((port > 0) && (port < NGPTPCLOCK_MAX_NUM_PORTS)) {
+                port -= 1;
+                map = (port / 64);
+                port = (port % 64);
+
+                portmap = ptp_priv->shared_addr->portmap[map];
+                portmap |= (uint64_t)0x1 << port;
+                ptp_priv->shared_addr->portmap[map] = portmap;
+
+                /* Command to R5 for the update */
+                ptp_priv->shared_addr->ksyncinit=NGPTPCLOCK_PBM_UPDATE;
+
+            }
+        }
+#endif
+    }
+exit:
+    return ret;
+}
+
+/**
+ * ngptpclock_ptp_hw_rx_tstamp_config
+ *
+ * @dinfo: device information
+ * @netif: netif information
+ * @hwts_tx_type: TX Timestamp type
+ *
+ * Description: This is a callback function to enable/disable the RX timestamping port
+ * based.
+ */
+int ngptpclock_ptp_hw_rx_tstamp_config(ngknet_dev_info_t *dinfo, ngknet_netif_t *netif,
+        int *hwts_rx_filter)
+{
+#if defined(TWO_STEP_SUPPORT)
+    uint64_t portmap = 0;
+    int map = 0;
+#endif
+
+    if (!module_initialized) {
+        return SHR_E_DISABLED;
+    }
+
+    DBG_VERB(("hw_rx_tstamp_config: Rx filter %d\n", *hwts_rx_filter));
+    if (*hwts_rx_filter == HWTSTAMP_FILTER_NONE) {
+        /* disable */
+    } else {
+        /* enable */
+    }
+
+#if defined(TWO_STEP_SUPPORT)
+    DBG_VERB(("hw_tstamp_disable: Disable 2Step TS(type:%d) port = %d\n", tx_type, port));
+    if (port <= 0) {
+        DBG_ERR(("hw_tstamp_disable: Error disabling timestamp on port:%d\n", port));
+        ret = -1;
+        goto exit;
+    }
+
+    /* Update the shared structure member - Disable 2step on port */
+    if (ptp_priv->shared_addr) {
+        if ((port > 0) && (port < NGPTPCLOCK_MAX_NUM_PORTS)) {
+            port -= 1;
+            map = (port / 64);
+            port = (port % 64);
+
+            portmap = ptp_priv->shared_addr->portmap[map];
+            portmap &= ~((uint64_t)0x1 << port);
+            ptp_priv->shared_addr->portmap[map]= portmap;
+
+            /* Command to R5 for the update */
+            ptp_priv->shared_addr->ksyncinit = NGPTPCLOCK_PBM_UPDATE;
+        }
+    }
+#endif
+
+    return SHR_E_NONE;
+}
+
+int ngptpclock_ptp_transport_get(uint8_t *pkt)
+{
+    int         transport = 0;
+    uint16_t    ethertype;
+    uint16_t    tpid;
+    int         tpid_offset, ethype_offset;
+
+    /* Need to check VLAN tag if packet is tagged */
+    tpid_offset = 12;
+    tpid = pkt[tpid_offset] << 8 | pkt[tpid_offset + 1];
+    if (tpid == 0x8100) {
+        ethype_offset = tpid_offset + 4;
+    } else {
+        ethype_offset = tpid_offset;
+    }
+
+    ethertype = pkt[ethype_offset] << 8 | pkt[ethype_offset+1];
+
+    switch (ethertype) {
+        case 0x88f7:    /* ETHERTYPE_PTPV2 */
+            transport = 2;
+            break;
+
+        case 0x0800:    /* ETHERTYPE_IPV4 */
+            transport = 4;
+            break;
+
+        case 0x86DD:    /* ETHERTYPE_IPV6 */
+            transport = 6;
+            break;
+
+        default:
+            transport = 0;
+    }
+
+    return transport;
+}
+
+#if defined(TWO_STEP_SUPPORT)
+static int
+ngptpclock_txpkt_tsts_tsamp_get(int port, uint32_t pkt_seq_id, uint32_t *ts_valid,
+        uint32_t *seq_id, uint64_t *timestamp)
+{
+    int ret = 0;
+    uint64_t tmp;
+    u32 fifo_rxctr = 0;
+
+    tmp = (port & 0xFFFF) | (pkt_seq_id << 16);
+
+    ret = ngptpclock_cmd_go(NGPTPCLOCK_GET_TSTIME, &tmp, timestamp);
+    if (ret >= 0) {
+        fifo_rxctr = (tmp >> 32) & 0xFFFF;
+        *seq_id = ((tmp >> 16) & 0xFFFF);
+        *ts_valid = (tmp & 0x1);
+         if (*ts_valid) {
+            tmp = (port & 0xFFFF) | (pkt_seq_id << 16);
+            ngptpclock_cmd_go(NGPTPCLOCK_ACK_TSTIME, &tmp, 0);
+            if (fifo_rxctr != 0) {
+                if (fifo_rxctr != ptp_priv->port_stats[port].fifo_rxctr + 1) {
+                    DBG_ERR(("FW Reset or Lost Timestamp RxSeq:(Prev %d : Current %d)\n",
+                                ptp_priv->port_stats[port].fifo_rxctr, fifo_rxctr));
+                }
+                ptp_priv->port_stats[port].fifo_rxctr = fifo_rxctr;
+            }
+        }
+    }
+
+
+    return ret;
+}
+#endif
+
+
+/**
+ * ngptpclock_ptp_hw_tstamp_tx_time_get
+ *
+ * @skb: Linux socket buffer
+ * @ts: timestamp to be retrieved
+ *
+ * Description: This is a callback function to retrieve the timestamp on
+ * a given port
+ * NOTE:
+ * Two-step related - fetching the timestamp from portmacro, not needed for one-step
+ */
+int ngptpclock_ptp_hw_tstamp_tx_time_get(struct sk_buff *skb, uint64_t *ts)
+{
+#if defined(TWO_STEP_SUPPORT)
+    /* Get Timestamp from R5 or CLMAC */
+    uint32_t ts_valid = 0;
+    uint32_t seq_id = 0;
+    uint32_t pktseq_id = 0;
+    uint64_t timestamp = 0;
+    uint16_t tpid = 0;
+    ktime_t start;
+    u64 delta;
+    int retry_cnt = num_retries;
+    int seq_id_offset, tpid_offset;
+    int transport = network_transport;
+#endif
+
+    struct ngknet_callback_desc *cbd = NGKNET_SKB_CB(skb);
+    struct ngknet_ptp_data *ptpd = (struct ngknet_ptp_data *)cbd->netif->user_data;
+    int hwts_tx_type = ptpd->hwts_tx_type;
+    /* The first byte from the userdata is the phy_port number */
+    int port = ptpd->phy_port;
+
+#if defined(TWO_STEP_SUPPORT)
+    int dev_no = cbd->dinfo->dev_no;
+#endif
+
+    if (!ptp_priv || !module_initialized) {
+        return SHR_E_DISABLED;
+    }
+
+#if defined(TWO_STEP_SUPPORT)
+    start = ktime_get();
+#endif
+
+    if (!ts || port < 1 || port > 255 || ptp_priv->shared_addr == NULL) {
+        return SHR_E_DISABLED;
+    }
+
+    /* Reset */
+    *ts = 0;
+
+    if (hwts_tx_type == HWTSTAMP_TX_ONESTEP_SYNC) {
+        *ts = *(uint64_t *)skb->cb;
+
+        port -= 1;
+        ptp_priv->port_stats[port].pkt_txctr += 1;
+    } else {
+#if defined(TWO_STEP_SUPPORT)
+        tpid_offset = 12;
+
+        /* Parse for nw transport */
+        if (transport == 0) {
+            transport = ngptpclock_ptp_transport_get(pkt);
+        }
+
+        switch (transport)
+        {
+            case 2:
+                seq_id_offset = 0x2c;
+                break;
+            case 4:
+                seq_id_offset = 0x48;
+                break;
+            case 6:
+                seq_id_offset = 0x5c;
+                break;
+            default:
+                seq_id_offset = 0x2c;
+                break;
+        }
+
+        /* Need to check VLAN tag if packet is tagged */
+        tpid = pkt[tpid_offset] << 8 | pkt[tpid_offset + 1];
+        if (tpid == 0x8100) {
+            seq_id_offset += 4;
+        }
+
+        pktseq_id = pkt[seq_id_offset] << 8 | pkt[seq_id_offset + 1];
+
+        port -= 1;
+
+        DBG_TXTS(("hw_tstamp_tx_time_get: port %d pktseq_id %u\n", port, pktseq_id));
+
+        /* Fetch the TX timestamp from shadow memory */
+        do {
+            ngptpclock_txpkt_tsts_tsamp_get(port, pktseq_id, &ts_valid, &seq_id, &timestamp);
+            if (ts_valid) {
+
+                /* Clear the shadow memory to get next entry */
+                ptp_priv->shared_addr->port_ts_data[port].timestamp = 0;
+                ptp_priv->shared_addr->port_ts_data[port].port_id = 0;
+                ptp_priv->shared_addr->port_ts_data[port].ts_seq_id = 0;
+                ptp_priv->shared_addr->port_ts_data[port].ts_valid = 0;
+
+                if (seq_id == pktseq_id) {
+                    *ts = timestamp;
+                    ptp_priv->port_stats[port].tsts_match += 1;
+
+                    delta = ktime_us_delta(ktime_get(), start);
+                    DBG_TXTS(("Port: %d Skb_SeqID %d FW_SeqId %d and TS:%llx FetchTime %lld\n",
+                                port, pktseq_id, seq_id, timestamp, delta));
+
+                    if ((delta < ptp_priv->port_stats[port].tsts_best_fetch_time) ||
+                            (ptp_priv->port_stats[port].tsts_best_fetch_time == 0)) {
+                        ptp_priv->port_stats[port].tsts_best_fetch_time = delta;
+                    }
+                    if ((delta > ptp_priv->port_stats[port].tsts_worst_fetch_time) ||
+                            (ptp_priv->port_stats[port].tsts_worst_fetch_time == 0)) {
+                        ptp_priv->port_stats[port].tsts_worst_fetch_time = delta;
+                    }
+                    /* Calculate Moving Average*/
+                    ptp_priv->port_stats[port].tsts_avg_fetch_time = ((u32)delta +
+                            ((ptp_priv->port_stats[port].tsts_match - 1) *
+                            ptp_priv->port_stats[port].tsts_avg_fetch_time)) /
+                            ptp_priv->port_stats[port].tsts_match;
+                    break;
+                } else {
+                    DBG_TXTS(("Discard timestamp on port %d Skb_SeqID %d FW_SeqId %d "
+                                "RetryCnt %d TimeLapsed (%lld us)\n",
+                                port, pktseq_id, seq_id, (num_retries - retry_cnt),
+                                ktime_us_delta(ktime_get(),start)));
+
+                    ptp_priv->port_stats[port].tsts_discard += 1;
+                    continue;
+                }
+            }
+            ptp_sleep(1);
+            retry_cnt--;
+        } while (retry_cnt);
+
+
+        ptp_priv->port_stats[port].pkt_txctr += 1;
+
+        if (retry_cnt == 0) {
+            ptp_priv->port_stats[port].tsts_timeout += 1;
+            DBG_ERR(("FW Response timeout: Tx TS on phy port:%d Skb_SeqID: %d "
+                        "TimeLapsed (%lld us)\n", port, pktseq_id,
+                        ktime_us_delta(ktime_get(), start)));
+        }
+#endif
+    }
+
+    return SHR_E_NONE;
+}
+
+enum {
+    CUSTOM_ENCAP_VERSION_INVALID = 0,
+    CUSTOM_ENCAP_VERSION_ONE = 1,
+
+    CUSTOM_ENCAP_VERSION_CURRENT = CUSTOM_ENCAP_VERSION_ONE,
+    CUSTOM_ENCAP_VERSION_RSVD = 255
+};
+
+enum {
+    CUSTOM_ENCAP_OPCODE_INVALID = 0,
+    CUSTOM_ENCAP_OPCODE_PTP_RX = 1,
+    CUSTOM_ENCAP_OPCODE_RSVD = 255
+};
+
+enum {
+    CUSTOM_ENCAP_PTP_RX_TLV_INVALID = 0,
+    CUSTOM_ENCAP_PTP_RX_TLV_PTP_RX_TIME = 1,
+    CUSTOM_ENCAP_PTP_RX_TLV_RSVD = 255
+};
+
+static void
+dbg_dump_pkt(uint8_t *data, int size)
+{
+    int idx;
+    char str[128];
+
+    for (idx = 0; idx < size; idx++) {
+        if ((idx & 0xf) == 0) {
+            sprintf(str, "%04x: ", idx);
+        }
+        sprintf(&str[strlen(str)], "%02x ", data[idx]);
+        if ((idx & 0xf) == 0xf) {
+            sprintf(&str[strlen(str)], "\n");
+            printk(str);
+        }
+    }
+    if ((idx & 0xf) != 0) {
+        sprintf(&str[strlen(str)], "\n");
+        printk(str);
+    }
+}
+
+static inline int
+ngptpclock_pkt_custom_encap_ptprx_get(uint8_t *pkt, uint64_t *ing_ptptime)
+{
+    uint8_t  *custom_hdr;
+    uint8_t   id[4];
+    uint8_t   ver, opc;
+    uint8_t   nh_type, nh_rsvd;
+    uint16_t  len, tot_len;
+    uint16_t  nh_len;
+    uint32_t  seq_id = 0;
+    uint32_t  ptp_rx_time[2];
+    uint64_t  u64_ptp_rx_time = 0;
+
+    custom_hdr = pkt;
+
+    NGPTPCLOCK_UNPACK_U8(custom_hdr, id[0]);
+    NGPTPCLOCK_UNPACK_U8(custom_hdr, id[1]);
+    NGPTPCLOCK_UNPACK_U8(custom_hdr, id[2]);
+    NGPTPCLOCK_UNPACK_U8(custom_hdr, id[3]);
+    if (!((id[0] == 'B') && (id[1] == 'C') && (id[2] == 'M') && (id[3] == 'C'))) {
+        /* invalid signature */
+        return -1;
+    }
+
+    NGPTPCLOCK_UNPACK_U8(custom_hdr, ver);
+    switch (ver) {
+        case CUSTOM_ENCAP_VERSION_CURRENT:
+            break;
+        default:
+            DBG_ERR(("custom_encap_ptprx_get: Invalid ver\n"));
+            return -1;
+    }
+
+    NGPTPCLOCK_UNPACK_U8(custom_hdr, opc);
+    switch (opc) {
+        case CUSTOM_ENCAP_OPCODE_PTP_RX:
+            break;
+        default:
+            DBG_ERR(("custom_encap_ptprx_get: Invalid opcode\n"));
+            return -1;
+    }
+
+    NGPTPCLOCK_UNPACK_U16(custom_hdr, len);
+    NGPTPCLOCK_UNPACK_U32(custom_hdr, seq_id);
+    tot_len = len;
+
+    /* remaining length of custom encap */
+    len = len - (custom_hdr - pkt);
+
+    /* process tlv */
+    while (len > 0) {
+        NGPTPCLOCK_UNPACK_U8(custom_hdr, nh_type);
+        NGPTPCLOCK_UNPACK_U8(custom_hdr, nh_rsvd);
+        NGPTPCLOCK_UNPACK_U16(custom_hdr, nh_len);
+        len = len - (nh_len);
+        if (nh_rsvd != 0x0) {
+            continue; /* invalid tlv */
+        }
+
+        switch (nh_type) {
+            case CUSTOM_ENCAP_PTP_RX_TLV_PTP_RX_TIME:
+                NGPTPCLOCK_UNPACK_U32(custom_hdr, ptp_rx_time[0]);
+                NGPTPCLOCK_UNPACK_U32(custom_hdr, ptp_rx_time[1]);
+                u64_ptp_rx_time = ((uint64_t)ptp_rx_time[1] << 32) | (uint64_t)ptp_rx_time[0];
+                *ing_ptptime = u64_ptp_rx_time;
+                break;
+            default:
+                custom_hdr += nh_len;
+                break;
+        }
+    }
+
+    DBG_RX_DUMP(("custom_encap_ptprx_get: Custom Encap header:\n"));
+    if (debug & DBG_LVL_RX_DUMP) dbg_dump_pkt(pkt, tot_len);
+
+    DBG_RX(("custom_encap_ptprx_get: ver=%d opcode=%d tot_len=%d seq_id=0x%x\n",
+                ver, opc, tot_len, seq_id));
+
+    return (tot_len);
+}
+
+/**
+ * ngptpclock_ptp_hw_rx_pre_process
+ *
+ * @skb: Linux socket buffer
+ * @cust_hdr_len: Custom header length
+ *
+ * Description: Parse the packet to check if customer is present and return the header length.
+ */
+int ngptpclock_ptp_hw_rx_pre_process(struct sk_buff *skb, uint32_t *cust_hdr_len)
+{
+    uint64_t ts;
+    int custom_encap_len = 0;
+    struct ngknet_callback_desc *cbd = NGKNET_SKB_CB(skb);
+    int pkt_hdr_len = 32 + cbd->pmd_len;
+    uint8_t *data = skb->data + pkt_hdr_len;
+
+    custom_encap_len = ngptpclock_pkt_custom_encap_ptprx_get(data, &ts);
+
+    DBG_RX(("hw_rx_pre_process: cust_encap_len=0x%x\n", custom_encap_len));
+
+    if ((cust_hdr_len) && (custom_encap_len >= 0)) {
+        *cust_hdr_len = custom_encap_len;
+    } else if (cust_hdr_len) {
+        *cust_hdr_len = 0;
+    }
+    return SHR_E_NONE;
+}
+
+/**
+ * ngptpclock_ptp_hw_tstamp_rx_time_upscale
+ *
+ * @skb: Linxu socket buffer
+ * @ts: timestamp to be retrieved
+ *
+ * Description: This is a callback function to retrieve 64b equivalent of
+ *   rx timestamp
+ */
+int ngptpclock_ptp_hw_tstamp_rx_time_upscale(struct sk_buff *skb, uint64_t *ts)
+{
+    int ret = SHR_E_NONE;
+    int custom_encap_len = 0;
+    uint16_t tpid = 0;
+    uint16_t msgtype_offset = 0;
+    int transport = network_transport;
+    int ptp_hdr_offset = 0, ptp_message_len = 0;
+
+    struct ngknet_callback_desc *cbd = NGKNET_SKB_CB(skb);
+    /* The first byte from the userdata is the phy_port number */
+    int port = (int)cbd->netif->user_data[0];
+
+    if (!module_initialized || !ptp_priv || (ptp_priv->shared_addr == NULL)) {
+        return SHR_E_DISABLED;
+    }
+
+    DBG_RX_DUMP(("rxtime_upscale: Incoming packet: \n"));
+    if (debug & DBG_LVL_RX_DUMP) dbg_dump_pkt(skb->data, skb->len);
+
+    /* FIXME : SDKLT-38745
+     * Verify cos_q in meta data.
+     * Example: if (pci_cos != (meta[4] & 0x3F)) {}
+     */
+
+    /* parse custom encap header in pkt for ptp rxtime */
+    custom_encap_len = ngptpclock_pkt_custom_encap_ptprx_get((skb->data), ts);
+
+    /* Remove the custom encap header from pkt */
+    if (custom_encap_len > 0) {
+
+        skb_pull(skb, custom_encap_len);
+
+        DBG_RX_DUMP(("rxtime_upscale: After removing custom encap: \n"));
+        if (debug & DBG_LVL_RX_DUMP) dbg_dump_pkt(skb->data, skb->len);
+
+        msgtype_offset = ptp_hdr_offset = 0;
+        tpid = SKB_U16_GET(skb, (12));
+        if (tpid == 0x8100) {
+            msgtype_offset += 4;
+            ptp_hdr_offset += 4;
+        }
+
+        /* Parse for nw transport */
+        transport = ngptpclock_ptp_transport_get(skb->data);
+
+        switch (transport)
+        {
+            case 2: /* IEEE 802.3 */
+                ptp_hdr_offset += 14;
+                break;
+            case 4: /* UDP IPv4   */
+                ptp_hdr_offset += 42;
+                break;
+            case 6: /* UDP IPv6   */
+                ptp_hdr_offset += 62;
+                break;
+            default:
+                ptp_hdr_offset += 42;
+                break;
+        }
+
+        ptp_message_len = SKB_U16_GET(skb, (ptp_hdr_offset + 2));
+
+        DBG_RX(("rxtime_upscale: custom_encap_len %d tpid 0x%x transport %d skb->len %d "
+                    "ptp message type %d, ptp_message_len %d\n",
+                    custom_encap_len, tpid, transport, skb->len,
+                    skb->data[msgtype_offset] & 0x0F, ptp_message_len));
+    }
+
+    if ((port > 0) && (port < NGPTPCLOCK_MAX_NUM_PORTS)) {
+        port -= 1;
+        ptp_priv->port_stats[port].pkt_rxctr += 1;
+    }
+
+    return ret;
+}
+
+void ngptpclock_hton64(u8 *buf, const uint64_t *data)
+{
+#ifdef __LITTLE_ENDIAN
+  /* LITTLE ENDIAN */
+  buf[0] = (*(((uint8_t*)(data)) + 7u));
+  buf[1] = (*(((uint8_t*)(data)) + 6u));
+  buf[2] = (*(((uint8_t*)(data)) + 5u));
+  buf[3] = (*(((uint8_t*)(data)) + 4u));
+  buf[4] = (*(((uint8_t*)(data)) + 3u));
+  buf[5] = (*(((uint8_t*)(data)) + 2u));
+  buf[6] = (*(((uint8_t*)(data)) + 1u));
+  buf[7] = (*(((uint8_t*)(data)) + 0u));
+#else
+  memcpy(buf, data, 8);
+#endif
+}
+
+int ngptpclock_ptp_hw_tstamp_tx_meta_set(struct sk_buff *skb)
+{
+    uint16_t tpid = 0;
+    int md_offset = 0;
+    int pkt_offset = 0;
+    int ptp_hdr_offset = 0;
+    int transport = network_transport;
+    s64 ptptime  = 0;
+    s64 ptpcounter = 0;
+    int64_t corrField;
+    int32_t negCurTS32;
+    int64_t negCurTS64;
+
+    struct ngknet_callback_desc *cbd = NGKNET_SKB_CB(skb);
+    struct ngknet_ptp_data *ptpd = (struct ngknet_ptp_data *)cbd->netif->user_data;
+    int hwts_tx_type = ptpd->hwts_tx_type;
+    int hdrlen = cbd->pmd_len;
+    u32 md[4];
+    /* The first byte from the userdata is the phy_port number */
+    int port = ptpd->phy_port;
+
+    if (!module_initialized || !ptp_priv || (ptp_priv->shared_addr == NULL)) {
+        return SHR_E_DISABLED;
+    }
+
+    if (ptp_priv->ptp_pair_lock == 1) {
+        /* use alternate pair when main dataset is being updated */
+        ptptime = ptp_priv->shared_addr->ptptime_alt;
+        ptpcounter = ptp_priv->shared_addr->reftime_alt;
+    } else {
+        ptptime = ptp_priv->shared_addr->ptptime;
+        ptpcounter = ptp_priv->shared_addr->reftime;
+    }
+
+    negCurTS32 = - (int32_t) ptpcounter;
+    negCurTS64 = - (int64_t)(ptpcounter);
+
+    /* FIXME : SDKLT-38745
+     * Get packet header length. Current default length 32byte.
+     */
+    if (CMICX_DEV_TYPE) {
+        pkt_offset = ptp_hdr_offset = hdrlen + 32;
+    }
+
+    /* Need to check VLAN tag if packet is tagged */
+    tpid = SKB_U16_GET(skb, (pkt_offset + 12));
+    if (tpid == 0x8100) {
+        md_offset = 4;
+        ptp_hdr_offset += 4;
+    }
+
+    /* One Step Meta Data */
+    if (hwts_tx_type == HWTSTAMP_TX_ONESTEP_SYNC) {
+        md_offset += 8;
+        corrField = (((int64_t)negCurTS64) << 16);
+    }
+
+    /* Parse for nw transport */
+    if (transport == 0) {
+        transport = ngptpclock_ptp_transport_get(skb->data + pkt_offset);
+    }
+
+    memcpy(md, cbd->pmd, sizeof(md));
+    switch (transport)
+    {
+        case 2: /* IEEE 802.3 */
+            ptp_hdr_offset += 14;
+            if (cbd->pmd) {
+                md[0] |= (ieee1588_l2pkt_md[md_offset]);
+                md[1] |= (ieee1588_l2pkt_md[md_offset + 1]);
+                md[2] |= (ieee1588_l2pkt_md[md_offset + 2]);
+                md[3] |= (ieee1588_l2pkt_md[md_offset + 3]);
+            }
+            break;
+        case 4: /* UDP IPv4   */
+            ptp_hdr_offset += 42;
+            if (cbd->pmd) {
+                md[0] |= (ieee1588_ipv4pkt_md[md_offset]);
+                md[1] |= (ieee1588_ipv4pkt_md[md_offset + 1]);
+                md[2] |= (ieee1588_ipv4pkt_md[md_offset + 2]);
+                md[3] |= (ieee1588_ipv4pkt_md[md_offset + 3]);
+            }
+            break;
+        case 6: /* UDP IPv6   */
+            ptp_hdr_offset += 62;
+            if (cbd->pmd) {
+                md[0] |= (ieee1588_ipv6pkt_md[md_offset]);
+                md[1] |= (ieee1588_ipv6pkt_md[md_offset + 1]);
+                md[2] |= (ieee1588_ipv6pkt_md[md_offset + 2]);
+                md[3] |= (ieee1588_ipv6pkt_md[md_offset + 3]);
+            }
+            break;
+        default:
+            ptp_hdr_offset += 42;
+            if (cbd->pmd) {
+                md[0] |= (ieee1588_ipv4pkt_md[md_offset]);
+                md[1] |= (ieee1588_ipv4pkt_md[md_offset + 1]);
+                md[2] |= (ieee1588_ipv4pkt_md[md_offset + 2]);
+                md[3] |= (ieee1588_ipv4pkt_md[md_offset + 3]);
+            }
+            break;
+    }
+    memcpy(cbd->pmd, md, sizeof(md));
+
+    DBG_TX(("hw_tstamp_tx_meta_get: ptptime: 0x%llx ptpcounter: 0x%llx\n", ptptime, ptpcounter));
+    DBG_TX(("hw_tstamp_tx_meta_get: ptpmessage offset:%u type: 0x%x hwts_tx_type: %d\n",
+                ptp_hdr_offset, skb->data[ptp_hdr_offset] & 0x0f, hwts_tx_type));
+
+    if ((hwts_tx_type == HWTSTAMP_TX_ONESTEP_SYNC) &&
+            (NGPTPCLOCK_PTP_EVENT_MSG((skb->data[ptp_hdr_offset] & 0x0F)))) {
+        /* One Step Timestamp Field updation */
+        int corr_offset = ptp_hdr_offset + 8;
+        int origin_ts_offset = ptp_hdr_offset + 34;
+        u32 tmp;
+        struct timespec64 ts = {0};
+        int udp_csum_regen;
+        u32 udp_csum20;
+        u16 udp_csum;
+
+        udp_csum = SKB_U16_GET(skb, (ptp_hdr_offset - 2));
+
+        switch (transport) {
+            case 2:
+                udp_csum_regen = 0;
+                break;
+            case 6:
+                udp_csum_regen = 1;
+                break;
+            default:
+                udp_csum_regen = (udp_csum != 0x0);
+                break;
+        }
+
+        /* Fill the correction field */
+        ngptpclock_hton64(&(skb->data[corr_offset]), (const u64 *)&corrField);
+
+        /* Fill the Origin Timestamp Field */
+        ts = ns_to_timespec64(ptptime);
+
+        tmp = (ts.tv_sec >> 32);
+        skb->data[origin_ts_offset + 0] = ((tmp >>  8) & 0xFF);
+        skb->data[origin_ts_offset + 1] = ((tmp      ) & 0xFF);
+
+        tmp = (ts.tv_sec & 0xFFFFFFFFLL);
+        skb->data[origin_ts_offset + 2] = ((tmp >> 24) & 0xFF);
+        skb->data[origin_ts_offset + 3] = ((tmp >> 16) & 0xFF);
+        skb->data[origin_ts_offset + 4] = ((tmp >>  8) & 0xFF);
+        skb->data[origin_ts_offset + 5] = ((tmp      ) & 0xFF);
+
+        tmp = (ts.tv_nsec & 0xFFFFFFFFLL);
+        skb->data[origin_ts_offset + 6] = ((tmp >> 24) & 0xFF);
+        skb->data[origin_ts_offset + 7] = ((tmp >> 16) & 0xFF);
+        skb->data[origin_ts_offset + 8] = ((tmp >>  8) & 0xFF);
+        skb->data[origin_ts_offset + 9] = ((tmp      ) & 0xFF);
+
+        if (udp_csum_regen) {
+            udp_csum20 = (~udp_csum) & 0xFFFF;
+
+            udp_csum20 += SKB_U16_GET(skb, (corr_offset + 0));
+            udp_csum20 += SKB_U16_GET(skb, (corr_offset + 2));
+            udp_csum20 += SKB_U16_GET(skb, (corr_offset + 4));
+            udp_csum20 += SKB_U16_GET(skb, (corr_offset + 6));
+
+            udp_csum20 += SKB_U16_GET(skb, (origin_ts_offset + 0));
+            udp_csum20 += SKB_U16_GET(skb, (origin_ts_offset + 2));
+            udp_csum20 += SKB_U16_GET(skb, (origin_ts_offset + 4));
+            udp_csum20 += SKB_U16_GET(skb, (origin_ts_offset + 6));
+            udp_csum20 += SKB_U16_GET(skb, (origin_ts_offset + 8));
+
+            /* Fold 20bit checksum into 16bit udp checksum */
+            udp_csum20 = ((udp_csum20 & 0xFFFF) + (udp_csum20 >> 16));
+            udp_csum = ((udp_csum20 & 0xFFFF) + (udp_csum20 >> 16));
+
+            /* invert again to get final checksum. */
+            udp_csum = ~udp_csum;
+            if (udp_csum == 0) {
+                udp_csum = 0xFFFF;
+            }
+
+            skb->data[ptp_hdr_offset - 2] = ((udp_csum >>  8) & 0xFF);
+            skb->data[ptp_hdr_offset - 1] = ((udp_csum      ) & 0xFF);
+        }
+
+        if ((skb->data[ptp_hdr_offset] & 0x0F) == IEEE1588_MSGTYPE_DELREQ) {
+            *(uint64_t *)skb->cb = ptptime;
+        } else {
+            *(uint64_t *)skb->cb = 0;
+        }
+
+        DBG_TX(("hw_tstamp_tx_meta_get: ptp msg type %d packet tstamp : 0x%llx corrField: 0x%llx\n",
+                    (skb->data[ptp_hdr_offset] & 0x0F), ptptime, corrField));
+
+        if ((port > 0) && (port < NGPTPCLOCK_MAX_NUM_PORTS)) {
+            port -= 1;
+            ptp_priv->port_stats[port].pkt_txonestep += 1;
+        }
+    }
+
+    DBG_TX_DUMP(("hw_tstamp_tx_meta_get: PTP Packet\n"));
+    if (debug & DBG_LVL_TX_DUMP) dbg_dump_pkt(skb->data, skb->len);
+
+    return 0;
+}
+
+int ngptpclock_ptp_hw_tstamp_ptp_clock_index_get(ngknet_dev_info_t *dinfo,
+        ngknet_netif_t *netif, int *index)
+{
+    if (!module_initialized || !ptp_priv) {
+        return SHR_E_DISABLED;
+    }
+
+    if (ptp_priv && ptp_priv->ptp_clock)
+        *index =  ptp_clock_index(ptp_priv->ptp_clock);
+
+    return SHR_E_NONE;
+}
+
+/**
+* bcm_ptp_time_keep - call timecounter_read every second to avoid timer overrun
+*                 because  a 32bit counter, will timeout in 4s
+*/
+static void
+ngptpclock_ptp_time_keep(struct work_struct *work)
+{
+    struct delayed_work *dwork = to_delayed_work(work);
+    struct ngptpclock_ptp_priv *priv =
+                        container_of(dwork, struct ngptpclock_ptp_priv, time_keep);
+    struct timespec64 ts;
+
+    /* Call bcm_ptp_gettime function to keep the ref_time_64 and ref_counter_48 in sync */
+    ngptpclock_ptp_gettime(&(priv->ptp_caps), &ts);
+    schedule_delayed_work(&priv->time_keep, HZ);
+}
+
+static void
+ngptpclock_ptp_time_keep_init(void)
+{
+    if (!ptp_priv->timekeep_status) {
+        INIT_DELAYED_WORK(&(ptp_priv->time_keep), ngptpclock_ptp_time_keep);
+        schedule_delayed_work(&ptp_priv->time_keep, HZ);
+
+        ptp_priv->timekeep_status = 1;
+    }
+
+    return;
+}
+
+static void
+ngptpclock_ptp_time_keep_cleanup(void)
+{
+    if (ptp_priv->timekeep_status) {
+        /* Cancel delayed work */
+        cancel_delayed_work_sync(&(ptp_priv->time_keep));
+
+        ptp_priv->timekeep_status = 0;
+    }
+
+    return;
+}
+
+/* PTP_EXTTS logging */
+static void
+ngptpclock_ptp_extts_logging(struct work_struct *work)
+{
+    struct delayed_work *dwork = to_delayed_work(work);
+    struct ngptpclock_ptp_priv *priv = container_of(dwork, struct ngptpclock_ptp_priv, extts_logging);
+    struct ptp_clock_event event;
+    int event_id = -1;
+    int head = -1, tail = -1;
+
+    if (!module_initialized || ptp_priv->extts_log == NULL)
+        goto exit;
+
+    if (ptp_priv->extts_log->overflow) {
+        DBG_VERB(("Queue overflow state:%u\n", ptp_priv->extts_log->overflow));
+    }
+
+    tail = (int)ptp_priv->extts_log->tail;
+    head = ptp_priv->extts_event.head;
+
+    head = (head + 1) % NUM_EVENT_TS;
+    while (tail != head) {
+        switch (ptp_priv->extts_log->event_ts[head].ts_event_id) {
+            /* Map FW event_id to EXTTS event_id */
+            case TS_EVENT_GPIO_1:
+                event_id = 0;
+                break;
+            case TS_EVENT_GPIO_2:
+                event_id = 1;
+                break;
+            case TS_EVENT_GPIO_3:
+                event_id = 2;
+                break;
+            case TS_EVENT_GPIO_4:
+                event_id = 3;
+                break;
+            case TS_EVENT_GPIO_5:
+                event_id = 4;
+                break;
+            case TS_EVENT_GPIO_6:
+                event_id = 5;
+                break;
+        }
+
+        if (event_id < 0 || ptp_priv->extts_event.enable[event_id] != 1) {
+            memset((void *)&(ptp_priv->extts_log->event_ts[head]), 0,
+                    sizeof(ptp_priv->extts_log->event_ts[head]));
+
+            ptp_priv->extts_event.head = head;
+            ptp_priv->extts_log->head = head;
+
+            head = (head + 1) % NUM_EVENT_TS;
+            continue;
+        }
+
+        event.type = PTP_CLOCK_EXTTS;
+        event.index = event_id;
+        event.timestamp = ((s64)ptp_priv->extts_log->event_ts[head].tstamp.sec * 1000000000) +
+            ptp_priv->extts_log->event_ts[head].tstamp.nsec;
+        ptp_clock_event(ptp_priv->ptp_clock, &event);
+
+        ptp_priv->extts_event.head = head;
+        ptp_priv->extts_log->head = head;
+
+        head = (head + 1) % NUM_EVENT_TS;
+    }
+exit:
+    schedule_delayed_work(&priv->extts_logging, __msecs_to_jiffies(100));
+}
+
+static void
+ngptpclock_ptp_extts_logging_init(void)
+{
+    INIT_DELAYED_WORK(&(ptp_priv->extts_logging), ngptpclock_ptp_extts_logging);
+    schedule_delayed_work(&ptp_priv->extts_logging, __msecs_to_jiffies(100));
+}
+
+static void
+ngptpclock_ptp_extts_logging_cleanup(void)
+{
+    cancel_delayed_work_sync(&(ptp_priv->extts_logging));
+}
+
+static int
+ngptpclock_ptp_init(struct ptp_clock_info *ptp)
+{
+    int ret = -1;
+
+    ret = ngptpclock_cmd_go(NGPTPCLOCK_INIT, NULL, NULL);
+    DBG_VERB(("ptp_init: NGPTPCLOCK_INIT; rv:%d\n", ret));
+    if (ret < 0) goto err_exit;
+    ptp_sleep(1);
+
+err_exit:
+    return ret;
+}
+
+static int
+ngptpclock_ptp_cleanup(struct ptp_clock_info *ptp)
+{
+    int ret = -1;
+
+    ngptpclock_ptp_time_keep_cleanup();
+
+    ret = ngptpclock_cmd_go(NGPTPCLOCK_CLEANUP, NULL, NULL);
+    DBG_VERB(("ptp_cleanup: rv:%d\n", ret));
+
+    return ret;
+}
+
+static int
+ngptpclock_broadsync_cmd(int bs_id)
+{
+    int ret = -1;
+    u64 subcmd, subcmd_data;
+
+    subcmd = (bs_id == 0) ? NGPTPCLOCK_BROADSYNC_BS0_CONFIG : NGPTPCLOCK_BROADSYNC_BS1_CONFIG;
+
+    subcmd_data =  ((ptp_priv->ngptpclock_bs_info[bs_id]).enable & 0x1);
+    subcmd_data |= (((ptp_priv->ngptpclock_bs_info[bs_id]).mode & 0x1) << 8);
+    subcmd_data |= ((ptp_priv->ngptpclock_bs_info[bs_id]).hb << 16);
+    subcmd_data |= (((u64)(ptp_priv->ngptpclock_bs_info[bs_id]).bc) << 32);
+
+    ret = ngptpclock_cmd_go(NGPTPCLOCK_BROADSYNC, &subcmd, &subcmd_data);
+    DBG_VERB(("ngptpclock_broadsync_cmd: subcmd: 0x%llx subcmd_data: 0x%llx; rv:%d\n",
+                subcmd, subcmd_data, ret));
+
+    return ret;
+}
+
+static int
+ngptpclock_broadsync_status_cmd(int bs_id, u64 *status)
+{
+    int ret = -1;
+    u64 subcmd;
+
+    subcmd = (bs_id == 0) ? NGPTPCLOCK_BROADSYNC_BS0_STATUS_GET : NGPTPCLOCK_BROADSYNC_BS1_STATUS_GET;
+
+    ret = ngptpclock_cmd_go(NGPTPCLOCK_BROADSYNC, &subcmd, status);
+    DBG_VERB(("ngptpclock_broadsync_status_cmd: subcmd: 0x%llx subcmd_data: 0x%llx; rv:%d\n",
+                subcmd, *status, ret));
+
+    return ret;
+}
+
+static int
+ngptpclock_gpio_cmd(int gpio_num)
+{
+    int ret = -1;
+    u64 subcmd, subcmd_data;
+
+    switch (gpio_num) {
+        case 0:
+            subcmd = NGPTPCLOCK_GPIO_0;
+            break;
+        case 1:
+            subcmd = NGPTPCLOCK_GPIO_1;
+            break;
+        case 2:
+            subcmd = NGPTPCLOCK_GPIO_2;
+            break;
+        case 3:
+            subcmd = NGPTPCLOCK_GPIO_3;
+            break;
+        case 4:
+            subcmd = NGPTPCLOCK_GPIO_4;
+            break;
+        case 5:
+            subcmd = NGPTPCLOCK_GPIO_5;
+            break;
+        default:
+            return ret;
+    }
+
+    subcmd_data =  ((ptp_priv->ngptpclock_gpio_info[gpio_num]).enable & 0x1);
+    subcmd_data |= (((ptp_priv->ngptpclock_gpio_info[gpio_num]).mode & 0x1) << 8);
+    subcmd_data |= ((u64)((ptp_priv->ngptpclock_gpio_info[gpio_num]).period) << 16);
+
+    ret = ngptpclock_cmd_go(NGPTPCLOCK_GPIO, &subcmd, &subcmd_data);
+    DBG_VERB(("ngptpclock_gpio_cmd: subcmd: 0x%llx subcmd_data: 0x%llx; rv:%d\n",
+                subcmd, subcmd_data, ret));
+
+    return ret;
+}
+
+static int
+ngptpclock_gpio_phaseoffset_cmd(int gpio_num)
+{
+    int ret = -1;
+    u64 subcmd, subcmd_data;
+
+    switch (gpio_num) {
+        case 0:
+            subcmd = NGPTPCLOCK_GPIO_0;
+            break;
+        case 1:
+            subcmd = NGPTPCLOCK_GPIO_1;
+            break;
+        case 2:
+            subcmd = NGPTPCLOCK_GPIO_2;
+            break;
+        case 3:
+            subcmd = NGPTPCLOCK_GPIO_3;
+            break;
+        case 4:
+            subcmd = NGPTPCLOCK_GPIO_4;
+            break;
+        case 5:
+            subcmd = NGPTPCLOCK_GPIO_5;
+            break;
+        default:
+            return ret;
+    }
+
+    subcmd_data = (ptp_priv->ngptpclock_gpio_info[gpio_num]).phase_offset;
+    ret = ngptpclock_cmd_go(NGPTPCLOCK_GPIO_PHASEOFFSET, &subcmd, &subcmd_data);
+    DBG_VERB(("ngptpclock_cmd_go: subcmd: 0x%llx subcmd_data: 0x%llx; rv:%d\n", subcmd, subcmd_data, ret));
+
+    return ret;
+}
+
+static int
+ngptpclock_evlog_cmd(int event, int enable)
+{
+    int ret;
+    int addr_offset;
+    u64 subcmd = 0, subcmd_data = 0;
+    ngptpclock_evlog_t tmp;
+
+    subcmd = event;
+    addr_offset = ((u8 *)&(tmp.event_timestamps[event]) - (u8 *)&(tmp.event_timestamps[0]));
+
+    if (enable) {
+        subcmd_data = (ptp_priv->dma_mem + addr_offset);
+    } else {
+        subcmd_data = 0;
+    }
+
+    ret = ngptpclock_cmd_go(NGPTPCLOCK_EVLOG, &subcmd, &subcmd_data);
+    DBG_VERB(("ngptpclock_evlog_cmd: subcmd: 0x%llx subcmd_data: 0x%llx rv:%d\n",
+                subcmd, subcmd_data, ret));
+
+    return ret;
+}
+
+
+/*
+ * Device Debug Statistics Proc Entry
+ */
+/**
+* This function is called at the beginning of a sequence.
+* ie, when:
+*    - the /proc/linux_ngptpclock/stats file is read (first time)
+*   - after the function stop (end of sequence)
+*
+*/
+static void *ngptpclock_proc_seq_start(struct seq_file *s, loff_t *pos)
+{
+   /* beginning a new sequence ? */
+   if ( (int)*pos == 0 && ptp_priv->shared_addr != NULL)
+   {
+       seq_printf(s, "TwoStep Port Bitmap : %08llx%08llx\n",
+               (uint64_t)(ptp_priv->shared_addr->portmap[1]),
+               (uint64_t)(ptp_priv->shared_addr->portmap[0]));
+        seq_printf(s,"%4s| %9s| %9s| %9s| %9s| %9s| %9s| %9s| %9s| %9s| %9s| %9s\n",
+                "Port", "RxCounter", "TxCounter", "TxOneStep", "TSTimeout",
+                "TSRead", "TSMatch", "TSDiscard",
+                "TimeHi" , "TimeLo", "TimeAvg", "FIFORx");
+   }
+
+   if ((int)*pos < (ptp_priv->num_pports))
+        return (void *)(unsigned long)(*pos + 1);
+   /* End of the sequence, return NULL */
+   return NULL;
+ }
+
+/**
+* This function is called after the beginning of a sequence.
+* It's called untill the return is NULL (this ends the sequence).
+*
+*/
+static void *ngptpclock_proc_seq_next(struct seq_file *s, void *v, loff_t *pos)
+{
+    (*pos)++;
+    return ngptpclock_proc_seq_start(s, pos);
+}
+/**
+* This function is called at the end of a sequence
+*
+*/
+static void
+ngptpclock_proc_seq_stop(struct seq_file *s, void *v)
+{
+    /* nothing to do, we use a static value in ngptpclock_proc_seq_start() */
+}
+
+/**
+* This function is called for each "step" of a sequence
+*
+*/
+static int
+ngptpclock_proc_seq_show(struct seq_file *s, void *v)
+{
+    unsigned long port = (unsigned long)v;
+
+    if ((port > 0) && (port < NGPTPCLOCK_MAX_NUM_PORTS)) {
+        port = port - 1;
+        if (ptp_priv->port_stats[port].pkt_rxctr || ptp_priv->port_stats[port].pkt_txctr ||
+                ptp_priv->port_stats[port].pkt_txonestep||
+                ptp_priv->port_stats[port].tsts_discard ||
+                ptp_priv->port_stats[port].tsts_timeout ||
+                ptp_priv->shared_addr->port_ts_data[port].ts_cnt ||
+                ptp_priv->port_stats[port].tsts_match) {
+            seq_printf(s, "%4lu | %9d| %9d| %9d| %9d| %9d| %9d| %9d| %9lld| %9lld | %9d|%9d | %s\n",
+                    (port + 1),
+                    ptp_priv->port_stats[port].pkt_rxctr,
+                    ptp_priv->port_stats[port].pkt_txctr,
+                    ptp_priv->port_stats[port].pkt_txonestep,
+                    ptp_priv->port_stats[port].tsts_timeout,
+                    ptp_priv->shared_addr->port_ts_data[port].ts_cnt,
+                    ptp_priv->port_stats[port].tsts_match,
+                    ptp_priv->port_stats[port].tsts_discard,
+                    ptp_priv->port_stats[port].tsts_worst_fetch_time,
+                    ptp_priv->port_stats[port].tsts_best_fetch_time,
+                    ptp_priv->port_stats[port].tsts_avg_fetch_time,
+                    ptp_priv->port_stats[port].fifo_rxctr,
+                    ((ptp_priv->port_stats[port].pkt_txctr != ptp_priv->port_stats[port].tsts_match) ?
+                    "***":""));
+        }
+    }
+    return 0;
+}
+
+/**
+* seq_operations for bsync_proc_*** entries
+*
+*/
+static struct seq_operations ngptpclock_proc_seq_ops = {
+    .start = ngptpclock_proc_seq_start,
+    .next  = ngptpclock_proc_seq_next,
+    .stop  = ngptpclock_proc_seq_stop,
+    .show  = ngptpclock_proc_seq_show
+};
+
+static int
+ngptpclock_proc_txts_open(struct inode * inode, struct file * file)
+{
+    return seq_open(file, &ngptpclock_proc_seq_ops);
+}
+
+static ssize_t
+ngptpclock_proc_txts_write(struct file *file, const char *buf,
+                      size_t count, loff_t *loff)
+{
+    char debug_str[40];
+    char *ptr;
+    int port;
+
+    if (copy_from_user(debug_str, buf, count)) {
+        return -EFAULT;
+    }
+
+    if ((ptr = strstr(debug_str, "clear")) != NULL) {
+        for (port = 0; port < ptp_priv->num_pports; port++) {
+            ptp_priv->port_stats[port].pkt_rxctr = 0;
+            ptp_priv->port_stats[port].pkt_txctr = 0;
+            ptp_priv->port_stats[port].pkt_txonestep = 0;
+            ptp_priv->port_stats[port].tsts_timeout = 0;
+            ptp_priv->port_stats[port].tsts_match = 0;
+            ptp_priv->port_stats[port].tsts_discard = 0;
+            if (ptp_priv->shared_addr)
+                ptp_priv->shared_addr->port_ts_data[port].ts_cnt = 0;
+        }
+    } else {
+        DBG_ERR(("Warning: unknown input\n"));
+    }
+
+    return count;
+}
+
+struct proc_ops ngptpclock_proc_txts_file_ops = {
+    PROC_OWNER(THIS_MODULE)
+    .proc_open =       ngptpclock_proc_txts_open,
+    .proc_read =       seq_read,
+    .proc_lseek =      seq_lseek,
+    .proc_write =      ngptpclock_proc_txts_write,
+    .proc_release =    seq_release,
+};
+
+/*
+ * Driver Debug Proc Entry
+ */
+static int
+ngptpclock_proc_debug_show(struct seq_file *m, void *v)
+{
+    seq_printf(m, "Configuration:\n");
+    seq_printf(m, "  debug:          0x%x\n", debug);
+    return 0;
+}
+
+static ssize_t
+ngptpclock_proc_debug_write(struct file *file, const char *buf,
+                      size_t count, loff_t *loff)
+{
+    char debug_str[40];
+    char *ptr;
+
+    if (copy_from_user(debug_str, buf, count)) {
+        return -EFAULT;
+    }
+
+    if ((ptr = strstr(debug_str, "debug=")) != NULL) {
+        ptr += 6;
+        debug = simple_strtol(ptr, NULL, 0);
+    } else {
+        DBG_ERR(("Warning: unknown configuration\n"));
+    }
+
+    return count;
+}
+
+static int
+ngptpclock_proc_debug_open(struct inode * inode, struct file * file)
+{
+    return single_open(file, ngptpclock_proc_debug_show, NULL);
+}
+
+struct proc_ops ngptpclock_proc_debug_file_ops = {
+    PROC_OWNER(THIS_MODULE)
+    .proc_open =       ngptpclock_proc_debug_open,
+    .proc_read =       seq_read,
+    .proc_lseek =      seq_lseek,
+    .proc_write =      ngptpclock_proc_debug_write,
+    .proc_release =    single_release,
+};
+
+static int
+ngptpclock_proc_init(void)
+{
+    struct proc_dir_entry *entry;
+
+    PROC_CREATE(entry, "stats", 0666, ngptpclock_proc_root,
+                &ngptpclock_proc_txts_file_ops);
+    if (entry == NULL) {
+        return -1;
+    }
+    PROC_CREATE(entry, "debug", 0666, ngptpclock_proc_root,
+                &ngptpclock_proc_debug_file_ops);
+    if (entry == NULL) {
+        return -1;
+    }
+    return 0;
+}
+
+static int
+ngptpclock_proc_cleanup(void)
+{
+    remove_proc_entry("stats", ngptpclock_proc_root);
+    remove_proc_entry("debug", ngptpclock_proc_root);
+    return 0;
+}
+
+
+#define ATTRCMP(x) (0 == strcmp(attr->attr.name, #x))
+
+static int rd_iter=0, wr_iter=0;
+static ssize_t
+bs_attr_store(struct kobject *kobj, struct kobj_attribute *attr,
+              const char *buf, size_t bytes)
+{
+    ssize_t ret;
+    u32 enable, mode;
+    u32 bc, hb;
+
+    if (ATTRCMP(bs0)) {
+        ret = sscanf(buf, "enable:%d mode:%d bc:%u hb:%u",
+                     &enable, &mode, &bc, &hb);
+        DBG_VERB(("rd:%d bs0: enable:%d mode:%d bc:%d hb:%d\n",
+                  rd_iter++, enable, mode, bc, hb));
+        ptp_priv->ngptpclock_bs_info[0].enable = enable;
+        ptp_priv->ngptpclock_bs_info[0].mode = mode;
+        ptp_priv->ngptpclock_bs_info[0].bc   = bc;
+        ptp_priv->ngptpclock_bs_info[0].hb   = hb;
+
+        (void)ngptpclock_broadsync_cmd(0);
+    } else if (ATTRCMP(bs1)) {
+        ret = sscanf(buf, "enable:%d mode:%d bc:%u hb:%u",
+                     &enable, &mode, &bc, &hb);
+        DBG_VERB(("rd:%d bs1: enable:%d mode:%d bc:%d hb:%d\n",
+                   rd_iter++, enable, mode, bc, hb));
+        ptp_priv->ngptpclock_bs_info[1].enable = enable;
+        ptp_priv->ngptpclock_bs_info[1].mode = mode;
+        ptp_priv->ngptpclock_bs_info[1].bc   = bc;
+        ptp_priv->ngptpclock_bs_info[1].hb   = hb;
+
+        (void)ngptpclock_broadsync_cmd(1);
+    } else {
+        ret = -ENOENT;
+    }
+
+    return (ret == -ENOENT) ? ret : bytes;
+}
+
+static ssize_t
+bs_attr_show(struct kobject *kobj, struct kobj_attribute *attr,
+             char *buf)
+{
+    ssize_t bytes;
+    u64 status = 0;
+    u32 variance = 0;
+
+    if (ATTRCMP(bs0)) {
+
+        if (ptp_priv->ngptpclock_bs_info[0].enable) {
+            (void)ngptpclock_broadsync_status_cmd(0, &status);
+        }
+
+        variance = (status >> 32);
+        status = (status & 0xFFFFFFFF);
+        bytes = sprintf(buf, "enable:%d mode:%d bc:%u hb:%u status:%u(%u)\n",
+                        ptp_priv->ngptpclock_bs_info[0].enable,
+                        ptp_priv->ngptpclock_bs_info[0].mode,
+                        ptp_priv->ngptpclock_bs_info[0].bc,
+                        ptp_priv->ngptpclock_bs_info[0].hb,
+                        (u32)status,
+                        variance);
+        DBG_VERB(("wr:%d bs0: enable:%d mode:%d bc:%u hb:%u status:%u(%u)\n",
+                        wr_iter++,
+                        ptp_priv->ngptpclock_bs_info[0].enable,
+                        ptp_priv->ngptpclock_bs_info[0].mode,
+                        ptp_priv->ngptpclock_bs_info[0].bc,
+                        ptp_priv->ngptpclock_bs_info[0].hb,
+                        (u32)status,
+                        variance));
+    } else if (ATTRCMP(bs1)) {
+
+        if (ptp_priv->ngptpclock_bs_info[1].enable) {
+            (void)ngptpclock_broadsync_status_cmd(1, &status);
+        }
+
+        variance = (status >> 32);
+        status = (status & 0xFFFFFFFF);
+        bytes = sprintf(buf, "enable:%d mode:%d bc:%u hb:%u status:%u(%u)\n",
+                        ptp_priv->ngptpclock_bs_info[1].enable,
+                        ptp_priv->ngptpclock_bs_info[1].mode,
+                        ptp_priv->ngptpclock_bs_info[1].bc,
+                        ptp_priv->ngptpclock_bs_info[1].hb,
+                        (u32)status,
+                        variance);
+        DBG_VERB(("wr:%d bs1: enable:%d mode:%d bc:%u hb:%u status:%u(%u)\n",
+                        wr_iter++,
+                        ptp_priv->ngptpclock_bs_info[1].enable,
+                        ptp_priv->ngptpclock_bs_info[1].mode,
+                        ptp_priv->ngptpclock_bs_info[1].bc,
+                        ptp_priv->ngptpclock_bs_info[1].hb,
+                        (u32)status,
+                        variance));
+    } else {
+        bytes = -ENOENT;
+    }
+
+    return bytes;
+}
+
+#define BS_ATTR(x)                         \
+    static struct kobj_attribute x##_attribute =        \
+        __ATTR(x, 0664, bs_attr_show, bs_attr_store);
+
+BS_ATTR(bs0)
+BS_ATTR(bs1)
+
+#define BS_ATTR_LIST(x)    & x ## _attribute.attr
+static struct attribute *bs_attrs[] = {
+    BS_ATTR_LIST(bs0),
+    BS_ATTR_LIST(bs1),
+    NULL,       /* terminator */
+};
+
+static struct attribute_group bs_attr_group = {
+    .name   = "broadsync",
+    .attrs  = bs_attrs,
+};
+
+
+static int gpio_rd_iter=0, gpio_wr_iter=0;
+static ssize_t
+gpio_attr_store(struct kobject *kobj, struct kobj_attribute *attr,
+                const char *buf, size_t bytes)
+{
+    ssize_t ret;
+    int gpio;
+    u32 enable, mode;
+    u32 period;
+    int64_t phase_offset;
+
+    if (ATTRCMP(gpio0)) {
+        gpio = 0;
+    } else if (ATTRCMP(gpio1)) {
+        gpio = 1;
+    } else if (ATTRCMP(gpio2)) {
+        gpio = 2;
+    } else if (ATTRCMP(gpio3)) {
+        gpio = 3;
+    } else if (ATTRCMP(gpio4)) {
+        gpio = 4;
+    } else if (ATTRCMP(gpio5)) {
+        gpio = 5;
+    } else {
+        return -ENOENT;
+    }
+
+
+    ret = sscanf(buf, "enable:%d mode:%d period:%u phaseoffset:%lld",
+                       &enable, &mode, &period, &phase_offset);
+    DBG_VERB(("rd:%d gpio%d: enable:%d mode:%d period:%d phaseoffset:%lld\n",
+               gpio_rd_iter++, gpio, enable, mode, period, phase_offset));
+    ptp_priv->ngptpclock_gpio_info[gpio].enable = enable;
+    ptp_priv->ngptpclock_gpio_info[gpio].mode = mode;
+    ptp_priv->ngptpclock_gpio_info[gpio].period = period;
+
+    if (phase_offset != ptp_priv->ngptpclock_gpio_info[gpio].phase_offset) {
+        ptp_priv->ngptpclock_gpio_info[gpio].phase_offset = phase_offset;
+        (void)ngptpclock_gpio_phaseoffset_cmd(gpio);
+    }
+
+    (void)ngptpclock_gpio_cmd(gpio);
+
+    return (ret == -ENOENT) ? ret : bytes;
+}
+
+static ssize_t
+gpio_attr_show(struct kobject *kobj, struct kobj_attribute *attr,
+               char *buf)
+{
+    ssize_t bytes;
+    int gpio;
+
+    if (ATTRCMP(gpio0)) {
+        gpio = 0;
+    } else if (ATTRCMP(gpio1)) {
+        gpio = 1;
+    } else if (ATTRCMP(gpio2)) {
+        gpio = 2;
+    } else if (ATTRCMP(gpio3)) {
+        gpio = 3;
+    } else if (ATTRCMP(gpio4)) {
+        gpio = 4;
+    } else if (ATTRCMP(gpio5)) {
+        gpio = 5;
+    } else {
+        return -ENOENT;
+    }
+
+    bytes = sprintf(buf, "enable:%d mode:%d period:%u phaseoffset:%lld\n",
+                    ptp_priv->ngptpclock_gpio_info[gpio].enable,
+                    ptp_priv->ngptpclock_gpio_info[gpio].mode,
+                    ptp_priv->ngptpclock_gpio_info[gpio].period,
+                    ptp_priv->ngptpclock_gpio_info[gpio].phase_offset);
+    DBG_VERB(("wr:%d gpio%d: enable:%d mode:%d period:%u phaseoffset:%lld\n",
+                    gpio_wr_iter++, gpio,
+                    ptp_priv->ngptpclock_gpio_info[gpio].enable,
+                    ptp_priv->ngptpclock_gpio_info[gpio].mode,
+                    ptp_priv->ngptpclock_gpio_info[gpio].period,
+                    ptp_priv->ngptpclock_gpio_info[gpio].phase_offset));
+
+    return bytes;
+}
+
+#define GPIO_ATTR(x)                         \
+    static struct kobj_attribute x##_attribute =        \
+        __ATTR(x, 0664, gpio_attr_show, gpio_attr_store);
+
+GPIO_ATTR(gpio0)
+GPIO_ATTR(gpio1)
+GPIO_ATTR(gpio2)
+GPIO_ATTR(gpio3)
+GPIO_ATTR(gpio4)
+GPIO_ATTR(gpio5)
+
+#define GPIO_ATTR_LIST(x)    & x ## _attribute.attr
+static struct attribute *gpio_attrs[] = {
+    GPIO_ATTR_LIST(gpio0),
+    GPIO_ATTR_LIST(gpio1),
+    GPIO_ATTR_LIST(gpio2),
+    GPIO_ATTR_LIST(gpio3),
+    GPIO_ATTR_LIST(gpio4),
+    GPIO_ATTR_LIST(gpio5),
+    NULL,       /* terminator */
+};
+
+static struct attribute_group gpio_attr_group = {
+    .name   = "gpio",
+    .attrs  = gpio_attrs,
+};
+
+
+
+static ssize_t
+evlog_attr_store(struct kobject *kobj, struct kobj_attribute *attr,
+                 const char *buf, size_t bytes)
+{
+    ssize_t ret;
+    int event, enable;
+
+    if (ATTRCMP(cpu)) {
+        event = 0;
+    } else if (ATTRCMP(bs0)) {
+        event = 1;
+    } else if (ATTRCMP(bs1)) {
+        event = 2;
+    } else if (ATTRCMP(gpio0)) {
+        event = 3;
+    } else if (ATTRCMP(gpio1)) {
+        event = 4;
+    } else if (ATTRCMP(gpio2)) {
+        event = 5;
+    } else if (ATTRCMP(gpio3)) {
+        event = 6;
+    } else if (ATTRCMP(gpio4)) {
+        event = 7;
+    } else if (ATTRCMP(gpio5)) {
+        event = 8;
+    } else {
+        return -ENOENT;
+    }
+
+
+    ret = sscanf(buf, "enable:%d", &enable);
+    DBG_VERB(("event:%d: enable:%d\n", event, enable));
+
+    (void)ngptpclock_evlog_cmd(event, enable);
+    ptp_priv->ngptpclock_evlog_info[event].enable = enable;
+
+    return (ret == -ENOENT) ? ret : bytes;
+}
+
+static ssize_t
+evlog_attr_show(struct kobject *kobj, struct kobj_attribute *attr,
+                char *buf)
+{
+    ssize_t bytes;
+    int event;
+
+    if (ATTRCMP(cpu)) {
+        event = 0;
+    } else if (ATTRCMP(bs0)) {
+        event = 1;
+    } else if (ATTRCMP(bs1)) {
+        event = 2;
+    } else if (ATTRCMP(gpio0)) {
+        event = 3;
+    } else if (ATTRCMP(gpio1)) {
+        event = 4;
+    } else if (ATTRCMP(gpio2)) {
+        event = 5;
+    } else if (ATTRCMP(gpio3)) {
+        event = 6;
+    } else if (ATTRCMP(gpio4)) {
+        event = 7;
+    } else if (ATTRCMP(gpio5)) {
+        event = 8;
+    } else {
+        return -ENOENT;
+    }
+
+
+    bytes = sprintf(buf, "enable:%d Previous Time:%llu.%09u Latest Time:%llu.%09u\n",
+                    ptp_priv->ngptpclock_evlog_info[event].enable,
+                    ptp_priv->evlog->event_timestamps[event].prv_tstamp.sec,
+                    ptp_priv->evlog->event_timestamps[event].prv_tstamp.nsec,
+                    ptp_priv->evlog->event_timestamps[event].cur_tstamp.sec,
+                    ptp_priv->evlog->event_timestamps[event].cur_tstamp.nsec);
+    DBG_VERB(("event%d: enable:%d Previous Time:%llu.%09u Latest Time:%llu.%09u\n",
+                    event,
+                    ptp_priv->ngptpclock_evlog_info[event].enable,
+                    ptp_priv->evlog->event_timestamps[event].prv_tstamp.sec,
+                    ptp_priv->evlog->event_timestamps[event].prv_tstamp.nsec,
+                    ptp_priv->evlog->event_timestamps[event].cur_tstamp.sec,
+                    ptp_priv->evlog->event_timestamps[event].cur_tstamp.nsec));
+
+    memset((void *)&(ptp_priv->evlog->event_timestamps[event]), 0,
+            sizeof(ptp_priv->evlog->event_timestamps[event]));
+
+    return bytes;
+}
+
+#define EVLOG_ATTR(x)                         \
+    static struct kobj_attribute evlog_ ## x ##_attribute =        \
+        __ATTR(x, 0664, evlog_attr_show, evlog_attr_store);
+
+EVLOG_ATTR(bs0)
+EVLOG_ATTR(bs1)
+EVLOG_ATTR(gpio0)
+EVLOG_ATTR(gpio1)
+EVLOG_ATTR(gpio2)
+EVLOG_ATTR(gpio3)
+EVLOG_ATTR(gpio4)
+EVLOG_ATTR(gpio5)
+
+#define EVLOG_ATTR_LIST(x)    & evlog_ ## x ## _attribute.attr
+static struct attribute *evlog_attrs[] = {
+    EVLOG_ATTR_LIST(bs0),
+    EVLOG_ATTR_LIST(bs1),
+    EVLOG_ATTR_LIST(gpio0),
+    EVLOG_ATTR_LIST(gpio1),
+    EVLOG_ATTR_LIST(gpio2),
+    EVLOG_ATTR_LIST(gpio3),
+    EVLOG_ATTR_LIST(gpio4),
+    EVLOG_ATTR_LIST(gpio5),
+    NULL,       /* terminator */
+};
+
+static struct attribute_group evlog_attr_group = {
+    .name   = "evlog",
+    .attrs  = evlog_attrs,
+};
+
+static int
+ngptpclock_sysfs_init(void)
+{
+    int ret = 0;
+    struct kobject *parent;
+    struct kobject *root = &((((struct module *)(THIS_MODULE))->mkobj).kobj);
+
+    parent = root;
+    ptp_priv->kobj = kobject_create_and_add("io", parent);
+
+    ret = sysfs_create_group(ptp_priv->kobj, &bs_attr_group);
+
+    ret = sysfs_create_group(ptp_priv->kobj, &gpio_attr_group);
+
+    ret = sysfs_create_group(ptp_priv->kobj, &evlog_attr_group);
+
+    return ret;
+}
+
+static int
+ngptpclock_sysfs_cleanup(void)
+{
+    int ret = 0;
+    struct kobject *parent;
+
+    parent = ptp_priv->kobj;
+
+    sysfs_remove_group(parent, &bs_attr_group);
+    sysfs_remove_group(parent, &gpio_attr_group);
+    sysfs_remove_group(parent, &evlog_attr_group);
+
+    kobject_put(ptp_priv->kobj);
+
+
+    return ret;
+}
+
+
+static void
+ngptpclock_ptp_fw_data_alloc(int dev_no)
+{
+    dma_addr_t dma_mem = 0;
+
+    /* Initialize the Base address for CMIC and shared Memory access */
+    ptp_priv->base_addr = ngbde_kapi_pio_membase(dev_no);
+    ptp_priv->dma_dev = ngbde_kapi_dma_dev_get(dev_no);
+
+    ptp_priv->dma_mem_size = sizeof(ngptpclock_evlog_t); /*sizeof(ngptpclock_evlog_t);*/
+
+    if (ptp_priv->evlog == NULL) {
+        DBG_ERR(("Allocate memory for event log\n"));
+        ptp_priv->evlog = DMA_ALLOC_COHERENT(ptp_priv->dma_dev,
+                                                   ptp_priv->dma_mem_size,
+                                                   &dma_mem);
+    }
+
+    if (ptp_priv->evlog != NULL) {
+        /* Reset memory */
+        memset((void *)ptp_priv->evlog, 0, ptp_priv->dma_mem_size);
+
+        ptp_priv->dma_mem = dma_mem;
+        DBG_ERR(("Shared memory allocation (%d bytes) for event log successful at 0x%016lx.\n",
+                ptp_priv->dma_mem_size, (long unsigned int)ptp_priv->dma_mem));
+    }
+
+    ptp_priv->extts_log = NULL;
+    ptp_priv->extts_event.head = -1;
+    return;
+}
+
+static void
+ngptpclock_ptp_fw_data_free(void)
+{
+    if (ptp_priv->evlog != NULL) {
+        DBG_ERR(("Free shared memory : extts log of %d bytes\n",
+                 ptp_priv->dma_mem_size));
+        DMA_FREE_COHERENT(ptp_priv->dma_dev, ptp_priv->dma_mem_size,
+                              (void *)ptp_priv->evlog, ptp_priv->dma_mem);
+        ptp_priv->evlog = NULL;
+    }
+
+    return;
+}
+
+static void
+ngptpclock_ptp_dma_init(int dcb_type, int dev_no)
+{
+    int endianess;
+    int num_pports = 256;
+    int mem_size = 16384; /*sizeof(ngptpclock_info_t);*/
+
+
+    ptp_priv->num_pports = num_pports;
+    ptp_priv->dcb_type = dcb_type;
+
+    ngptpclock_ptp_fw_data_alloc(dev_no);
+    if (ptp_priv->shared_addr == NULL) {
+        ptp_priv->shared_addr = kzalloc(16384, GFP_KERNEL);
+        ptp_priv->port_stats = kzalloc((sizeof(ngptpclock_port_stats_t) * num_pports), GFP_KERNEL);
+    }
+
+    if (ptp_priv->shared_addr != NULL) {
+        /* Reset memory. */
+        memset((void *)ptp_priv->shared_addr, 0, mem_size);
+
+#ifdef __LITTLE_ENDIAN
+        endianess = 0;
+#else
+        endianess = 1;
+#endif
+        DEV_WRITE32(ptp_priv, CMIC_CMC_SCHAN_MESSAGE_14r(CMIC_CMC_BASE),
+                ((pci_cos << 16) | endianess));
+
+        DEV_WRITE32(ptp_priv, CMIC_CMC_SCHAN_MESSAGE_15r(CMIC_CMC_BASE), 1);
+        DEV_WRITE32(ptp_priv, CMIC_CMC_SCHAN_MESSAGE_16r(CMIC_CMC_BASE), 1);
+
+    }
+
+
+    DBG_VERB(("%s %p:%p, dcb_type: %d\n", __FUNCTION__, ptp_priv->base_addr,
+                (void *)ptp_priv->shared_addr, dcb_type));
+
+    ptp_priv->mirror_encap_bmp = 0x0;
+
+    hostcmd_regs[0] = CMIC_CMC_SCHAN_MESSAGE_21r(CMIC_CMC_BASE);
+    hostcmd_regs[1] = CMIC_CMC_SCHAN_MESSAGE_20r(CMIC_CMC_BASE);
+    hostcmd_regs[2] = CMIC_CMC_SCHAN_MESSAGE_19r(CMIC_CMC_BASE);
+    hostcmd_regs[3] = CMIC_CMC_SCHAN_MESSAGE_18r(CMIC_CMC_BASE);
+    hostcmd_regs[4] = CMIC_CMC_SCHAN_MESSAGE_17r(CMIC_CMC_BASE);
+
+    return;
+}
+
+
+/**
+ * ngptpclock_ioctl_cmd_handler
+ * @dev_info: Device information
+ * @cmd: sub command
+ * @data: sub command data
+ * @len: Sub command length
+ * Description: This function will handle ioctl commands from user mode.
+ */
+static int
+ngptpclock_ioctl_cmd_handler(ngknet_dev_info_t *dev_info, int cmd, char *data, int len)
+{
+    u32 fw_status;
+    int32_t *cfg_data  = (int32_t *)data;
+
+    if (!module_initialized && cmd != NGPTPCLOCK_HW_INIT) {
+        return SHR_E_CONFIG;
+    }
+
+    switch (cmd) {
+        case NGPTPCLOCK_HW_INIT:
+            pci_cos = cfg_data[0];
+            fw_core = cfg_data[1];
+            DBG_VERB(("Configuring pci_cosq:%d dev_no:%d fw_core:%d\n",
+                        pci_cos, dev_info->dev_no, fw_core));
+            if ((CMICX_DEV_TYPE && (fw_core >= 0 && fw_core <= 3)) ||
+                (fw_core == 0 || fw_core == 1)) {
+                memcpy(ieee1588_l2pkt_md, &cfg_data[12], sizeof(ieee1588_l2pkt_md));
+                memcpy(ieee1588_ipv4pkt_md, &cfg_data[36], sizeof(ieee1588_ipv4pkt_md));
+                memcpy(ieee1588_ipv6pkt_md, &cfg_data[60], sizeof(ieee1588_ipv6pkt_md));
+
+                /* FIXME : SDKLT-38745
+                 * Device dcb_type, currently set to 1.
+                 */
+                ngptpclock_ptp_dma_init(1, dev_info->dev_no);
+
+                fw_status = 0;
+                DEV_READ32(ptp_priv, CMIC_CMC_SCHAN_MESSAGE_21r(CMIC_CMC_BASE), &fw_status);
+
+                /* Return success if the app is already initialized. */
+                if (module_initialized) {
+                    return SHR_E_NONE;
+                }
+
+                /* Return error if the app is not ready yet. */
+                if (fw_status != 0xBADC0DE1) {
+                    return SHR_E_RESOURCE;
+                }
+
+                (ptp_priv->ngptpclock_init_info).uc_port_num = cfg_data[2];
+                (ptp_priv->ngptpclock_init_info).uc_port_sysport = cfg_data[3];
+                (ptp_priv->ngptpclock_init_info).host_cpu_port = cfg_data[4];
+                (ptp_priv->ngptpclock_init_info).host_cpu_sysport = cfg_data[5];
+                (ptp_priv->ngptpclock_init_info).udh_len = cfg_data[6];
+
+                DBG_VERB(("fw_core:%d uc_port:%d uc_sysport:%d pci_port:%d pci_sysport:%d\n",
+                        fw_core,
+                        (ptp_priv->ngptpclock_init_info).uc_port_num,
+                        (ptp_priv->ngptpclock_init_info).uc_port_sysport,
+                        (ptp_priv->ngptpclock_init_info).host_cpu_port,
+                        (ptp_priv->ngptpclock_init_info).host_cpu_sysport));
+
+                if (ngptpclock_ptp_init(&(ptp_priv->ptp_caps)) >= 0) {
+                    module_initialized = 1;
+                }
+            }
+            break;
+        case NGPTPCLOCK_HW_CLEANUP:
+            module_initialized = 0;
+
+            DEV_WRITE32(ptp_priv, CMIC_CMC_SCHAN_MESSAGE_15r(CMIC_CMC_BASE), 0);
+            DEV_WRITE32(ptp_priv, CMIC_CMC_SCHAN_MESSAGE_16r(CMIC_CMC_BASE), 0);
+
+            ngptpclock_ptp_cleanup(&(ptp_priv->ptp_caps));
+            break;
+#if defined(HW_TS_DISABLE)
+        case NGPTPCLOCK_M_HW_TS_DISABLE:
+            ngptpclock_ptp_hw_tx_tstamp_config(NULL, NULL, 0);
+            break;
+#endif
+#if defined(MIRROR_ENCAP_SUPPORT)
+        case NGPTPCLOCK_M_MTP_TS_UPDATE_ENABLE:
+            ngptpclock_ptp_mirror_encap_update(0, kmsg->clock_info.data[0], TRUE);
+            break;
+        case NGPTPCLOCK_M_MTP_TS_UPDATE_DISABLE:
+            ngptpclock_ptp_mirror_encap_update(0, kmsg->clock_info.data[0], FALSE);
+            break;
+#endif
+        default:
+            return SHR_E_NOT_FOUND;
+    }
+
+    return SHR_E_NONE;
+}
+
+/**
+ * ngptpclock_ptp_register
+ * @priv: driver private structure
+ * Description: this function will register the ptp clock driver
+ * to kernel. It also does some house keeping work.
+ */
+static int
+ngptpclock_ptp_register(void)
+{
+    int err = -ENODEV;
+
+    if (CMICX_DEV_TYPE) {
+        if (fw_core < 0 || fw_core > 3) {
+            goto exit;
+        }
+    } else if (fw_core < 0 || fw_core > 1) {
+        /* Support on core-0 or core-1 */
+        goto exit;
+    }
+
+    /* default transport is raw, ieee 802.3 */
+    switch (network_transport) {
+        case 2: /* IEEE 802.3 */
+        case 4: /* UDP IPv4   */
+        case 6: /* UDP IPv6   */
+            break;
+        default:
+            network_transport = 0;
+    }
+
+    ptp_priv = kzalloc(sizeof(*ptp_priv), GFP_KERNEL);
+    if (!ptp_priv) {
+        err = -ENOMEM;
+        goto exit;
+    }
+
+    /* Reset memory */
+    memset(ptp_priv, 0, sizeof(*ptp_priv));
+
+    err = -ENODEV;
+
+    ptp_priv->ptp_caps = ngptpclock_ptp_caps;
+
+    mutex_init(&(ptp_priv->ptp_lock));
+
+    /* Register ptp clock driver with ngptpclock_ptp_caps */
+    ptp_priv->ptp_clock = ptp_clock_register(&ptp_priv->ptp_caps, NULL);
+
+    if (IS_ERR(ptp_priv->ptp_clock)) {
+        ptp_priv->ptp_clock = NULL;
+    } else if (ptp_priv->ptp_clock) {
+        err = 0;
+
+        /* Register NGKNET HW Timestamp Callback Functions */
+        ngknet_ptp_dev_ctrl_cb_register(ngptpclock_ioctl_cmd_handler);
+        ngknet_ptp_tx_config_set_cb_register(ngptpclock_ptp_hw_tx_tstamp_config);
+        ngknet_ptp_phc_index_get_cb_register(ngptpclock_ptp_hw_tstamp_ptp_clock_index_get);
+        ngknet_ptp_rx_config_set_cb_register(ngptpclock_ptp_hw_rx_tstamp_config);
+        ngknet_ptp_tx_meta_set_cb_register(ngptpclock_ptp_hw_tstamp_tx_meta_set);
+        ngknet_ptp_tx_hwts_get_cb_register(ngptpclock_ptp_hw_tstamp_tx_time_get);
+        ngknet_ptp_rx_hwts_get_cb_register(ngptpclock_ptp_hw_tstamp_rx_time_upscale);
+        ngknet_ptp_rx_pre_process_cb_register(ngptpclock_ptp_hw_rx_pre_process);
+    }
+
+     /* Initialize proc files */
+     ngptpclock_proc_root = proc_mkdir(NGPTPCLOCK_MODULE_NAME, NULL);;
+     ngptpclock_proc_init();
+     ngptpclock_sysfs_init();
+     ptp_priv->shared_addr = NULL;
+     ptp_priv->port_stats = NULL;
+
+     ngptpclock_ptp_extts_logging_init();
+exit:
+    return err;
+}
+
+static int
+ngptpclock_ptp_remove(void)
+{
+    if (!ptp_priv)
+        return 0;
+
+    module_initialized = 0;
+
+    ngptpclock_ptp_extts_logging_cleanup();
+
+    ngptpclock_ptp_time_keep_cleanup();
+
+    ngptpclock_proc_cleanup();
+    ngptpclock_sysfs_cleanup();
+    remove_proc_entry(NGPTPCLOCK_MODULE_NAME, NULL);
+
+    /* UnRegister NGKNET HW Timestamp Callback Functions */
+    ngknet_ptp_dev_ctrl_cb_unregister(ngptpclock_ioctl_cmd_handler);
+    ngknet_ptp_tx_config_set_cb_unregister(ngptpclock_ptp_hw_tx_tstamp_config);
+    ngknet_ptp_phc_index_get_cb_unregister(ngptpclock_ptp_hw_tstamp_ptp_clock_index_get);
+    ngknet_ptp_rx_config_set_cb_unregister(ngptpclock_ptp_hw_rx_tstamp_config);
+    ngknet_ptp_tx_meta_set_cb_unregister(ngptpclock_ptp_hw_tstamp_tx_meta_set);
+    ngknet_ptp_tx_hwts_get_cb_register(ngptpclock_ptp_hw_tstamp_tx_time_get);
+    ngknet_ptp_rx_hwts_get_cb_unregister(ngptpclock_ptp_hw_tstamp_rx_time_upscale);
+    ngknet_ptp_rx_pre_process_cb_unregister(ngptpclock_ptp_hw_rx_pre_process);
+
+    /* Cleanup the PTP */
+    ngptpclock_ptp_cleanup(&(ptp_priv->ptp_caps));
+
+    ngptpclock_ptp_fw_data_free();
+
+    if (ptp_priv->port_stats != NULL) {
+        kfree((void *)ptp_priv->port_stats);
+        ptp_priv->port_stats = NULL;
+    }
+    if (ptp_priv->shared_addr != NULL) {
+        kfree((void *)ptp_priv->shared_addr);
+        ptp_priv->shared_addr = NULL;
+        DBG_ERR(("Free R5 memory\n"));
+    }
+
+    /* Unregister the bcm ptp clock driver */
+    ptp_clock_unregister(ptp_priv->ptp_clock);
+
+    /* Free Memory */
+    kfree(ptp_priv);
+
+    return 0;
+}
+#endif /* NGPTPCLOCK_SUPPORT */
+
+/*
+ * Function: ngptpclock_init_module
+ *
+ * Purpose:
+ *    Module initialization.
+ *    Attached SOC all devices and optionally initializes these.
+ * Parameters:
+ *    None
+ * Returns:
+ *    0 on success, otherwise -1
+ */
+static int __init
+ngptpclock_init_module(void)
+{
+#ifdef NGPTPCLOCK_SUPPORT
+    ngptpclock_ptp_register();
+    return 0;
+#else
+    printk(KERN_WARNING "%s: PTP not supported by this kernel.\n",
+           NGPTPCLOCK_MODULE_NAME);
+    return -ENOSYS;
+#endif /* NGPTPCLOCK_SUPPORT */
+}
+
+/*
+ * Function: ngptpclock_exit_module
+ *
+ * Purpose:
+ *    Module cleanup function
+ * Parameters:
+ *    None
+ * Returns:
+ *    Always 0
+ */
+static void __exit
+ngptpclock_exit_module(void)
+{
+#ifdef NGPTPCLOCK_SUPPORT
+    ngptpclock_ptp_remove();
+#endif /* NGPTPCLOCK_SUPPORT */
+}
+
+module_init(ngptpclock_init_module);
+module_exit(ngptpclock_exit_module);
diff --git a/platform/broadcom/saibcm-modules/sdklt/make/kpmd.mk b/platform/broadcom/saibcm-modules/sdklt/make/kpmd.mk
index cc89a930e037..b7bb1da60cd0 100644
--- a/platform/broadcom/saibcm-modules/sdklt/make/kpmd.mk
+++ b/platform/broadcom/saibcm-modules/sdklt/make/kpmd.mk
@@ -14,9 +14,28 @@
 # A copy of the GNU General Public License version 2 (GPLv2) can
 # be found in the LICENSES folder.
 #
-# Helper makefile for building stand-alone PMD kernel module
+# Helper makefile for building Linux kernel module that depends on the
+# SDK Packet Meta Data (PMD) library.
+#
+# The makefile provides a make target named 'kpmd', which the main
+# kernel module makefile should depend on.
+#
+# The 'kpmd' make target will create symbolic links from the relevant
+# SDK source files into the module source directory, which must be
+# specified via either one of $(KMODDIR) or $(GENDIR).
+#
+# The 'kpmd' make target also exports two make variables, of which
+# $(SDK_PMD_KFLAGS) should be added to the kernel module build flags,
+# and $(SDK_PMD_KOBJS) should be added to the list of kernel module
+# object files.
+#
+# For example usage, please refer to $SDK/linux/bcmgenl/Makefile.
 #
 
+ifndef SDK
+$(error The $$SDK environment variable is not set)
+endif
+
 # SDK make utilities
 include $(SDK)/make/makeutils.mk
 
@@ -126,17 +145,6 @@ VARIANT_DIRS := $(foreach K, $(filter $(VAR_CHIPS),$(PMD_CHIPS)),\
 	$(wildcard $(BCMPKTDIR)/xfcr/$(K)/* -type d))
 endif # SDK_CHIPS
 
-ifdef SDK_CHIPS
-KNETCB_CPPFLAGS := -DKPMD $(SDK_CPPFLAGS)
-endif
-
-ifdef SDK_VARIANTS
-override KNETCB_CPPFLAGS := -DKPMD $(SDK_CPPFLAGS)
-endif
-
-KNETCB_CPPFLAGS += -DKPMD
-export KNETCB_CPPFLAGS
-
 PMD_FLEX_CHIPS := $(filter $(PMD_CHIPS),$(sort $(foreach D, $(VARIANT_DIRS), \
 	$(lastword $(filter-out $(lastword $(subst /, ,$D)),$(subst /, ,$D))))))
 
@@ -162,7 +170,7 @@ endif
 
 CHIP_OBJS ?= $(patsubst %.c, %.o, $(CHIP_SRCS))
 
-SDK_PMD_KFLAGS := -DSAL_LINUX \
+SDK_PMD_KFLAGS := -DSAL_LINUX -DKPMD $(SDK_CPPFLAGS) \
 		  -I$(SDK)/sal/include \
 		  -I$(SDK)/bcmltd/include \
 		  -I$(SDK)/bcmlrd/include \
diff --git a/platform/broadcom/saibcm-modules/systems/bde/linux/include/linux-bde.h b/platform/broadcom/saibcm-modules/systems/bde/linux/include/linux-bde.h
index e9d769869f96..856c8edbb1ef 100644
--- a/platform/broadcom/saibcm-modules/systems/bde/linux/include/linux-bde.h
+++ b/platform/broadcom/saibcm-modules/systems/bde/linux/include/linux-bde.h
@@ -165,6 +165,11 @@ typedef struct linux_bde_bus_s {
  * BDE_DEV_INST_ID_INVALID : The invalid instance identifier.
  */
 #define BDE_DEV_INST_ID_INVALID    ((uint32)-1)
+#define BDE_DEV_INST_ID_CURRENT    ((uint32)-2)
+#define BDE_DEV_INST_ID_GET_FREE   ((uint32)-3)
+
+extern int get_instance_dma_size(unsigned int instance_num, unsigned int *size);
+extern int dma_get_usage(void);
 
 extern int linux_bde_create(linux_bde_bus_t* bus, ibde_t** bde);
 extern int linux_bde_destroy(ibde_t* bde);
@@ -198,6 +203,7 @@ extern uint32 lkbde_get_dev_phys_hi(int d);
 #ifdef BDE_EDK_SUPPORT
 extern int lkbde_edk_get_dma_info(int dev_id, phys_addr_t* cpu_pbase,
                                   phys_addr_t* dma_pbase, ssize_t* size);
+extern void * lkbde_edk_dmamem_map_p2v(phys_addr_t paddr);
 #endif
 
 /*
diff --git a/platform/broadcom/saibcm-modules/systems/bde/linux/kernel/linux-kernel-bde.c b/platform/broadcom/saibcm-modules/systems/bde/linux/kernel/linux-kernel-bde.c
index 1a7786b1f89b..757eb1a5a525 100644
--- a/platform/broadcom/saibcm-modules/systems/bde/linux/kernel/linux-kernel-bde.c
+++ b/platform/broadcom/saibcm-modules/systems/bde/linux/kernel/linux-kernel-bde.c
@@ -571,6 +571,7 @@ _bde_add_device(void)
     int add_switch_device = 0;
     if (_ndevices >= LINUX_BDE_MAX_DEVICES) {
         gprintk("Error: added too many devices\n");
+        return;
     }
     if (_devices[_ndevices].dev_type & BDE_SWITCH_DEV_TYPE) {
         _switch_ndevices++;
@@ -696,6 +697,11 @@ extern struct resource *
 iproc_platform_get_resource(struct platform_device *dev, unsigned int type,
                             unsigned int num);
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0))
+extern int
+iproc_platform_get_irq(struct platform_device *dev, unsigned int num);
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0)) */
+
 #define IPROC_CHIPCOMMONA_BASE  0x18000000
 #define IPROC_CMICD_BASE        0x48000000
 #define IPROC_CMICD_SIZE        0x40000
@@ -709,7 +715,13 @@ iproc_cmicd_probe(struct platform_device *pldev)
 {
     bde_ctrl_t *ctrl;
     uint32 size, dev_rev_id;
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0))
+    struct resource *memres;
+    int irq;
+#else
     struct resource *memres, *irqres;
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0)) */
+
 #ifdef CONFIG_OF
     if (debug >= 1) {
         gprintk("iproc_cmicd_probe %s\n", pldev->dev.of_node ? "with device node":"");
@@ -799,10 +811,17 @@ iproc_cmicd_probe(struct platform_device *pldev)
         int i;
         memset(iproc_cmicx_irqs, 0, IHOST_CMICX_MAX_INTRS*sizeof(uint32_t));
         for (i = 0; i < IHOST_CMICX_MAX_INTRS; i++) {
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0))
+            irq = iproc_platform_get_irq(pldev, i);
+            if (irq >= 0) {
+                iproc_cmicx_irqs[i] = irq;
+            }
+#else
             irqres = iproc_platform_get_resource(pldev, IORESOURCE_IRQ, i);
             if (irqres) {
                 iproc_cmicx_irqs[i] = irqres->start;
             }
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0)) */
             if (debug >= 1) {
                 gprintk("iproc_cmicx_irqs[%d] = %d\n", i, iproc_cmicx_irqs[i]);
             }
@@ -811,8 +830,13 @@ iproc_cmicd_probe(struct platform_device *pldev)
     } else
 #endif
     {
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0))
+        irq = iproc_platform_get_irq(pldev, 0);
+        ctrl->iLine = irq;
+#else
         irqres = iproc_platform_get_resource(pldev, IORESOURCE_IRQ, 0);
         ctrl->iLine = irqres->start;
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0)) */
     }
 
     ctrl->isr = NULL;
@@ -1418,12 +1442,6 @@ static const struct pci_device_id _id_table[] = {
     { BROADCOM_VENDOR_ID, BCM56975_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM56168_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM56169_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
-    { BROADCOM_VENDOR_ID, BCM56560_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
-    { BROADCOM_VENDOR_ID, BCM56561_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
-    { BROADCOM_VENDOR_ID, BCM56562_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
-    { BROADCOM_VENDOR_ID, BCM56565_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
-    { BROADCOM_VENDOR_ID, BCM56566_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
-    { BROADCOM_VENDOR_ID, BCM56567_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM56670_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM56671_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM56672_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
@@ -1432,17 +1450,8 @@ static const struct pci_device_id _id_table[] = {
     { BROADCOM_VENDOR_ID, BCM53651_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM53652_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM53653_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
-    { BROADCOM_VENDOR_ID, BCM56568_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, BCM53654_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM56670_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
-    { BROADCOM_VENDOR_ID, BCM56760_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
-    { BROADCOM_VENDOR_ID, BCM56761_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
-    { BROADCOM_VENDOR_ID, BCM56762_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
-    { BROADCOM_VENDOR_ID, BCM56764_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
-    { BROADCOM_VENDOR_ID, BCM56765_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
-    { BROADCOM_VENDOR_ID, BCM56766_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
-    { BROADCOM_VENDOR_ID, BCM56768_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
-    { BROADCOM_VENDOR_ID, BCM56069_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
-    { BROADCOM_VENDOR_ID, BCM56068_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM56160_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM56162_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, BCM56163_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
@@ -1737,6 +1746,28 @@ static const struct pci_device_id _id_table[] = {
     { BROADCOM_VENDOR_ID, Q3D_DEVICE_ID + 7, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, Q3D_DEVICE_ID + 8, PCI_ANY_ID, PCI_ANY_ID },
     { BROADCOM_VENDOR_ID, Q3D_DEVICE_ID + 9, PCI_ANY_ID, PCI_ANY_ID },
+#ifdef BCM_Q3A_SUPPORT
+    { BROADCOM_VENDOR_ID, Q3A_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, Q3A_DEVICE_ID + 1, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, Q3A_DEVICE_ID + 2, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, Q3A_DEVICE_ID + 3, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, Q3A_DEVICE_ID + 4, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, Q3A_DEVICE_ID + 5, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, Q3A_DEVICE_ID + 6, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, Q3A_DEVICE_ID + 7, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, Q3A_DEVICE_ID + 8, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, Q3A_DEVICE_ID + 9, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, Q3U_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, Q3U_DEVICE_ID + 1, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, Q3U_DEVICE_ID + 2, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, Q3U_DEVICE_ID + 3, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, Q3U_DEVICE_ID + 4, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, Q3N_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, Q3N_DEVICE_ID + 1, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, Q3N_DEVICE_ID + 2, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, Q3N_DEVICE_ID + 3, PCI_ANY_ID, PCI_ANY_ID },
+    { BROADCOM_VENDOR_ID, Q3N_DEVICE_ID + 4, PCI_ANY_ID, PCI_ANY_ID },
+#endif
 #endif
 #endif /* BCM_DNX_SUPPORT */
 #ifdef BCM_DFE_SUPPORT
@@ -2864,7 +2895,7 @@ _pci_probe(struct pci_dev *dev, const struct pci_device_id *ent)
         shbde_iproc_config_init(icfg, ctrl->bde_dev.device, ctrl->bde_dev.rev);
 
         if (debug >= 2) {
-            gprintk("iproc version = %x dma_hi_bits  =  %x\n", icfg->iproc_ver, icfg->dma_hi_bits);
+            gprintk("iproc version = 0x%x dma_hi_bits  =  0x%x\n", icfg->iproc_ver, icfg->dma_hi_bits);
         }
         icfg->use_msi = ctrl->use_msi;
 
@@ -4086,6 +4117,14 @@ _interrupt_disconnect(int d)
     if (unlikely(debug > 1))
         gprintk("%s: isr_active = %d\n", __func__, isr_active);
 
+#ifdef CONFIG_PCI_MSI
+    if (isr_active) {
+        if (ctrl->intr_pending && (ctrl->use_msi >= PCI_USE_INT_MSI)) {
+            del_timer_sync(&ctrl->isr_tick);
+        }
+    }
+#endif
+
     if (isr2_dev) {
         if (debug >= 1) {
             gprintk("disconnect secondary isr\n");
@@ -4096,6 +4135,12 @@ _interrupt_disconnect(int d)
         if (ctrl->isr) {
             /* Primary handler still active */
             SYNC_IRQ(ctrl->iLine);
+
+            /* restart timer to handling pending interrupts */
+            if (ctrl->intr_pending && (ctrl->use_msi >= PCI_USE_INT_MSI)) {
+                ctrl->isr_tick.expires = jiffies + msecs_to_jiffies(isrtickms);
+                add_timer(&ctrl->isr_tick);
+            }
             return 0;
         }
     } else {
@@ -4107,6 +4152,12 @@ _interrupt_disconnect(int d)
         if (ctrl->isr2) {
             /* Secondary handler still active */
             SYNC_IRQ(ctrl->iLine);
+
+            /* restart timer to handling pending interrupts */
+            if (ctrl->intr_pending && (ctrl->use_msi >= PCI_USE_INT_MSI)) {
+                ctrl->isr_tick.expires = jiffies + msecs_to_jiffies(isrtickms);
+                add_timer(&ctrl->isr_tick);
+            }
             return 0;
         }
     }
@@ -4149,9 +4200,6 @@ _interrupt_disconnect(int d)
 #ifdef CONFIG_PCI_MSI
         if (ctrl->use_msi >= PCI_USE_INT_MSI) {
             _msi_disconnect(ctrl);
-            if (ctrl->intr_pending) {
-                del_timer_sync(&ctrl->isr_tick);
-            }
         }
 #endif
     }
@@ -4455,6 +4503,10 @@ lkbde_cpu_pci_register(int d)
       case JERICHO3_DEVICE_ID:
       case J3AI_DEVICE_ID:
       case Q3D_DEVICE_ID:
+#ifdef BCM_Q3A_SUPPORT
+      case Q3A_DEVICE_ID:
+      case Q3U_DEVICE_ID:
+#endif
 #endif
 #endif
 #ifdef BCM_DNXF_SUPPORT
diff --git a/platform/broadcom/saibcm-modules/systems/bde/linux/kernel/linux_dma.c b/platform/broadcom/saibcm-modules/systems/bde/linux/kernel/linux_dma.c
index 9d1772adbdb2..d47ed73390e3 100644
--- a/platform/broadcom/saibcm-modules/systems/bde/linux/kernel/linux_dma.c
+++ b/platform/broadcom/saibcm-modules/systems/bde/linux/kernel/linux_dma.c
@@ -748,6 +748,17 @@ lkbde_edk_get_dma_info(int dev_id, phys_addr_t* cpu_pbase, phys_addr_t* dma_pbas
     return 0;
 }
 
+void *
+lkbde_edk_dmamem_map_p2v(dma_addr_t paddr)
+{
+    if ((paddr >= _edk_dma_pool[0].dma_pbase) &&
+            (paddr < (_edk_dma_pool[0].dma_pbase + _edk_dma_pool[0].size))) {
+        return (_edk_dma_pool[0].dma_vbase + (paddr - _edk_dma_pool[0].dma_pbase));
+    } else {
+        return NULL;
+    }
+}
+
 /*
  * The below function validates the memory to the EDK allocated DMA pool,
  * required to user space via the BDE device file.
@@ -759,12 +770,14 @@ _edk_vm_is_valid(struct file *filp, struct vm_area_struct *vma)
     unsigned long size = vma->vm_end - vma->vm_start;
     int i, ndevices;
 
-    ndevices = BDE_NUM_DEVICES(BDE_SWITCH_DEVICES);
+    ndevices = LINUX_BDE_MAX_DEVICES;
     for (i = 0; i < ndevices; i++) {
-        if (phys_addr < (unsigned long )_edk_dma_pool[i].cpu_pbase ||
-            (phys_addr + size) > ((unsigned long )_edk_dma_pool[i].cpu_pbase +
+        if (_edk_dma_pool[i].dma_vbase) {
+            if (phys_addr < (unsigned long )_edk_dma_pool[i].cpu_pbase ||
+                (phys_addr + size) > ((unsigned long )_edk_dma_pool[i].cpu_pbase +
                                    _edk_dma_pool[i].size)) {
-            continue;
+                continue;
+            }
         }
         return 1;
     }
@@ -812,7 +825,7 @@ _mpool_free(void)
         if (_dma_vbase) {
             if (dma_debug >= 1) gprintk("freeing v=0x%lx p=0x%lx size=0x%lx\n", (unsigned long)_dma_vbase,(unsigned long) _dma_pbase, (unsigned long)_dma_mem_size);
             if (_dma_alloc_coherent_device != NULL) {
-                dma_free_coherent(_dma_alloc_coherent_device, _dma_mem_size, _dma_vbase, _dma_pbase);
+                dma_free_attrs(_dma_alloc_coherent_device, _dma_mem_size, _dma_vbase, _dma_pbase, DMA_FORCE_CONTIGUOUS);
                 _dma_alloc_coherent_device = NULL;
             }
         }
@@ -983,7 +996,7 @@ void _dma_per_device_init(int dev_index)
 #if _SIMPLE_MEMORY_ALLOCATION_
     if (_dma_pool_alloc_state == DMA_POOL_INITIALIZED && dmaalloc == ALLOC_TYPE_API) {
         /* allocate the DMA buffer pool and map it to the device, uses CMA */
-        _dma_vbase = dma_alloc_coherent(dev, _dma_mem_size, &dma_addr, GFP_KERNEL);
+        _dma_vbase = dma_alloc_attrs(dev, _dma_mem_size, &dma_addr, GFP_KERNEL, DMA_FORCE_CONTIGUOUS);
         if (!_dma_vbase) {
             _dma_pool_alloc_state = DMA_POOL_FAILED;
             gprintk("Failed to allocate coherent memory pool of size 0x%x\n", _dma_mem_size);
@@ -1094,7 +1107,7 @@ void _dma_init(void)
                 dmasize +=5;
             }
 
-        } 
+        }
 #endif /* INCLUDE_SRAM_DMA */
         if (*dmasize != '\0') {
             if ((dmasize[strlen(dmasize)-1] & ~0x20) == 'M') {
@@ -1103,10 +1116,6 @@ void _dma_init(void)
             } else {
                 gprintk("DMA memory size must be specified as e.g. dmasize=8M\n");
             }
-            if (_dma_mem_size & (_dma_mem_size-1)) {
-                gprintk("dmasize must be a power of 2 (1M, 2M, 4M, 8M etc.)\n");
-                _dma_mem_size = 0;
-            }
         }
     }
 
@@ -1290,7 +1299,6 @@ _sinval(int d, void *ptr, int length)
 #if defined(dma_cache_wback_inv)
      dma_cache_wback_inv((unsigned long)ptr, length);
 #else
-
     dma_sync_single_for_cpu(NULL, (unsigned long)ptr, length, DMA_BIDIRECTIONAL);
 #endif
     return 0;
@@ -1302,7 +1310,6 @@ _sflush(int d, void *ptr, int length)
 #if defined(dma_cache_wback_inv)
     dma_cache_wback_inv((unsigned long)ptr, length);
 #else
-
     dma_sync_single_for_cpu(NULL, (unsigned long)ptr, length, DMA_BIDIRECTIONAL);
 #endif
 
@@ -1329,11 +1336,9 @@ _dma_pprint(struct seq_file *m)
     pprintf(m, "\tdmasize=%s\n", dmasize);
     pprintf(m, "\thimem=%s\n", himem);
     pprintf(m, "\thimemaddr=%s\n", himemaddr);
-    pprintf(m, "DMA Memory (%s): %d bytes, %d used, %d free%s\n",
+    pprintf(m, "DMA Memory (%s): %d bytes allocated%s\n",
             (_use_himem) ? "high" : dmaalloc ? "kernel-api" : "kernel-chunk",
             (_dma_vbase) ? _dma_mem_size : 0,
-            (_dma_vbase) ? mpool_usage(_dma_pool) : 0,
-            (_dma_vbase) ? _dma_mem_size - mpool_usage(_dma_pool) : 0,
             USE_LINUX_BDE_MMAP ? ", local mmap" : "");
 }
 
@@ -1343,6 +1348,7 @@ _dma_pprint(struct seq_file *m)
 
 #ifdef BDE_EDK_SUPPORT
 LKM_EXPORT_SYM(lkbde_edk_get_dma_info);
+LKM_EXPORT_SYM(lkbde_edk_dmamem_map_p2v);
 #endif
 LKM_EXPORT_SYM(kmalloc_giant);
 LKM_EXPORT_SYM(kfree_giant);
diff --git a/platform/broadcom/saibcm-modules/systems/bde/linux/user/kernel/Makefile b/platform/broadcom/saibcm-modules/systems/bde/linux/user/kernel/Makefile
index 444d72c4ebd1..1ea23533c3df 100644
--- a/platform/broadcom/saibcm-modules/systems/bde/linux/user/kernel/Makefile
+++ b/platform/broadcom/saibcm-modules/systems/bde/linux/user/kernel/Makefile
@@ -109,7 +109,7 @@ $(KMODULE): $(MODULE)
 	mkdir $(BLDDIR)/$(KERNEL_MODULE_DIR)
 	cp ${SDK}/make/Makefile.linux-kmodule $(BLDDIR)/$(KERNEL_MODULE_DIR)/Makefile
 	cat ${KBUILD_EXTRA_SYMBOLS} > $(BLDDIR)/$(KERNEL_MODULE_DIR)/Module.symvers
-	MOD_NAME=$(THIS_MOD_NAME) KBUILD_EXTRA_SYMBOLS="${KBUILD_EXTRA_SYMBOLS}"  $(MAKE) -C $(BLDDIR)/$(KERNEL_MODULE_DIR) $(THIS_MOD_NAME).ko	
+	MOD_NAME=$(THIS_MOD_NAME) KBUILD_EXTRA_SYMBOLS="${KBUILD_EXTRA_SYMBOLS}" $(MAKE) -C $(BLDDIR)/$(KERNEL_MODULE_DIR) $(THIS_MOD_NAME).ko
 
 include $(SDK)/make/Make.depend
 # }
diff --git a/platform/broadcom/saibcm-modules/systems/bde/linux/user/kernel/linux-user-bde.c b/platform/broadcom/saibcm-modules/systems/bde/linux/user/kernel/linux-user-bde.c
index 4d0929c86afd..3b12b4a914d6 100644
--- a/platform/broadcom/saibcm-modules/systems/bde/linux/user/kernel/linux-user-bde.c
+++ b/platform/broadcom/saibcm-modules/systems/bde/linux/user/kernel/linux-user-bde.c
@@ -1135,6 +1135,7 @@ _intr_regs_init(bde_ctrl_t *ctrl, int flag)
                 case BCM53651_DEVICE_ID:
                 case BCM53652_DEVICE_ID:
                 case BCM53653_DEVICE_ID:
+                case BCM53654_DEVICE_ID:
                     ihost_sw_prog_intr_num = P19_SW_PROG_INTR_IRQ;
                     break;
                 default:
@@ -1292,6 +1293,7 @@ _devices_init(int d)
         case BCM53651_DEVICE_ID:
         case BCM53652_DEVICE_ID:
         case BCM53653_DEVICE_ID:
+        case BCM53654_DEVICE_ID:
             ctrl->isr = (isr_f)_cmicx_interrupt;
             if (ctrl->dev_type & BDE_AXI_DEV_TYPE) {
                 if (!ihost_intr_enable_base) {
@@ -1359,6 +1361,10 @@ _devices_init(int d)
           case J3AI_DEVICE_ID:
 
           case Q3D_DEVICE_ID:
+#ifdef BCM_Q3A_SUPPORT
+          case Q3A_DEVICE_ID:
+          case Q3U_DEVICE_ID:
+#endif
 #endif
 #ifdef BCM_DNXF3_SUPPORT
           case  RAMON2_DEVICE_ID:
@@ -1582,6 +1588,15 @@ _dma_resource_get(unsigned inst_id, phys_addr_t *cpu_pbase, phys_addr_t *dma_pba
         return -1;
     }
     res = &_bde_inst_resource[inst_id];
+
+    if (res->is_active == 0) {
+        *cpu_pbase = 0;
+        *dma_pbase = 0;
+        *size = 0;
+        spin_unlock(&bde_resource_lock);
+        return -2;
+    }
+
     dma_size = res->dma_size;
     dma_offset = res->dma_offset;
     spin_unlock(&bde_resource_lock);
@@ -1770,8 +1785,9 @@ _ioctl(unsigned int cmd, unsigned long arg)
     lubde_ioctl_t io;
     phys_addr_t cpu_pbase, dma_pbase;
     ssize_t size;
+    ssize_t total_size;
     const ibde_dev_t *bde_dev;
-    int inst_id, idx;
+    int inst_id, idx, inst_i;
     bde_inst_resource_t *res;
     uint32_t *mapaddr;
 
@@ -1838,9 +1854,22 @@ _ioctl(unsigned int cmd, unsigned long arg)
         break;
     case LUBDE_GET_DMA_INFO:
         inst_id = io.dev;
-        if (_bde_multi_inst) {
-            if (_dma_resource_get(inst_id, &cpu_pbase, &dma_pbase, &size)) {
-                io.rc = LUBDE_FAIL;
+        if (_bde_multi_inst && (inst_id != BDE_DEV_INST_ID_INVALID)) {
+            if (inst_id == BDE_DEV_INST_ID_GET_FREE) {
+                /* Get the total DMA size */
+                lkbde_get_dma_info(&cpu_pbase, &dma_pbase, &total_size);
+                /* Decrease the total size for each allocated SDK instance */
+                for (inst_i = 0; inst_i < LINUX_BDE_MAX_DEVICES; inst_i++)
+                {
+                    if (_bde_inst_resource[inst_i].is_active && (_dma_resource_get(inst_i, &cpu_pbase, &dma_pbase, &size) == 0)) {
+                        total_size -= size;
+                    }
+                }
+                size = total_size;
+            } else {
+                if (_dma_resource_get(inst_id, &cpu_pbase, &dma_pbase, &size)) {
+                    io.rc = LUBDE_FAIL;
+                }
             }
         } else {
             lkbde_get_dma_info(&cpu_pbase, &dma_pbase, &size);
diff --git a/platform/broadcom/saibcm-modules/systems/bde/shared/shbde_iproc.c b/platform/broadcom/saibcm-modules/systems/bde/shared/shbde_iproc.c
index 29334c997a9b..f7c4863d3a19 100644
--- a/platform/broadcom/saibcm-modules/systems/bde/shared/shbde_iproc.c
+++ b/platform/broadcom/saibcm-modules/systems/bde/shared/shbde_iproc.c
@@ -157,9 +157,7 @@ shbde_iproc_config_init(shbde_iproc_config_t *icfg,
         icfg->iproc_ver = 7;
         icfg->dma_hi_bits = 0x2;
         break;
-    case 0xb560: /* Apache */
     case 0xb670: /* MO */
-    case 0xb760: /* Maverick */
         icfg->iproc_ver = 0xB;
         break;
     case 0xb160: /* Hurricane3 */
@@ -175,11 +173,6 @@ shbde_iproc_config_init(shbde_iproc_config_t *icfg,
 
     /* Check for exceptions */
     switch (icfg->dev_id) {
-       case 0xb069:
-       case 0xb068:
-          icfg->iproc_ver = 0xB;       /*Ranger2+  Apache Family */
-          icfg->dma_hi_bits = 0;
-          break;
     case 0xb168: /* Ranger3+ */
     case 0xb169:
         icfg->iproc_ver = 0;
diff --git a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-genl/bcm-genl-dev.c b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-genl/bcm-genl-dev.c
index 6cd8aa0ec4c3..3e8c61cc5909 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-genl/bcm-genl-dev.c
+++ b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-genl/bcm-genl-dev.c
@@ -48,11 +48,19 @@
 #include "bcm-genl-dev.h"
 
 /* Module header Op-Codes */
-#define SOC_HIGIG_OP_CPU        0x00 /* CPU Frame */
-#define SOC_HIGIG_OP_UC         0x01 /* Unicast Frame */
-#define SOC_HIGIG_OP_BC         0x02 /* Broadcast or DLF frame */
-#define SOC_HIGIG_OP_MC         0x03 /* Multicast Frame */
-#define SOC_HIGIG_OP_IPMC       0x04 /* IP Multicast Frame */
+#define SOC_HIGIG_OP_CPU                    0x00 /* CPU Frame */
+#define SOC_HIGIG_OP_UC                     0x01 /* Unicast Frame */
+#define SOC_HIGIG_OP_BC                     0x02 /* Broadcast or DLF frame */
+#define SOC_HIGIG_OP_MC                     0x03 /* Multicast Frame */
+#define SOC_HIGIG_OP_IPMC                   0x04 /* IP Multicast Frame */
+
+/*
+ * Bits [17:16] are used as encoded values for SFLOW in Rx reason for
+ * DCB type 38.
+ */
+#define DCB38_RX_REASON_MASK_SAMPLE         0x30000
+#define DCB38_RX_REASON_VAL_SAMPLE_DEST     0x20000
+#define DCB38_RX_REASON_VAL_SAMPLE_SOURCE   0x30000
 
 static dcb_handle_t g_dcb_hdl[LINUX_BDE_MAX_DEVICES];
 
@@ -134,12 +142,27 @@ bcmgenl_dev_pktmeta_rx_reason_get(int dev_no, void *pkt_meta, uint64_t *reason)
     return 0;
 }
 
+/*!
+ * \brief Get Rx reason for sample-source for the specified device.
+ *
+ * The mask argument is used to indicate the valid bit-range of the Rx reason
+ * value.
+ *
+ * \param [in] dev_no Device number.
+ * \param [out] val Value of Rx reason for sample-source.
+ * \param [out] mask Mask of Rx reason for sample-source if not NULL.
+ *
+ * \retval 0 No errors.
+ * \retval -1 Failed to get the target Rx reason.
+ */
 int
-bcmgenl_dev_rx_reason_sample_source_get(int dev_no, uint64_t *val)
+bcmgenl_dev_rx_reason_sample_source_get(int dev_no,
+                                        uint64_t *val, uint64_t *mask)
 {
     dcb_handle_t *dcbh = dcb_handle_get(dev_no);
     soc_rx_reason_t *map;
     int idx = 0;
+    uint64_t m = 0;
 
     if (dcbh == NULL || val == NULL) {
         return -1;
@@ -147,23 +170,79 @@ bcmgenl_dev_rx_reason_sample_source_get(int dev_no, uint64_t *val)
     *val = 0;
 
     if (DCB_TYPE(dcbh) == 38) {
-        /* Rx reason for SampleSouce is an encoded value (3) in bits [17:16] */
-        *val = 0x30000;
+        *val = DCB38_RX_REASON_VAL_SAMPLE_SOURCE;
+        m = DCB38_RX_REASON_MASK_SAMPLE;
     } else {
         map = DCB_OP(dcbh)->rx_reason_maps[0];
         do {
             if (map[idx] == socRxReasonSampleSource) {
                 *val = (uint64_t)1 << idx;
+                m = *val;
                 break;
             }
         } while (map[++idx] != socRxReasonInvalid);
     }
 
     if (*val == 0) {
-        gprintk("%s: No rx reasone sample source for dcb type %d\n",
+        gprintk("%s: No rx reasone sample-source for dcb type %d\n",
                 __func__, DCB_TYPE(dcbh));
         return -1;
     }
+    if (mask) {
+        *mask = m;
+    }
+    return 0;
+}
+
+/*!
+ * \brief Get Rx reason for sample-dest for the specified device.
+ *
+ * The mask argument is used to indicate the valid bit-range of the Rx reason
+ * value.
+ *
+ * \param [in] dev_no Device number.
+ * \param [out] val Value of Rx reason for sample-dest.
+ * \param [out] mask Mask of Rx reason for sample-dest if not NULL.
+ *
+ * \retval 0 No errors.
+ * \retval -1 Failed to get the target Rx reason.
+ */
+int
+bcmgenl_dev_rx_reason_sample_dest_get(int dev_no,
+                                      uint64_t *val, uint64_t *mask)
+{
+    dcb_handle_t *dcbh = dcb_handle_get(dev_no);
+    soc_rx_reason_t *map;
+    int idx = 0;
+    uint64_t m = 0;
+
+    if (dcbh == NULL || val == NULL) {
+        return -1;
+    }
+    *val = 0;
+
+    if (DCB_TYPE(dcbh) == 38) {
+        *val = DCB38_RX_REASON_VAL_SAMPLE_DEST;
+        m = DCB38_RX_REASON_MASK_SAMPLE;
+    } else {
+        map = DCB_OP(dcbh)->rx_reason_maps[0];
+        do {
+            if (map[idx] == socRxReasonSampleDest) {
+                *val = (uint64_t)1 << idx;
+                m = *val;
+                break;
+            }
+        } while (map[++idx] != socRxReasonInvalid);
+    }
+
+    if (*val == 0) {
+        gprintk("%s: No rx reasone sample-dest for dcb type %d\n",
+                __func__, DCB_TYPE(dcbh));
+        return -1;
+    }
+    if (mask) {
+        *mask = m;
+    }
     return 0;
 }
 
diff --git a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-genl/bcm-genl-dev.h b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-genl/bcm-genl-dev.h
index 80494346ca3c..bc82d9a9af7b 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-genl/bcm-genl-dev.h
+++ b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-genl/bcm-genl-dev.h
@@ -42,7 +42,10 @@ extern int
 bcmgenl_dev_pktmeta_rx_reason_get(int dev_no, void *pkt_meta, uint64_t *reason);
 
 extern int
-bcmgenl_dev_rx_reason_sample_source_get(int dev_no, uint64_t *val);
+bcmgenl_dev_rx_reason_sample_source_get(int dev_no, uint64_t *val, uint64_t *mask);
+
+extern int
+bcmgenl_dev_rx_reason_sample_dest_get(int dev_no, uint64_t *val, uint64_t *mask);
 
 extern int
 bcmgenl_dev_dcb_info_get(int dev_no, int *dcb_type, int *dcb_size);
diff --git a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-genl/bcm-genl-packet.c b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-genl/bcm-genl-packet.c
index 2e8744440f45..d2f61f343ea5 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-genl/bcm-genl-packet.c
+++ b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-genl/bcm-genl-packet.c
@@ -122,6 +122,7 @@ typedef struct genl_stats_s {
     unsigned long pkts_f_genl_cb;
     unsigned long pkts_f_genl_mod;
     unsigned long pkts_f_handled;
+    unsigned long pkts_f_pass_through;
     unsigned long pkts_f_tag_stripped;
     unsigned long pkts_f_dst_mc;
     unsigned long pkts_f_src_cpu;
@@ -420,18 +421,16 @@ genl_filter_cb(uint8_t * pkt, int size, int dev_no, void *pkt_meta,
     schedule_work(&g_genl_work.wq);
     spin_unlock_irqrestore(&g_genl_work.lock, flags);
 
-    /* expected rv values:
-     * -ve for error
-     * 0 for passthrough
-     * 1 for packet handled
-     *  */
-
     /* Set rv to packet handled */
     rv = 1;
 
 GENL_FILTER_CB_PKT_HANDLED:
-    g_genl_stats.pkts_f_handled++;
-    return rv;
+    if (rv == 1) {
+        g_genl_stats.pkts_f_handled++;
+        return 1;
+    }
+    g_genl_stats.pkts_f_pass_through++;
+    return 0;
 }
 
 /*
@@ -506,6 +505,7 @@ genl_proc_stats_show(struct seq_file *m, void *v)
     seq_printf(m, "  pkts filter generic cb         %10lu\n", g_genl_stats.pkts_f_genl_cb);
     seq_printf(m, "  pkts sent to generic module    %10lu\n", g_genl_stats.pkts_f_genl_mod);
     seq_printf(m, "  pkts handled by generic cb     %10lu\n", g_genl_stats.pkts_f_handled);
+    seq_printf(m, "  pkts pass through              %10lu\n", g_genl_stats.pkts_f_pass_through);
     seq_printf(m, "  pkts with vlan tag stripped    %10lu\n", g_genl_stats.pkts_f_tag_stripped);
     seq_printf(m, "  pkts with mc destination       %10lu\n", g_genl_stats.pkts_f_dst_mc);
     seq_printf(m, "  pkts with cpu source           %10lu\n", g_genl_stats.pkts_f_src_cpu);
diff --git a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-genl/bcm-genl-psample.c b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-genl/bcm-genl-psample.c
index 25da4decc789..975a3f3796fe 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-genl/bcm-genl-psample.c
+++ b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-genl/bcm-genl-psample.c
@@ -87,6 +87,23 @@ LKM_MOD_PARAM(psample_qlen, "i", int, 0);
 MODULE_PARM_DESC(psample_qlen,
 "psample queue length (default 1024 buffers)");
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,13,0))
+static inline void
+bcmgenl_sample_packet(struct psample_group *group, struct sk_buff *skb,
+                      u32 trunc_size, int in_ifindex, int out_ifindex,
+                      u32 sample_rate)
+{
+    struct psample_metadata md = {};
+
+    md.trunc_size = trunc_size;
+    md.in_ifindex = in_ifindex;
+    md.out_ifindex = out_ifindex;
+    psample_sample_packet(group, skb, sample_rate, &md);
+}
+#else
+#define bcmgenl_sample_packet psample_sample_packet
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(5,13,0)) */
+
 /* driver proc entry root */
 static struct proc_dir_entry *psample_proc_root = NULL;
 static char psample_procfs_path[80];
@@ -96,6 +113,9 @@ typedef struct psample_info_s {
     struct net *netns;
     struct list_head group_list;
     uint64_t rx_reason_sample_source[LINUX_BDE_MAX_DEVICES];
+    uint64_t rx_reason_sample_source_mask[LINUX_BDE_MAX_DEVICES];
+    uint64_t rx_reason_sample_dest[LINUX_BDE_MAX_DEVICES];
+    uint64_t rx_reason_sample_dest_mask[LINUX_BDE_MAX_DEVICES];
 } psample_info_t;
 static psample_info_t g_psample_info;
 
@@ -126,11 +146,17 @@ typedef struct psample_stats_s {
 } psample_stats_t;
 static psample_stats_t g_psample_stats;
 
+/*! Sampling type */
+#define SAMPLE_TYPE_NONE     0
+#define SAMPLE_TYPE_INGRESS  1
+#define SAMPLE_TYPE_EGRESS   2
+
 typedef struct psample_meta_s {
     int trunc_size;
     int src_ifindex;
     int dst_ifindex;
     int sample_rate;
+    int sample_type;
 } psample_meta_t;
 
 typedef struct psample_pkt_s {
@@ -203,29 +229,31 @@ psample_meta_dstport_get(int dev_no, void *pkt_meta, bool *is_mcast)
 }
 
 static int
-psample_meta_sample_reason(int dev_no, void *pkt_meta)
+psample_meta_sample_type_get(int dev_no, void *pkt_meta)
 {
     uint64_t rx_reason;
-    uint64_t *exp_reason = &g_psample_info.rx_reason_sample_source[dev_no];
+    static bool rx_reason_set[LINUX_BDE_MAX_DEVICES];
+    uint64_t *smpls = &g_psample_info.rx_reason_sample_source[dev_no];
+    uint64_t *smpls_mask = &g_psample_info.rx_reason_sample_source_mask[dev_no];
+    uint64_t *smpld = &g_psample_info.rx_reason_sample_dest[dev_no];
+    uint64_t *smpld_mask = &g_psample_info.rx_reason_sample_dest_mask[dev_no];
 
     if (bcmgenl_dev_pktmeta_rx_reason_get(dev_no, pkt_meta, &rx_reason) < 0) {
-        return 0;
+        return SAMPLE_TYPE_NONE;
     }
-    if (*exp_reason == 0) {
-        if (bcmgenl_dev_rx_reason_sample_source_get(dev_no, exp_reason) < 0) {
-            return 0;
-        }
+
+    if (!rx_reason_set[dev_no]) {
+        bcmgenl_dev_rx_reason_sample_source_get(dev_no, smpls, smpls_mask);
+        bcmgenl_dev_rx_reason_sample_dest_get(dev_no, smpld, smpld_mask);
+        rx_reason_set[dev_no] = true;
     }
 
-    /* Check if only sample reason code is set.
-     * If only sample reason code, then consume pkt.
-     * If other reason codes exist, then pkt should be
-     * passed through to Linux network stack.
-     */
-    if ((rx_reason & *exp_reason) == *exp_reason) {
-        return 1;
+    if (*smpls && (rx_reason & *smpls_mask) == *smpls) {
+        return SAMPLE_TYPE_INGRESS;
+    } else if (*smpld && (rx_reason & *smpld_mask) == *smpld) {
+        return SAMPLE_TYPE_EGRESS;
     }
-    return 0;
+    return SAMPLE_TYPE_NONE;
 }
 
 static int
@@ -293,6 +321,7 @@ psample_meta_get(int dev_no, kcom_filter_t *kf, void *pkt_meta,
     sflow_meta->dst_ifindex = dst_ifindex;
     sflow_meta->trunc_size  = sample_size;
     sflow_meta->sample_rate = sample_rate;
+    sflow_meta->sample_type = psample_meta_sample_type_get(dev_no, pkt_meta);
     return 0;
 }
 
@@ -311,36 +340,23 @@ psample_task(struct work_struct *work)
         list_del(list_ptr);
         g_psample_stats.pkts_c_qlen_cur--;
         spin_unlock_irqrestore(&psample_work->lock, flags);
- 
+
         /* send to psample */
         if (pkt) {
-#if ((IS_ENABLED(CONFIG_PSAMPLE) && LINUX_VERSION_CODE >= KERNEL_VERSION(5,13,0)) || \
-     (defined PSAMPLE_MD_EXTENDED_ATTR && PSAMPLE_MD_EXTENDED_ATTR))
-            struct psample_metadata md = {0};
-            md.trunc_size = pkt->meta.trunc_size;
-            md.in_ifindex = pkt->meta.src_ifindex;
-            md.out_ifindex = pkt->meta.dst_ifindex;
-#endif
             PSAMPLE_CB_DBG_PRINT("%s: group 0x%x, trunc_size %d, src_ifdx 0x%x, dst_ifdx 0x%x, sample_rate %d\n",
-                    __func__, pkt->group->group_num, 
-                    pkt->meta.trunc_size, pkt->meta.src_ifindex, 
+                    __func__, pkt->group->group_num,
+                    pkt->meta.trunc_size, pkt->meta.src_ifindex,
                     pkt->meta.dst_ifindex, pkt->meta.sample_rate);
-#if ((IS_ENABLED(CONFIG_PSAMPLE) && LINUX_VERSION_CODE >= KERNEL_VERSION(5,13,0)) || \
-     (defined PSAMPLE_MD_EXTENDED_ATTR && PSAMPLE_MD_EXTENDED_ATTR))
-            psample_sample_packet(pkt->group,
+
+            bcmgenl_sample_packet(pkt->group,
                                   pkt->skb,
-                                  pkt->meta.sample_rate,
-                                  &md);
-#else
-            psample_sample_packet(pkt->group,
-                                  pkt->skb, 
                                   pkt->meta.trunc_size,
                                   pkt->meta.src_ifindex,
                                   pkt->meta.dst_ifindex,
                                   pkt->meta.sample_rate);
-#endif
+
             g_psample_stats.pkts_f_psample_mod++;
- 
+
             dev_kfree_skb_any(pkt->skb);
             kfree(pkt);
         }
@@ -354,9 +370,11 @@ psample_filter_cb(uint8_t *pkt, int size, int dev_no, void *pkt_meta,
                   int chan, kcom_filter_t *kf)
 {
     struct psample_group *group = NULL;
-    psample_meta_t meta;   
+    psample_meta_t meta;
     int rv = 0;
 
+    memset(&meta, 0, sizeof(meta));
+
     PSAMPLE_CB_DBG_PRINT("%s: pkt size %d, kf->dest_id %d, kf->cb_user_data %d\n",
             __func__, size, kf->dest_id, kf->cb_user_data);
     g_psample_stats.pkts_f_psample_cb++;
@@ -382,7 +400,7 @@ psample_filter_cb(uint8_t *pkt, int size, int dev_no, void *pkt_meta,
         g_psample_stats.pkts_d_invalid_size++;
         goto PSAMPLE_FILTER_CB_PKT_HANDLED;
     } else {
-       size -= FCS_SZ; 
+       size -= FCS_SZ;
     }
 
     /* Account for padding in libnl used by psample */
@@ -422,12 +440,13 @@ psample_filter_cb(uint8_t *pkt, int size, int dev_no, void *pkt_meta,
         /* setup skb to point to pkt */
         memcpy(skb->data, pkt, meta.trunc_size);
         skb_put(skb, meta.trunc_size);
+        /* save original size for PSAMPLE_ATTR_ORIGSIZE in skb->len */
         skb->len = size;
         psample_pkt->skb = skb;
 
         spin_lock_irqsave(&g_psample_work.lock, flags);
-        list_add_tail(&psample_pkt->list, &g_psample_work.pkt_list); 
-        
+        list_add_tail(&psample_pkt->list, &g_psample_work.pkt_list);
+
         g_psample_stats.pkts_c_qlen_cur++;
         if (g_psample_stats.pkts_c_qlen_cur > g_psample_stats.pkts_c_qlen_hi) {
             g_psample_stats.pkts_c_qlen_hi = g_psample_stats.pkts_c_qlen_cur;
@@ -437,17 +456,17 @@ psample_filter_cb(uint8_t *pkt, int size, int dev_no, void *pkt_meta,
         spin_unlock_irqrestore(&g_psample_work.lock, flags);
     } else {
         g_psample_stats.pkts_d_sampling_disabled++;
-    }    
+    }
 
 PSAMPLE_FILTER_CB_PKT_HANDLED:
     /* if sample reason only, consume pkt. else pass through */
-    rv = psample_meta_sample_reason(dev_no, pkt_meta);
-    if (rv) {
+    if (meta.sample_type == SAMPLE_TYPE_INGRESS ||
+        meta.sample_type == SAMPLE_TYPE_EGRESS) {
         g_psample_stats.pkts_f_handled++;
-    } else {
-        g_psample_stats.pkts_f_pass_through++;
+        return 1;
     }
-    return rv;
+    g_psample_stats.pkts_f_pass_through++;
+    return 0;
 }
 
 /*
@@ -457,7 +476,7 @@ static int
 proc_rate_show(void *cb_data, bcmgenl_netif_t *netif)
 {
     struct seq_file *m = (struct seq_file *)cb_data;
-    
+
     seq_printf(m, "  %-14s %d\n",
                netif->dev->name, netif->sample_rate);
     return 0;
@@ -550,7 +569,7 @@ static int
 proc_size_show(void *cb_data, bcmgenl_netif_t *netif)
 {
     struct seq_file *m = (struct seq_file *)cb_data;
-    
+
     seq_printf(m, "  %-14s %d\n", netif->dev->name, netif->sample_size);
     return 0;
 }
@@ -622,7 +641,7 @@ psample_proc_size_write(struct file *file, const char *buf,
         gprintk("Warning: Failed setting psample size on "
                 "unknown network interface: '%s'\n", sample_str);
     }
-    
+
     return count;
 }
 
diff --git a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-knet/bcm-knet.c b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-knet/bcm-knet.c
old mode 100755
new mode 100644
index 98d5592d5f73..e375b7d361af
--- a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-knet/bcm-knet.c
+++ b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-knet/bcm-knet.c
@@ -390,6 +390,16 @@ static inline void *netdev_priv(struct net_device *dev)
 }
 #endif /* KERNEL_VERSION(2,4,27) */
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,5,0)
+#define netdev_get_by_name(net, dev, tracker, gfp) \
+        dev_get_by_name(net, dev)
+#endif /* KERNEL_VERSION(6,5,0) */
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,0,0)
+#define netdev_put(dev, tracker) \
+        dev_put(dev)
+#endif /* KERNEL_VERSION(6,0,0) */
+
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,23)
 /* Special check for MontaVista 2.4.20 MIPS */
 #if !(defined(MAX_USER_RT_PRIO) && defined(CONFIG_MIPS))
@@ -665,6 +675,7 @@ typedef struct bkn_switch_info_s {
     uint32_t udh_length_type[4];    /* Size of UDH header per type */
     uint32_t udh_size;              /* Size of UDH header on legacy devices */
     uint32_t oamp_punt;             /* OAMP port if nonzero */
+    uint32_t enet_channels;         /* Ethernet channels, No header observed.*/
     uint8_t no_skip_udh_check;      /* Indicates UDH won't be skipped */
     uint8_t oam_dm_tod_exist;       /* Indicates presence of OAM TOD MSB */
     uint8_t system_headers_mode;    /* Indicates system header mode */
@@ -969,6 +980,20 @@ typedef struct bkn_dune_system_header_info_s {
         uint32_t trap_qualifier;
         uint32_t trap_id;
     } internal;
+    /** Flags for RX header parser */
+    /** Indicates whether 1st system header is following */
+#define BKN_RX_HEADER_F_HAS_ONE_SYSTEM_HEADER      (0x1 << 0)
+    /** Indicates whether 2nd system header is following */
+#define BKN_RX_HEADER_F_HAS_TWO_SYSTEM_HEADER      (0x1 << 1)
+    /** Indicates whether TSH is following */
+#define BKN_RX_HEADER_F_HAS_TSH                    (0x1 << 2)
+    /** Indicates whether OTSH is following */
+#define BKN_RX_HEADER_F_HAS_OTSH                   (0x1 << 3)
+    /** Indicates whether internal header is following */
+#define BKN_RX_HEADER_F_HAS_INTERNAL_HEADER        (0x1 << 4)
+    /** Indicates whether TOD second header is following */
+#define BKN_RX_HEADER_F_HAS_OAM_DM_TOD_SECOND      (0x1 << 5)
+    uint32_t flags;
 } bkn_dune_system_header_info_t;
 
 #define PREV_IDX(_cur, _max) (((_cur) == 0) ? (_max) - 1 : (_cur) - 1)
@@ -1040,6 +1065,7 @@ typedef struct bkn_priv_s {
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0))
     struct ethtool_link_settings link_settings;
 #endif
+    int ref_count;
 } bkn_priv_t;
 
 typedef struct bkn_filter_s {
@@ -1223,6 +1249,9 @@ bkn_sleep(int clicks)
 /* Unet channel */
 #define UNET_CH(_d, _ch)        ((_d)->unet_channels & (1 << (_ch)))
 
+/* Ethernet channel */
+#define ENET_CH(_d, _ch)        ((_d)->enet_channels & (1 << (_ch)))
+
 /*
  * DMA_STAT: control bits
  *
@@ -1297,7 +1326,7 @@ bkn_sleep(int clicks)
 /* CMICX minimum packet header size for protect underflow. */
 #define CMICX_DCB_SIZE_MIN              16
 /* CMICR minimum packet header size for protect underflow. */
-#define CMICR_DCB_SIZE_MIN         16
+#define CMICR_DCB_SIZE_MIN              16
 /* Minimum packet header size for protect underflow. */
 #define DCB_SIZE_MIN                    20
 /* Maximum packet raw data size for filter validation. */
@@ -3363,9 +3392,7 @@ bkn_dpp_packet_parse_ftmh(
     bkn_switch_info_t *sinfo,
     uint8_t *buf,
     uint32_t buf_len,
-    bkn_dune_system_header_info_t *packet_info,
-    uint8_t *is_tsh_en,
-    uint8_t *is_inter_hdr_en)
+    bkn_dune_system_header_info_t *packet_info)
 {
     uint32_t pkt_offset = packet_info->system_header_size;
     uint32_t dsp_ext_exist = 0;
@@ -3399,11 +3426,11 @@ bkn_dpp_packet_parse_ftmh(
 
     if (fld_val & 0x1)
     {
-        *is_inter_hdr_en = TRUE;
+        packet_info->flags |= BKN_RX_HEADER_F_HAS_INTERNAL_HEADER;
     }
     if (fld_val & 0x2)
     {
-        *is_tsh_en = TRUE;
+        packet_info->flags |= BKN_RX_HEADER_F_HAS_OTSH;
     }
 
     pkt_offset += BKN_DPP_FTMH_SIZE_BYTE;
@@ -3441,7 +3468,6 @@ bkn_dpp_packet_parse_otsh(
     uint8_t *buf,
     uint32_t buf_len,
     bkn_dune_system_header_info_t *packet_info,
-    uint8_t *is_oam_dm_tod_en,
     uint8_t *is_skip_udh)
 {
     uint32_t pkt_offset = packet_info->system_header_size;
@@ -3463,7 +3489,7 @@ bkn_dpp_packet_parse_otsh(
                 &oam_sub_type);
         if ((oam_sub_type == BKN_DPP_OTSH_OAM_SUB_TYPE_DM_1588) || (oam_sub_type == BKN_DPP_OTSH_OAM_SUB_TYPE_DM_NTP)) {
             if (sinfo->oam_dm_tod_exist) {
-                *is_oam_dm_tod_en = TRUE;
+                packet_info->flags |= BKN_RX_HEADER_F_HAS_OAM_DM_TOD_SECOND;
             }
             /* Down MEP DM trapped packets will not have UDH present (even if configured), except for QAX when custom_feature_oam_dm_tod_msb_add_enable=0 */
             if (!sinfo->no_skip_udh_check) {
@@ -3601,19 +3627,17 @@ bkn_dpp_packet_header_parse(
     uint32_t buff_len,
     bkn_dune_system_header_info_t *packet_info)
 {
-    uint8_t  is_inter_hdr_en = FALSE;
-    uint8_t  is_tsh_en = FALSE;
     uint8_t  is_oamp_punted = FALSE;
     uint8_t  is_trapped = FALSE;
-    uint8_t  is_oam_dm_tod_en = FALSE;
     uint8_t  is_skip_udh = FALSE;
 
     if ((sinfo == NULL) || (buff == NULL) || (packet_info == NULL)) {
         return -1;
     }
 
+    packet_info->flags = BKN_RX_HEADER_F_HAS_ONE_SYSTEM_HEADER;
     /* FTMH */
-    bkn_dpp_packet_parse_ftmh(sinfo, buff, buff_len, packet_info, &is_tsh_en, &is_inter_hdr_en);
+    bkn_dpp_packet_parse_ftmh(sinfo, buff, buff_len, packet_info);
 
     /* Check if packet was punted to CPU by OAMP */
     if (device_is_dpp(sinfo))
@@ -3637,17 +3661,17 @@ bkn_dpp_packet_header_parse(
 
 
     /* OTSH */
-    if (is_tsh_en == TRUE)
+    if (packet_info->flags & BKN_RX_HEADER_F_HAS_OTSH)
     {
-        bkn_dpp_packet_parse_otsh(sinfo, buff, buff_len, packet_info, &is_oam_dm_tod_en, &is_skip_udh);
+        bkn_dpp_packet_parse_otsh(sinfo, buff, buff_len, packet_info, &is_skip_udh);
     }
     /* Internal header is forced to be present if packet was punted to CPU by OAMP */
     if (is_oamp_punted)
     {
-        is_inter_hdr_en = TRUE;
+        packet_info->flags |= BKN_RX_HEADER_F_HAS_INTERNAL_HEADER;
     }
     /* Internal */
-    if (is_inter_hdr_en)
+    if (packet_info->flags & BKN_RX_HEADER_F_HAS_INTERNAL_HEADER)
     {
         bkn_dpp_packet_parse_internal(sinfo, buff, buff_len, packet_info, is_oamp_punted, &is_trapped);
     }
@@ -3660,35 +3684,34 @@ bkn_dpp_packet_header_parse(
         packet_info->system_header_size += sinfo->udh_size;
     }
     /* OAM DM TOD header */
-    if(is_oam_dm_tod_en) {
+    if (packet_info->flags & BKN_RX_HEADER_F_HAS_OAM_DM_TOD_SECOND) {
         packet_info->system_header_size += BKN_DPP_OAM_DM_TOD_SIZE_BYTE;
     }
 
     /* Additional layer of system headers */
     if (is_oamp_punted && is_trapped)
     {
-        is_inter_hdr_en = FALSE;
-        is_tsh_en = FALSE;
         is_oamp_punted = FALSE;
         is_trapped = FALSE;
-        is_oam_dm_tod_en = FALSE;
         is_skip_udh = FALSE;
 
+        packet_info->flags = BKN_RX_HEADER_F_HAS_TWO_SYSTEM_HEADER;
+
         /* FTMH */
-        bkn_dpp_packet_parse_ftmh(sinfo, buff, buff_len, packet_info, &is_tsh_en, &is_inter_hdr_en);
+        bkn_dpp_packet_parse_ftmh(sinfo, buff, buff_len, packet_info);
         /* OTSH */
-        if (is_tsh_en == TRUE)
+        if (packet_info->flags & BKN_RX_HEADER_F_HAS_OTSH)
         {
-            bkn_dpp_packet_parse_otsh(sinfo, buff, buff_len, packet_info, &is_oam_dm_tod_en, &is_skip_udh);
+            bkn_dpp_packet_parse_otsh(sinfo, buff, buff_len, packet_info, &is_skip_udh);
         }
         /* Internal */
-        if (is_inter_hdr_en)
+        if (packet_info->flags & BKN_RX_HEADER_F_HAS_INTERNAL_HEADER)
         {
             bkn_dpp_packet_parse_internal(sinfo, buff, buff_len, packet_info, is_oamp_punted, &is_trapped);
         }
         /* OAMP Punted packets do not have UDH in the inner header for both JR1 and JR2 in JR1 mode */
         /* OAM DM TOD header */
-        if(is_oam_dm_tod_en) {
+        if (packet_info->flags & BKN_RX_HEADER_F_HAS_OAM_DM_TOD_SECOND) {
             packet_info->system_header_size += BKN_DPP_OAM_DM_TOD_SIZE_BYTE;
         }
     }
@@ -3704,10 +3727,7 @@ bkn_dnx_packet_parse_ftmh(
     bkn_switch_info_t *sinfo,
     uint8_t *buf,
     uint32_t buf_len,
-    bkn_dune_system_header_info_t *packet_info,
-    uint8_t *is_tsh_en,
-    uint8_t *is_inter_hdr_en,
-    uint8_t *is_oam_dm_tod_second_en)
+    bkn_dune_system_header_info_t *packet_info)
 {
     uint32_t fld_val;
     uint32_t pkt_offset = packet_info->system_header_size;
@@ -3740,14 +3760,14 @@ bkn_dnx_packet_parse_ftmh(
             BKN_DNX_FTMH_PPH_TYPE_IS_TSH_EN_MSB,
             BKN_DNX_FTMH_PPH_TYPE_IS_TSH_EN_NOF_BITS,
             &fld_val);
-    *is_tsh_en = fld_val;
+    packet_info->flags |= fld_val ? BKN_RX_HEADER_F_HAS_TSH : 0;
     /* FTMH: PPH-Type PPH base */
     bkn_bitstream_get_field(
             &buf[pkt_offset],
             BKN_DNX_FTMH_PPH_TYPE_IS_PPH_EN_MSB,
             BKN_DNX_FTMH_PPH_TYPE_IS_PPH_EN_NOF_BITS,
             &fld_val);
-    *is_inter_hdr_en = fld_val;
+    packet_info->flags |= fld_val ? BKN_RX_HEADER_F_HAS_INTERNAL_HEADER : 0;
     /* FTMH: TM-Destination-Extension-Present */
     bkn_bitstream_get_field(
             &buf[pkt_offset],
@@ -3779,9 +3799,9 @@ bkn_dnx_packet_parse_ftmh(
 
     pkt_offset += BKN_DNX_FTMH_BASE_SIZE;
 
-    DBG_DUNE(("FTMH(10-%u): source-system-port 0x%x action_type %u is_tsh_en %u is_inter_hdr_en %u\n",
+    DBG_DUNE(("FTMH(10-%u): source-system-port 0x%x action_type %u\n",
               pkt_offset, packet_info->ftmh.source_sys_port_aggregate,
-              packet_info->ftmh.action_type, *is_tsh_en, *is_inter_hdr_en));
+              packet_info->ftmh.action_type));
 
     /* FTMH LB-Key Extension */
     if (sinfo->ftmh_lb_key_ext_size > 0)
@@ -3824,7 +3844,7 @@ bkn_dnx_packet_parse_ftmh(
                     &fld_val);
             if ((fld_val == BKN_DNX_FTMH_ASE_OAM_SUB_TYPE_DM_1588) ||
                 (fld_val == BKN_DNX_FTMH_ASE_OAM_SUB_TYPE_DM_NTP)) {
-                *is_oam_dm_tod_second_en = TRUE;
+                packet_info->flags |= BKN_RX_HEADER_F_HAS_OAM_DM_TOD_SECOND;
             }
         }
         pkt_offset += BKN_DNX_FTMH_APP_SPECIFIC_EXT_SIZE;
@@ -3836,6 +3856,7 @@ bkn_dnx_packet_parse_ftmh(
         pkt_offset += BKN_DNX_FTMH_FLOW_ID_EXT_SIZE;
         DBG_DUNE(("FTMH Flow-ID Extension(3-%u) is present\n", pkt_offset));
     }
+    DBG_DUNE(("FTMH flags = 0x%08x\n", packet_info->flags));
 
     packet_info->system_header_size = pkt_offset;
 
@@ -3968,6 +3989,14 @@ bkn_dnx_packet_parse_internal(
         udh_en = FALSE;
     }
 
+    /* OAM DMM/DMR TOD second header: PPH+TOD+UDH */
+    if (sinfo->cmic_type == 'x') {
+        if (packet_info->flags & BKN_RX_HEADER_F_HAS_OAM_DM_TOD_SECOND) {
+            pkt_offset += BKN_DNX_TOD_SECOND_SIZE;
+            DBG_DUNE(("TOD second Header(4-%u) is present\n", pkt_offset));
+        }
+    }
+
     /* UDH Header */
     if (udh_en)
     {
@@ -3976,37 +4005,38 @@ bkn_dnx_packet_parse_internal(
         uint8_t data_type_2;
         uint8_t data_type_3;
 
-        /* UDH: UDH-Data-Type[0] */
-        bkn_bitstream_get_field(
-                &buf[pkt_offset],
-                BKN_DNX_UDH_DATA_TYPE_0_MSB,
-                BKN_DNX_UDH_DATA_TYPE_0_NOF_BITS,
-                &fld_val);
-        data_type_0 = fld_val;
-        /* UDH: UDH-Data-Type[1] */
-        bkn_bitstream_get_field(
-                &buf[pkt_offset],
-                BKN_DNX_UDH_DATA_TYPE_1_MSB,
-                BKN_DNX_UDH_DATA_TYPE_1_NOF_BITS,
-                &fld_val);
-        data_type_1 = fld_val;
-        /* UDH: UDH-Data-Type[2] */
-        bkn_bitstream_get_field(
-                &buf[pkt_offset],
-                BKN_DNX_UDH_DATA_TYPE_2_MSB,
-                BKN_DNX_UDH_DATA_TYPE_2_NOF_BITS,
-                &fld_val);
-        data_type_2 = fld_val;
-        /* UDH: UDH-Data-Type[3] */
-        bkn_bitstream_get_field(
-                &buf[pkt_offset],
-                BKN_DNX_UDH_DATA_TYPE_3_MSB,
-                BKN_DNX_UDH_DATA_TYPE_3_NOF_BITS,
-                &fld_val);
-        data_type_3 = fld_val;
-        pkt_offset += BKN_DNX_UDH_BASE_SIZE;
         if (sinfo->cmic_type == 'r')
         {
+            /* UDH: UDH-Data-Type[0] */
+            bkn_bitstream_get_field(
+                    &buf[pkt_offset],
+                    BKN_DNX_UDH_DATA_TYPE_0_MSB,
+                    BKN_DNX_UDH_DATA_TYPE_0_NOF_BITS,
+                    &fld_val);
+            data_type_0 = fld_val;
+            /* UDH: UDH-Data-Type[1] */
+            bkn_bitstream_get_field(
+                    &buf[pkt_offset],
+                    BKN_DNX_UDH_DATA_TYPE_1_MSB,
+                    BKN_DNX_UDH_DATA_TYPE_1_NOF_BITS,
+                    &fld_val);
+            data_type_1 = fld_val;
+            /* UDH: UDH-Data-Type[2] */
+            bkn_bitstream_get_field(
+                    &buf[pkt_offset],
+                    BKN_DNX_UDH_DATA_TYPE_2_MSB,
+                    BKN_DNX_UDH_DATA_TYPE_2_NOF_BITS,
+                    &fld_val);
+            data_type_2 = fld_val;
+            /* UDH: UDH-Data-Type[3] */
+            bkn_bitstream_get_field(
+                    &buf[pkt_offset],
+                    BKN_DNX_UDH_DATA_TYPE_3_MSB,
+                    BKN_DNX_UDH_DATA_TYPE_3_NOF_BITS,
+                    &fld_val);
+            data_type_3 = fld_val;
+            pkt_offset += BKN_DNX_UDH_BASE_SIZE;
+
             if (data_type_0)
             {
                 pkt_offset += sinfo->udh_length_type[0];
@@ -4026,6 +4056,36 @@ bkn_dnx_packet_parse_internal(
         }
         else
         {
+            /* UDH: UDH-Data-Type[0] */
+            bkn_bitstream_get_field(
+                    &buf[pkt_offset],
+                    BKN_DNX_UDH_DATA_TYPE_0_MSB,
+                    BKN_DNX_UDH_DATA_TYPE_0_NOF_BITS,
+                    &fld_val);
+            data_type_0 = fld_val;
+            /* UDH: UDH-Data-Type[1] */
+            bkn_bitstream_get_field(
+                    &buf[pkt_offset],
+                    BKN_DNX_UDH_DATA_TYPE_1_MSB,
+                    BKN_DNX_UDH_DATA_TYPE_1_NOF_BITS,
+                    &fld_val);
+            data_type_1 = fld_val;
+            /* UDH: UDH-Data-Type[2] */
+            bkn_bitstream_get_field(
+                    &buf[pkt_offset],
+                    BKN_DNX_UDH_DATA_TYPE_2_MSB,
+                    BKN_DNX_UDH_DATA_TYPE_2_NOF_BITS,
+                    &fld_val);
+            data_type_2 = fld_val;
+            /* UDH: UDH-Data-Type[3] */
+            bkn_bitstream_get_field(
+                    &buf[pkt_offset],
+                    BKN_DNX_UDH_DATA_TYPE_3_MSB,
+                    BKN_DNX_UDH_DATA_TYPE_3_NOF_BITS,
+                    &fld_val);
+            data_type_3 = fld_val;
+            pkt_offset += BKN_DNX_UDH_BASE_SIZE;
+
             pkt_offset += sinfo->udh_length_type[data_type_0];
             pkt_offset += sinfo->udh_length_type[data_type_1];
             pkt_offset += sinfo->udh_length_type[data_type_2];
@@ -4034,6 +4094,14 @@ bkn_dnx_packet_parse_internal(
         DBG_DUNE(("UDH base(1-%u) is present\n", pkt_offset));
     }
 
+    /* OAM DMM/DMR TOD second header: PPH+UDH+TOD */
+    if (sinfo->cmic_type == 'r') {
+        if (packet_info->flags & BKN_RX_HEADER_F_HAS_OAM_DM_TOD_SECOND) {
+            pkt_offset += BKN_DNX_TOD_SECOND_SIZE;
+            DBG_DUNE(("TOD second Header(4-%u) is present\n", pkt_offset));
+        }
+    }
+
     packet_info->system_header_size = pkt_offset;
 
     return 0;
@@ -4046,9 +4114,6 @@ bkn_dnx_packet_header_parse(
     uint32_t buff_len,
     bkn_dune_system_header_info_t *packet_info)
 {
-    uint8_t  is_oam_dm_tod_second_en = FALSE;
-    uint8_t  is_inter_hdr_en = FALSE;
-    uint8_t  is_tsh_en = FALSE;
     uint8_t  is_oamp_punted = FALSE;
     uint8_t  is_trapped = FALSE;
     uint8_t  idx = 0;
@@ -4057,12 +4122,12 @@ bkn_dnx_packet_header_parse(
         return -1;
     }
 
+    packet_info->flags = BKN_RX_HEADER_F_HAS_ONE_SYSTEM_HEADER;
     /* FTMH */
-    bkn_dnx_packet_parse_ftmh(sinfo, buff, buff_len, packet_info,
-                              &is_tsh_en, &is_inter_hdr_en, &is_oam_dm_tod_second_en);
+    bkn_dnx_packet_parse_ftmh(sinfo, buff, buff_len, packet_info);
 
     /* Time-Stamp */
-    if (is_tsh_en == TRUE)
+    if (packet_info->flags & BKN_RX_HEADER_F_HAS_TSH)
     {
         packet_info->system_header_size += BKN_DNX_TSH_SIZE;
         DBG_DUNE(("Time-Stamp Header(4-%u) is present\n", packet_info->system_header_size));
@@ -4079,27 +4144,18 @@ bkn_dnx_packet_header_parse(
     }
 
     /* Internal */
-    if (is_inter_hdr_en)
+    if (packet_info->flags & BKN_RX_HEADER_F_HAS_INTERNAL_HEADER)
     {
         bkn_dnx_packet_parse_internal(sinfo, buff, buff_len, packet_info, is_oamp_punted, &is_trapped);
     }
 
-    /* OAM DMM/DMR TOD second header */
-    if (is_oam_dm_tod_second_en == TRUE)
-    {
-        packet_info->system_header_size += BKN_DNX_TOD_SECOND_SIZE;
-        DBG_DUNE(("TOD second Header(4-%u) is present\n", packet_info->system_header_size));
-    }
-
     if (is_oamp_punted)
     {
         uint32_t oibih_oam_pdu_offset = 0;
-        is_oam_dm_tod_second_en = FALSE;
-        is_inter_hdr_en = FALSE;
-        is_tsh_en = FALSE;
         is_oamp_punted = FALSE;
         is_trapped = FALSE;
 
+        packet_info->flags = BKN_RX_HEADER_F_HAS_TWO_SYSTEM_HEADER;
         if (sinfo->cmic_type == 'r')
         {
             /* OIBIH: OAM_PDU_Offset */
@@ -4112,23 +4168,18 @@ bkn_dnx_packet_header_parse(
             DBG_DUNE(("OIBIH Header(14-%u) is present\n", packet_info->system_header_size));
         }
         /* FTMH */
-        bkn_dnx_packet_parse_ftmh(sinfo, buff, buff_len, packet_info,
-                                  &is_tsh_en, &is_inter_hdr_en, &is_oam_dm_tod_second_en);
+        bkn_dnx_packet_parse_ftmh(sinfo, buff, buff_len, packet_info);
         /* Time-Stamp */
-        if (is_tsh_en == TRUE)
+        if (packet_info->flags & BKN_RX_HEADER_F_HAS_TSH)
         {
             packet_info->system_header_size += BKN_DNX_TSH_SIZE;
             DBG_DUNE(("Time-Stamp Header(4-%u) is present\n", packet_info->system_header_size));
         }
         /* Internal */
-        if (is_inter_hdr_en)
+        if (packet_info->flags & BKN_RX_HEADER_F_HAS_INTERNAL_HEADER)
         {
             bkn_dnx_packet_parse_internal(sinfo, buff, buff_len, packet_info, is_oamp_punted, &is_trapped);
         }
-        if (is_oam_dm_tod_second_en == TRUE)
-        {
-            /* DO NOT have 4Bytes TOD second header. */
-        }
         if (oibih_oam_pdu_offset)
         {
             /*
@@ -4193,7 +4244,7 @@ bkn_do_api_rx(bkn_switch_info_t *sinfo, int chan, int budget)
     uint64_t pkt_dma;
     int drop_api;
     int ethertype;
-    int pktlen, pkt_hdr_size;
+    int pktlen, pkt_hdr_size = 0;
     int idx;
     int dcbs_done = 0;
     bkn_dune_system_header_info_t packet_info;
@@ -4248,9 +4299,13 @@ bkn_do_api_rx(bkn_switch_info_t *sinfo, int chan, int budget)
             sand_scratch_data[err_woff] = dcb[sinfo->dcb_wsize-1];
             meta = (uint32_t *)pkt;
             memset(&packet_info, 0, sizeof(bkn_dune_system_header_info_t));
-            /* Decode system headers and fill sratch data */
-            bkn_packet_header_parse(sinfo, pkt, (uint32_t)pktlen, &packet_info);
-            pkt_hdr_size = packet_info.system_header_size;
+            if (ENET_CH(sinfo, XGS_DMA_RX_CHAN + chan)) {
+                pkt_hdr_size = 0;
+            } else {
+                /* Decode system headers and fill sratch data */
+                bkn_packet_header_parse(sinfo, pkt, (uint32_t)pktlen, &packet_info);
+                pkt_hdr_size = packet_info.system_header_size;
+            }
         } else {
             if ((sinfo->cmic_type == 'x') || (sinfo->cmic_type == 'r')) {
                 meta = (uint32_t *)pkt;
@@ -4606,7 +4661,7 @@ bkn_do_skb_rx(bkn_switch_info_t *sinfo, int chan, int budget)
     bkn_filter_t *filter = NULL;
     uint32_t err_woff;
     uint32_t *dcb, *meta, *match_data;
-    int pktlen, pkt_hdr_size;
+    int pktlen, pkt_hdr_size = 0;
     uint8_t skip_hdrlen = 0;
     uint8_t eth_offset = 0;
     int idx;
@@ -4667,10 +4722,13 @@ bkn_do_skb_rx(bkn_switch_info_t *sinfo, int chan, int budget)
             meta = (uint32_t *)skb->data;
             pkt = skb->data;
             memset(&packet_info, 0, sizeof(bkn_dune_system_header_info_t));
-            /* Decode system headers and fill sratch data */
-            bkn_packet_header_parse(sinfo, pkt, (uint32_t)pktlen, &packet_info);
-            pkt_hdr_size = packet_info.system_header_size;
-
+            if (ENET_CH(sinfo, XGS_DMA_RX_CHAN + chan)) {
+                pkt_hdr_size = 0;
+            } else {
+                /* Decode system headers and fill scratch data */
+                bkn_packet_header_parse(sinfo, pkt, (uint32_t)pktlen, &packet_info);
+                pkt_hdr_size = packet_info.system_header_size;
+            }
 
             if (knet_hw_tstamp_rx_pre_process_cb) {
                 if ((knet_hw_tstamp_rx_pre_process_cb(sinfo->dev_no, pkt, packet_info.ftmh.source_sys_port_aggregate, NULL)) >= 0) {
@@ -4680,16 +4738,17 @@ bkn_do_skb_rx(bkn_switch_info_t *sinfo, int chan, int budget)
                     meta = (uint32_t *)(skb->data + skip_hdrlen);
                     pkt = (skb->data + skip_hdrlen);
                     memset(&packet_info, 0, sizeof(bkn_dune_system_header_info_t));
-
-                    /* Decode system headers and fill sratch data */
-                    bkn_packet_header_parse(sinfo, pkt, (uint32_t)(pktlen - skip_hdrlen), &packet_info);
-                    pkt_hdr_size = packet_info.system_header_size;
-
+                    if (ENET_CH(sinfo, XGS_DMA_RX_CHAN + chan)) {
+                        pkt_hdr_size = 0;
+                    } else {
+                        /* Decode system headers and fill scratch data */
+                        bkn_packet_header_parse(sinfo, pkt, (uint32_t)(pktlen - skip_hdrlen), &packet_info);
+                        pkt_hdr_size = packet_info.system_header_size;
+                    }
                     knet_hw_tstamp_rx_pre_process_cb(sinfo->dev_no, pkt + pkt_hdr_size,
                                                      packet_info.ftmh.source_sys_port_aggregate, (int *)&eth_offset);
-                    }
+                }
             }
-
         } else {
             if ((sinfo->cmic_type == 'x') || (sinfo->cmic_type == 'r')) {
                 meta = (uint32_t *)skb->data;
@@ -5091,7 +5150,17 @@ bkn_rx_debug_dump(bkn_switch_info_t *sinfo, int chan)
     }
 
     irq_stat = dma_stat = dma_ctrl = 0;
-    if (DEV_IS_CMICX(sinfo)) {
+    if (DEV_IS_CMICR(sinfo)) {
+        dev_read32(sinfo,
+                   CMICR_INTR_STATr,
+                   &irq_stat);
+        dev_read32(sinfo,
+                   CMICR_DMA_STATr,
+                   &dma_stat);
+        dev_read32(sinfo,
+                   CMICR_DMA_CTRLr + 0x80 * (XGS_DMA_RX_CHAN + chan),
+                   &dma_ctrl);
+    } else if (DEV_IS_CMICX(sinfo)) {
         dev_read32(sinfo,
                    CMICX_IRQ_STATr,
                    &irq_stat);
@@ -6207,9 +6276,18 @@ static void
 bkn_poll_controller(struct net_device *dev)
 {
     bkn_priv_t *priv = netdev_priv(dev);
+    struct list_head *list;
+    bkn_switch_info_t *sinfo;
 
     disable_irq(dev->irq);
-    bkn_isr(priv->sinfo);
+    list_for_each(list, &_sinfo_list) {
+        sinfo = (bkn_switch_info_t *)list;
+        if (sinfo->ndevs && sinfo->ndev_max > 0 && sinfo->ndev_max > priv->id) {
+            if (sinfo->ndevs[priv->id] && sinfo->ndevs[priv->id] == dev) {
+                bkn_isr(sinfo);
+            }
+        }
+    }
     enable_irq(dev->irq);
 }
 #endif
@@ -6289,6 +6367,7 @@ bkn_open(struct net_device *dev)
     }
 
     if (!sinfo->basedev_suspended) {
+        netif_carrier_on(dev);
         netif_start_queue(dev);
     }
 
@@ -6482,6 +6561,7 @@ bkn_stop(struct net_device *dev)
     unsigned long flags;
 
     netif_stop_queue(dev);
+    netif_carrier_off(dev);
 
     /* Check if base device */
     if (priv->id <= 0) {
@@ -7700,6 +7780,33 @@ bkn_init_ndev(u8 *mac, char *name)
     return dev;
 }
 
+/*
+ * Lookup Ethernet device by name.
+ */
+static struct net_device *
+bkn_lookup_ndev(u8 *mac, char *name)
+{
+    struct net_device *dev = NULL;
+
+    if (mac == NULL || name == NULL ||  *name == '\0') {
+        DBG_WARN(("Invalid input parameters.\n"));
+        return NULL;
+    }
+    /* get Ethernet device */
+    dev = netdev_get_by_name(current->nsproxy->net_ns, name, NULL, GFP_ATOMIC);
+    if (dev == NULL) {
+        DBG_WARN(("Error to get Ethernet device by name.\n"));
+        return NULL;
+    }
+    if (dev->dev_addr[0] != mac[0] || dev->dev_addr[1] != mac[1] || dev->dev_addr[2] != mac[2] ||
+        dev->dev_addr[3] != mac[3] || dev->dev_addr[4] != mac[4] || dev->dev_addr[5] != mac[5]) {
+        DBG_WARN(("The Mac address doesn't match the Ethernet device that found by name.\n"));
+        netdev_put(dev, NULL);
+        return NULL;
+    }
+    return dev;
+}
+
 /*
  * Device Link Control Proc Read Entry
  */
@@ -8266,7 +8373,7 @@ bkn_proc_debug_show(struct seq_file *m, void *v)
     seq_printf(m, "  ft_tpid:        %d\n", ft_tpid);
     seq_printf(m, "  ft_pri:         %d\n", ft_pri);
     seq_printf(m, "  ft_cfi:         %d\n", ft_cfi);
-    seq_printf(m, "  ft_tpid:        %d\n", ft_vid);
+    seq_printf(m, "  ft_vid:         %d\n", ft_vid);
     seq_printf(m, "Active IOCTLs:\n");
     seq_printf(m, "  Command:        %d\n", ioctl_cmd);
     seq_printf(m, "  Event:          %d\n", ioctl_evt);
@@ -8284,6 +8391,7 @@ bkn_proc_debug_show(struct seq_file *m, void *v)
         seq_printf(m, "  rx_chans:       %d\n", sinfo->rx_chans);
         seq_printf(m, "  cdma_chans:     0x%x\n", sinfo->cdma_channels);
         seq_printf(m, "  unet_chans:     0x%x\n", sinfo->unet_channels);
+        seq_printf(m, "  enet_chans:     0x%x\n", sinfo->enet_channels);
         seq_printf(m, "  irq_mask:       0x%x\n", sinfo->irq_mask);
         seq_printf(m, "  dma_events:     0x%x\n", sinfo->dma_events);
         seq_printf(m, "  dcb_dma:        0x%p\n", (void *)(sal_paddr_t)sinfo->dcb_dma);
@@ -8739,6 +8847,84 @@ struct proc_ops bkn_proc_ptp_stats_file_ops = {
     .proc_release =     single_release,
 };
 
+/*
+ * Device Associated virtual Ethernet interfaces Proc Entry
+ */
+static int
+bkn_proc_ndev_show(struct seq_file *m, void *v)
+{
+    int unit = 0;
+    struct list_head *list, *plist;
+    bkn_switch_info_t *sinfo;
+    struct net_device *dev;
+    bkn_priv_t *priv, *lpriv;
+    int id, idx;
+    unsigned long flags;
+
+    list_for_each(list, &_sinfo_list) {
+        sinfo = (bkn_switch_info_t *)list;
+        spin_lock_irqsave(&sinfo->lock, flags);
+        seq_printf(m, "Device virtual Ethernet interfaces (dev_no %d):\n", unit);
+        if (sinfo->ndevs && sinfo->ndev_max > 0) {
+            for (id = 0; id < sinfo->ndev_max; id++) {
+                if (sinfo->ndevs[id] == NULL) {
+                    continue;
+                }
+                dev = sinfo->ndevs[id];
+                priv = netdev_priv(dev);
+                seq_printf(m, "  Dev Id: %d max. %d [sinfo @%p]\n", id, sinfo->ndev_max, sinfo);
+                seq_printf(m, "      My Station: %s (dev @%p)\n", dev->name, dev);
+                seq_printf(m, "          MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+                              dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
+                              dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
+                if (sinfo->dev_no == priv->sinfo->dev_no) {
+                    seq_printf(m, "      Private: (priv @%p)\n", priv);
+                    seq_printf(m, "          id        = %d\n", priv->id);
+                    seq_printf(m, "          dev       = @%p\n", priv->dev);
+                    seq_printf(m, "          sinfo     = @%p\n", priv->sinfo);
+                    seq_printf(m, "          type      = %d\n", priv->type);
+                    seq_printf(m, "          vlan      = %d\n", priv->vlan);
+                    seq_printf(m, "          port      = %d\n", priv->port);
+                    seq_printf(m, "          phys_port = %d\n", priv->phys_port);
+                    seq_printf(m, "          qnum      = %d\n", priv->qnum);
+                    seq_printf(m, "          flags     = 0x%x %s\n", priv->flags,
+                                                                     priv->flags & KCOM_NETIF_F_USE_SHARED_NDEV ? "(shared)" : "");
+                    seq_printf(m, "          ref_count = %d\n", priv->ref_count);
+                    seq_printf(m, "          System Header (%dB): 0x", priv->system_headers_size);
+                    for (idx = 0; idx < priv->system_headers_size; idx++) {
+                        seq_printf(m, "%02x", priv->system_headers[idx]);
+                    }
+                    seq_printf(m, "\n");
+                }
+            }
+            if (!list_empty(&sinfo->ndev_list)) {
+                seq_printf(m, "      sinfo->ndev_list: [priv->id @priv]\n");
+                list_for_each(plist, &sinfo->ndev_list) {
+                    lpriv = (bkn_priv_t *)plist;
+                    seq_printf(m, "           %3d @%p\n", lpriv->id, lpriv);
+                }
+            }
+        }
+        unit++;
+        spin_unlock_irqrestore(&sinfo->lock, flags);
+    }
+
+    return 0;
+}
+
+static int bkn_proc_ndev_open(struct inode * inode, struct file * file)
+{
+    return single_open(file, bkn_proc_ndev_show, NULL);
+}
+
+struct proc_ops bkn_proc_ndev_file_ops = {
+    PROC_OWNER(THIS_MODULE)
+    .proc_open =        bkn_proc_ndev_open,
+    .proc_read =        seq_read,
+    .proc_lseek =       seq_lseek,
+    .proc_release =     single_release,
+};
+
 
 static int
 bkn_proc_init(void)
@@ -8773,6 +8959,10 @@ bkn_proc_init(void)
     if (entry == NULL) {
         return -1;
     }
+    PROC_CREATE(entry, "ndev", 0666, bkn_proc_root, &bkn_proc_ndev_file_ops);
+    if (entry == NULL) {
+        return -1;
+    }
 
     return 0;
 }
@@ -8787,6 +8977,7 @@ bkn_proc_cleanup(void)
     remove_proc_entry("stats", bkn_proc_root);
     remove_proc_entry("dstats", bkn_proc_root);
     remove_proc_entry("ptp_stats", bkn_proc_root);
+    remove_proc_entry("ndev", bkn_proc_root);
     return 0;
 }
 
@@ -9127,6 +9318,11 @@ bkn_knet_hw_reset(kcom_msg_hw_reset_t *kmsg, int len)
         return sizeof(kcom_msg_hdr_t);
     }
 
+    if (sinfo->cmic_type == 0) {
+        DBG_KCOM(("HW reset: Do nothing when CMIC architecture is undecided\n"));
+        return sizeof(kcom_msg_hdr_t);
+    }
+
     cfg_api_lock(sinfo, &flags);
 
     if (kmsg->channels == 0) {
@@ -9291,6 +9487,7 @@ bkn_knet_hw_info(kcom_msg_hw_info_t *kmsg, int len)
         }
         sinfo->udh_size = kmsg->udh_size;
         sinfo->oamp_punt = kmsg->oamp_punted;
+        sinfo->enet_channels = kmsg->enet_channels;
         sinfo->no_skip_udh_check = kmsg->no_skip_udh_check;
         sinfo->oam_dm_tod_exist = kmsg->oam_dm_tod_exist;
         sinfo->system_headers_mode = kmsg->system_headers_mode;
@@ -9430,45 +9627,57 @@ bkn_knet_netif_create(kcom_msg_netif_create_t *kmsg, int len)
         bkn_dev_mac[5]++;
         ma = bkn_dev_mac;
     }
-    if ((dev = bkn_init_ndev(ma, kmsg->netif.name)) == NULL) {
-        kmsg->hdr.status = KCOM_E_RESOURCE;
-        return sizeof(kcom_msg_hdr_t);
-    }
-    priv = netdev_priv(dev);
-    priv->dev = dev;
-    priv->sinfo = sinfo;
-    priv->type = kmsg->netif.type;
-    priv->vlan = kmsg->netif.vlan;
-    /* System headers are prepared at BCM API for Dune headers */
-    if (device_is_sand(sinfo)) {
-        int idx = 0;
-        priv->system_headers_size = kmsg->netif.system_headers_size;
-        for (idx = 0; idx < KCOM_NETIF_SYSTEM_HEADERS_SIZE_MAX; idx++)
-        {
-            priv->system_headers[idx] = kmsg->netif.system_headers[idx];
+    if ((dev = bkn_lookup_ndev(ma, kmsg->netif.name)) == NULL) {
+        if ((dev = bkn_init_ndev(ma, kmsg->netif.name)) == NULL) {
+            kmsg->hdr.status = KCOM_E_RESOURCE;
+            return sizeof(kcom_msg_hdr_t);
         }
-    }
-    if (priv->type == KCOM_NETIF_T_PORT) {
-        priv->port = kmsg->netif.port;
-        priv->phys_port = kmsg->netif.phys_port;
-        priv->qnum = kmsg->netif.qnum;
-        memset(&(priv->link_settings), 0, sizeof(struct ethtool_link_settings));
-    } else {
-        if (device_is_sand(sinfo) && (priv->type == KCOM_NETIF_T_VLAN)) {
-            /* PTCH.SSPA */
+        priv = netdev_priv(dev);
+        priv->dev = dev;
+        priv->sinfo = sinfo;
+        priv->type = kmsg->netif.type;
+        priv->vlan = kmsg->netif.vlan;
+        /* System headers are prepared at BCM API for Dune headers */
+        if (device_is_sand(sinfo)) {
+            int idx = 0;
+            priv->system_headers_size = kmsg->netif.system_headers_size;
+            for (idx = 0; idx < KCOM_NETIF_SYSTEM_HEADERS_SIZE_MAX; idx++)
+            {
+                priv->system_headers[idx] = kmsg->netif.system_headers[idx];
+            }
+        }
+        if (priv->type == KCOM_NETIF_T_PORT) {
             priv->port = kmsg->netif.port;
+            priv->phys_port = kmsg->netif.phys_port;
             priv->qnum = kmsg->netif.qnum;
+            memset(&(priv->link_settings), 0, sizeof(struct ethtool_link_settings));
         } else {
-            priv->port = -1;
+            if (device_is_sand(sinfo) && (priv->type == KCOM_NETIF_T_VLAN)) {
+                /* PTCH.SSPA */
+                priv->port = kmsg->netif.port;
+                priv->qnum = kmsg->netif.qnum;
+            } else {
+                priv->port = -1;
+            }
         }
-    }
-    priv->flags = kmsg->netif.flags;
-    priv->cb_user_data = kmsg->netif.cb_user_data;
+        priv->flags = kmsg->netif.flags;
+        priv->cb_user_data = kmsg->netif.cb_user_data;
 
-    /* Force RCPU encapsulation if rcpu_mode */
-    if (rcpu_mode) {
-        priv->flags |= KCOM_NETIF_F_RCPU_ENCAP;
-        DBG_RCPU(("RCPU auto-enabled\n"));
+        /* Force RCPU encapsulation if rcpu_mode */
+        if (rcpu_mode) {
+            priv->flags |= KCOM_NETIF_F_RCPU_ENCAP;
+            DBG_RCPU(("RCPU auto-enabled\n"));
+        }
+        priv->ref_count=1;
+    } else {
+        if ((kmsg->netif.flags & KCOM_NETIF_F_USE_SHARED_NDEV) == 0) {
+            netdev_put(dev, NULL);
+            kmsg->hdr.status = KCOM_E_RESOURCE;
+            return sizeof(kcom_msg_hdr_t);
+        }
+        priv = netdev_priv(dev);
+        priv->flags |= KCOM_NETIF_F_USE_SHARED_NDEV;
+        priv->ref_count++;
     }
 
     id = kmsg->netif.id;
@@ -9533,40 +9742,49 @@ bkn_knet_netif_create(kcom_msg_netif_create_t *kmsg, int len)
     }
     if (rv != KCOM_E_NONE) {
         spin_unlock_irqrestore(&sinfo->lock, flags);
-        unregister_netdev(dev);
-        free_netdev(dev);
+        priv->ref_count--;
+        if (priv->ref_count <= 0) {
+            unregister_netdev(dev);
+            free_netdev(dev);
+        } else {
+            netdev_put(dev, NULL);
+        }
         kmsg->hdr.status = rv;
         return sizeof(kcom_msg_hdr_t);
     }
-
-    priv->id = id;
-    DBG_NDEV(("Add netif ID %d to table\n", id));
     sinfo->ndevs[id] = dev;
 
-    found = 0;
-    list_for_each(list, &sinfo->ndev_list) {
-        lpriv = (bkn_priv_t *)list;
-        if (id < lpriv->id) {
-            found = 1;
-            break;
+    if (priv->ref_count == 1) {
+        priv->id = id;
+        DBG_NDEV(("Add netif ID %d to table\n", id));
+
+        found = 0;
+        list_for_each(list, &sinfo->ndev_list) {
+            lpriv = (bkn_priv_t *)list;
+            if (id < lpriv->id) {
+                found = 1;
+                break;
+            }
         }
-    }
 
-    if (found) {
-        /* Replace previously removed interface */
-        list_add_tail(&priv->list, &lpriv->list);
+        if (found) {
+            /* Replace previously removed interface */
+            list_add_tail(&priv->list, &lpriv->list);
+        } else {
+            /* No holes - add to end of list */
+            list_add_tail(&priv->list, &sinfo->ndev_list);
+        }
     } else {
-        /* No holes - add to end of list */
-        list_add_tail(&priv->list, &sinfo->ndev_list);
+        DBG_NDEV(("Use Shared Netif ID %d\n", id));
     }
+    if (priv->ref_count == 1) {
+        DBG_VERB(("Assigned ID %d to Ethernet device %s\n",
+                  priv->id, dev->name));
 
-    DBG_VERB(("Assigned ID %d to Ethernet device %s\n",
-              priv->id, dev->name));
-
-    kmsg->netif.id = priv->id;
-    memcpy(kmsg->netif.macaddr, dev->dev_addr, 6);
-    memcpy(kmsg->netif.name, dev->name, KCOM_NETIF_NAME_MAX - 1);
-
+        kmsg->netif.id = priv->id;
+        memcpy(kmsg->netif.macaddr, dev->dev_addr, 6);
+        memcpy(kmsg->netif.name, dev->name, KCOM_NETIF_NAME_MAX - 1);
+    }
     list_for_each(list, &netif_create_cb_list) {
         netif_create_cb = list_entry(list, bkn_netif_cb_t, list);
         if (netif_create_cb->cb(dev, sinfo->dev_no, &kmsg->netif) != 0) {
@@ -9576,14 +9794,6 @@ bkn_knet_netif_create(kcom_msg_netif_create_t *kmsg, int len)
     }
     spin_unlock_irqrestore(&sinfo->lock, flags);
 
-    if (device_is_sand(sinfo)) {
-        int idx = 0;
-        for (idx = 0; idx < priv->system_headers_size; idx++) {
-            DBG_DUNE(("System Header[%d]: 0x%02x\n", idx,
-                      priv->system_headers[idx]));
-        }
-    }
-
     return sizeof(*kmsg);
 }
 
@@ -9595,7 +9805,6 @@ bkn_knet_netif_destroy(kcom_msg_netif_destroy_t *kmsg, int len)
     bkn_priv_t *priv;
     struct list_head *list;
     unsigned long flags;
-    int found;
     bkn_netif_cb_t *netif_destroy_cb;
     kcom_netif_t kcom_netif;
 
@@ -9608,23 +9817,21 @@ bkn_knet_netif_destroy(kcom_msg_netif_destroy_t *kmsg, int len)
     }
 
     cfg_api_lock(sinfo, &flags);
-
-    found = 0;
-    list_for_each(list, &sinfo->ndev_list) {
-        priv = (bkn_priv_t *)list;
-        if (kmsg->hdr.id == priv->id) {
-            found = 1;
-            break;
-        }
-    }
-
-    if (!found) {
+    priv = bkn_netif_lookup(sinfo, kmsg->hdr.id);
+    /*
+     * If not found.
+     */
+    if (priv == NULL) {
         cfg_api_unlock(sinfo, &flags);
         kmsg->hdr.status = KCOM_E_NOT_FOUND;
         return sizeof(kcom_msg_hdr_t);
     }
 
-    list_del(&priv->list);
+    priv->ref_count--;
+
+    if (priv->ref_count <= 0) {
+        list_del(&priv->list);
+    }
 
     if (priv->id < sinfo->ndev_max) {
         sinfo->ndevs[priv->id] = NULL;
@@ -9646,11 +9853,15 @@ bkn_knet_netif_destroy(kcom_msg_netif_destroy_t *kmsg, int len)
         }
     }
 
-    DBG_VERB(("Removing virtual Ethernet device %s (%d).\n",
-              dev->name, priv->id));
+    if (priv->ref_count <= 0) {
+        DBG_VERB(("Removing virtual Ethernet device %s (%d).\n",
+                  dev->name, priv->id));
 
-    unregister_netdev(dev);
-    free_netdev(dev);
+        unregister_netdev(dev);
+        free_netdev(dev);
+    } else {
+        netdev_put(dev, NULL);
+    }
 
     return sizeof(kcom_msg_hdr_t);
 }
@@ -9662,7 +9873,7 @@ bkn_knet_netif_list(kcom_msg_netif_list_t *kmsg, int len)
     bkn_priv_t *priv;
     struct list_head *list;
     unsigned long flags;
-    int idx;
+    int id, idx;
 
     kmsg->hdr.type = KCOM_MSG_TYPE_RSP;
 
@@ -9675,16 +9886,27 @@ bkn_knet_netif_list(kcom_msg_netif_list_t *kmsg, int len)
     spin_lock_irqsave(&sinfo->lock, flags);
 
     idx = 0;
-    list_for_each(list, &sinfo->ndev_list) {
-        if (idx >= KCOM_NETIF_MAX) {
-            DBG_WARN(("Too many network interfaces to list (max %d).\n",
-                      KCOM_NETIF_MAX));
-            break;
+    if (sinfo->ndevs && sinfo->ndev_max > 0) {
+        for (id = 0; id < sinfo->ndev_max; id++) {
+            if (sinfo->ndevs[id] == NULL) {
+                continue;
+            }
+            kmsg->id[idx] = id;
+            idx++;
+        }
+    } else {
+        list_for_each(list, &sinfo->ndev_list) {
+            if (idx >= KCOM_NETIF_MAX) {
+                DBG_WARN(("Too many network interfaces to list (max %d).\n",
+                          KCOM_NETIF_MAX));
+                break;
+            }
+            priv = (bkn_priv_t *)list;
+            kmsg->id[idx] = priv->id;
+            idx++;
         }
-        priv = (bkn_priv_t *)list;
-        kmsg->id[idx] = priv->id;
-        idx++;
     }
+
     kmsg->ifcnt = idx;
 
     spin_unlock_irqrestore(&sinfo->lock, flags);
@@ -10328,6 +10550,9 @@ _cleanup(void)
             priv = list_entry(sinfo->ndev_list.next, bkn_priv_t, list);
             list_del(&priv->list);
             dev = priv->dev;
+            while(--priv->ref_count > 0) {
+                netdev_put(dev, NULL);
+            }
             DBG_VERB(("Removing virtual Ethernet device %s.\n", dev->name));
             unregister_netdev(dev);
             free_netdev(dev);
@@ -10467,6 +10692,7 @@ bkn_knet_dev_init(int d)
         priv->vlan = 1;
         priv->port = -1;
         priv->id = -1;
+        priv->ref_count = 1;
     }
 
     if (use_napi) {
@@ -10817,7 +11043,7 @@ bkn_filter_cb_register_by_name(knet_filter_cb_f filter_cb, char *filter_name)
         return -1;
     }
     fcb->cb = filter_cb;
-    strcpy(fcb->desc, filter_name);
+    strlcpy(fcb->desc, filter_name, sizeof(fcb->desc));
     list_add_tail(&fcb->list, &filter_cb_list);
 
     /* Check if any existing filter matches the registered name */
diff --git a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-ptp-clock/Makefile b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-ptp-clock/Makefile
new file mode 100644
index 000000000000..f8df885dd208
--- /dev/null
+++ b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-ptp-clock/Makefile
@@ -0,0 +1,99 @@
+#
+#  Copyright 2017 Broadcom
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License, version 2, as
+#  published by the Free Software Foundation (the "GPL").
+#
+#  This program is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  General Public License version 2 (GPLv2) for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  version 2 (GPLv2) along with this source code.
+#
+# -*- Makefile -*-
+# $Id: Makefile,v 1.3 2012/07/17 07:39:51 mlarsen Exp $
+# $Copyright: (c) 2005 Broadcom Corp.
+# All Rights Reserved.$
+#
+LOCALDIR = systems/linux/kernel/modules/bcm-ptp-clock
+
+include ${SDK}/make/Make.config
+
+LIBS = $(LIBDIR)/libkern.a
+
+KERNEL_MODULE_DIR = kernel_module
+
+THIS_MOD_NAME := linux-bcm-ptp-clock
+MODULE = $(LIBDIR)/$(THIS_MOD_NAME).o
+KMODULE = $(LIBDIR)/$(THIS_MOD_NAME).ko
+
+ifeq (1,$(NO_PRECOMPILED_MODULE))
+# {
+BDE_SYMVERS := ${BLDDIR}/../../../../bde/linux/kernel/Module.symvers
+KNET_SYMVERS := ${BLDDIR}/../bcm-knet/Module.symvers
+KBUILD_EXTRA_SYMBOLS := $(BDE_SYMVERS) $(KNET_SYMVERS)
+export KBUILD_EXTRA_SYMBOLS
+#
+# These are the objects which need to be compiled, in the kernel, to
+# created the module object file.
+#
+SRCS_COMPOSING = bcm-ptp-clock.c ../shared/gmodule.c
+OBJECTS_COMPOSING = "bcm-ptp-clock.o gmodule.o"
+
+build: $(KMODULE)
+#
+# Note that for NO_PRECOMPILED_MODULE, the subdirectory 'systems/linux/kernel/modules/bcm-ptp-clock/kernel_module'
+# is not created and all action is done in systems/linux/kernel/modules/bcm-ptp-clock
+#
+$(KMODULE): $(SRCS_COMPOSING)
+	mkdir -p $(BLDDIR)
+	rm -fr $(BLDDIR)/$(KERNEL_MODULE_DIR)
+	rm -f $(BLDDIR)/*.c
+	rm -f $(BLDDIR)/*.o
+	rm -f $(BLDDIR)/*.ko
+	cp ${SDK}/make/Makefile.linux-kmodule $(BLDDIR)/Makefile
+	cp ./*.c $(BLDDIR)/
+	cp ../shared/*.c $(BLDDIR)/
+	#
+	# Wait until bcm-knet compilation is over so that we can copy its resultant
+	# Module.symvers
+	#
+	if [ ! -f ${KNET_SYMVERS} ]; then sleep 5; fi
+	cat ${KBUILD_EXTRA_SYMBOLS} > $(BLDDIR)/Module.symvers
+	MOD_OBJS=$(OBJECTS_COMPOSING) MOD_NAME=$(THIS_MOD_NAME) $(MAKE) -C $(BLDDIR) $(THIS_MOD_NAME).ko LOC_BLDDIR=$(BLDDIR) LOC_SRCDIR=$(PWD)
+# }
+else
+# {
+KBUILD_EXTRA_SYMBOLS := ${BLDDIR}/../../../../bde/linux/kernel/kernel_module/Module.symvers
+KBUILD_EXTRA_SYMBOLS += ${BLDDIR}/../bcm-knet/kernel_module/Module.symvers
+export KBUILD_EXTRA_SYMBOLS
+
+build: $(MODULE) $(KMODULE)
+
+# BCM PTP Clock Device
+
+$(MODULE): $(BLDDIR)/.tree $(BOBJS) $(LIBS)
+	$(LD) $(MODULE_LDFLAGS) -r -d $(BOBJS) $(LIBS) -o $@
+
+$(KMODULE): $(MODULE)
+	rm -fr $(BLDDIR)/$(KERNEL_MODULE_DIR)
+	mkdir $(BLDDIR)/$(KERNEL_MODULE_DIR)
+	cp ${SDK}/make/Makefile.linux-kmodule $(BLDDIR)/$(KERNEL_MODULE_DIR)/Makefile
+	cat ${KBUILD_EXTRA_SYMBOLS} > $(BLDDIR)/$(KERNEL_MODULE_DIR)/Module.symvers
+	MOD_NAME=$(THIS_MOD_NAME) $(MAKE) -C $(BLDDIR)/$(KERNEL_MODULE_DIR) $(THIS_MOD_NAME).ko
+
+# Make.depend is before clean:: so that Make.depend's clean:: runs first.
+include ${SDK}/make/Make.depend
+# }
+endif
+
+clean::
+	$(RM) $(BLDDIR)/version.c $(BLDDIR)/version.o
+	$(RM) $(BOBJS) $(MODULE)
+
+ifneq ($(kernel_version),2_4)
+.PHONY: build
+endif
diff --git a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-ptp-clock/bcm-ptp-clock.c b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-ptp-clock/bcm-ptp-clock.c
index 2b31663df76d..5944607cb1eb 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-ptp-clock/bcm-ptp-clock.c
+++ b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-ptp-clock/bcm-ptp-clock.c
@@ -36,7 +36,11 @@ MODULE_AUTHOR("Broadcom Corporation");
 MODULE_DESCRIPTION("PTP Clock Driver for Broadcom XGS/DNX Switch");
 MODULE_LICENSE("GPL");
 
-#if LINUX_VERSION_CODE > KERNEL_VERSION(3,17,0)
+#if ((LINUX_VERSION_CODE > KERNEL_VERSION(3,17,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(6,0,0)))
+#define PTPCLOCK_SUPPORTED
+#endif
+
+#ifdef PTPCLOCK_SUPPORTED
 #include <linux-bde.h>
 #include <kcom.h>
 #include <bcm-knet.h>
@@ -45,7 +49,7 @@ MODULE_LICENSE("GPL");
 #include <linux/etherdevice.h>
 #include <linux/netdevice.h>
 #include <linux/sysfs.h>
-
+#include <linux-bde.h>
 
 #include <linux/random.h>
 #include <linux/seq_file.h>
@@ -190,6 +194,7 @@ u32 hostcmd_regs[5] = { 0 };
 
 /* Service request commands to Firmware. */
 enum {
+#ifdef BDE_EDK_SUPPORT
     BKSYNC_DONE                     = (0x0),
     BKSYNC_INIT                     = (0x1),
     BKSYNC_DEINIT                   = (0x2),
@@ -207,10 +212,30 @@ enum {
     BKSYNC_GPIO                     = (0xe),
     BKSYNC_EVLOG                    = (0xf),
     BKSYNC_EXTTSLOG                 = (0x10),
-    BKSYNC_GPIO_PHASEOFFSET         = (0x11),
+    BKSYNC_GET_EXTTS_BUFF           = (0x11),
+    BKSYNC_GPIO_PHASEOFFSET         = (0x12),
+#else
+    BKSYNC_DONE                     = (0x1),
+    BKSYNC_INIT                     = (0x2),
+    BKSYNC_DEINIT                   = (0x3),
+    BKSYNC_GETTIME                  = (0x4),
+    BKSYNC_SETTIME                  = (0x5),
+    BKSYNC_FREQCOR                  = (0x6),
+    BKSYNC_PBM_UPDATE               = (0x7),
+    BKSYNC_ADJTIME                  = (0x8),
+    BKSYNC_GET_TSTIME               = (0x9),
+    BKSYNC_MTP_TS_UPDATE_ENABLE     = (0xa),
+    BKSYNC_MTP_TS_UPDATE_DISABLE    = (0xb),
+    BKSYNC_ACK_TSTIME               = (0xc),
+    BKSYNC_SYSINFO                  = (0xd),
+    BKSYNC_BROADSYNC                = (0xe),
+    BKSYNC_GPIO                     = (0xf),
+    BKSYNC_EVLOG                    = (0x10),
+    BKSYNC_EXTTSLOG                 = (0x11),
+    BKSYNC_GPIO_PHASEOFFSET         = (0x12),
+#endif
 };
 
-
 enum {
     KSYNC_SYSINFO_UC_PORT_NUM       = (0x1),
     KSYNC_SYSINFO_UC_PORT_SYSPORT   = (0x2),
@@ -437,17 +462,25 @@ typedef struct bksync_evlog_s {
 #define NUM_EXT_TS          6       /* gpio0 = event0 ..... gpio5 = event5 */
 #define NUM_EVENT_TS        128     /* Directly mapped to PTP_MAX_TIMESTAMPS from ptp_private.h */
 typedef struct bksync_fw_extts_event_s {
-    u32         ts_event_id;
+    u32 ts_event_id;
     fw_tstamp_t tstamp;
 } __ATTRIBUTE_PACKED__ bksync_fw_extts_event_t;
 
 typedef struct bksync_extts_log_s {
-    u32                     head;   /* Read pointer - Updated by HOST */
-    u32                     tail;   /* Write pointer - Updated by FW */
+    u32 head;   /* Read pointer - Updated by HOST */
+    u32 tail;   /* Write pointer - Updated by FW */
     bksync_fw_extts_event_t event_ts[NUM_EVENT_TS];
-    u32                     overflow;
+    u32 overflow;
 } __ATTRIBUTE_PACKED__ bksync_fw_extts_log_t;
 
+typedef struct bksync_fw_comm_s {
+    u32 cmd;
+    u32 dw1[2];
+    u32 dw2[2];
+    u32 head;   /* Read pointer - Updated by HOST */
+    u32 tail;   /* Write pointer - Updated by FW */
+} __ATTRIBUTE_PACKED__ bksync_fw_comm_t;
+
 struct bksync_extts_event {
     int enable[NUM_EXT_TS];
     int head;
@@ -475,6 +508,7 @@ typedef struct bksync_init_info_s {
     u32 host_cpu_port;
     u32 host_cpu_sysport;
     u32 udh_len;
+    u8  application_v2;
 } bksync_init_info_t;
 
 typedef struct bksync_bs_info_s {
@@ -785,19 +819,23 @@ struct bksync_ptp_priv {
     bksync_gpio_info_t      bksync_gpio_info[6];
     bksync_evlog_info_t     bksync_evlog_info[NUM_TS_EVENTS];
     bksync_dnx_jr2_devices_system_info_t bksync_jr2devs_sys_info;
-    volatile bksync_fw_extts_log_t      *extts_log; /* dma-able address for fw updates */
-    int                                 extts_dma_mem_size;
-    dma_addr_t                          extts_dma_mem_addr;
+    volatile bksync_fw_extts_log_t      *extts_log; /* dma-able/virtual address for fw updates */
     struct bksync_extts_event           extts_event;
     struct delayed_work                 extts_logging;
 
-    struct kobject          *kobj;
+    struct kobject                      *kobj;
+#ifdef BDE_EDK_SUPPORT
+    volatile bksync_fw_comm_t           *fw_comm;
+#else
+    int                                 extts_dma_mem_size;
+    dma_addr_t                          extts_dma_mem_addr;
+#endif
 };
 
 static struct bksync_ptp_priv *ptp_priv;
 volatile bksync_info_t *linuxPTPMemory = (bksync_info_t*)(0);
 static volatile int module_initialized;
-static int num_retries = 10;   /* Retry count */
+static int num_retries = 5;   /* Retry count */
 
 static void bksync_ptp_time_keep_init(void);
 static void bksync_ptp_time_keep_deinit(void);
@@ -860,7 +898,46 @@ ptp_sleep(int jiffies)
 
 }
 
+#ifdef BDE_EDK_SUPPORT
+static void bksync_hostcmd_data_op(int setget, u64 *d1, u64 *d2)
+{
+    u32 w0, w1;
+    u64 data;
+
+    if (!d1) {
+        return;
+    }
+
+    if (setget) {
+        if (d1) {
+            data = *d1;
+            ptp_priv->fw_comm->dw1[0] = (data & 0xFFFFFFFF);
+            ptp_priv->fw_comm->dw1[1] = (data >> 32);
+        }
 
+        if (d2) {
+            data = *d2;
+            ptp_priv->fw_comm->dw2[0] = (data & 0xFFFFFFFF);
+            ptp_priv->fw_comm->dw2[1] = (data >> 32);
+        }
+
+    } else {
+        if (d1) {
+            w0 = ptp_priv->fw_comm->dw1[0];
+            w1 = ptp_priv->fw_comm->dw1[1];
+            data = (((u64)w1 << 32) | (w0));
+            *d1 = data;
+        }
+
+        if (d2) {
+            w0 = ptp_priv->fw_comm->dw2[0];
+            w1 = ptp_priv->fw_comm->dw2[1];
+            data = (((u64)w1 << 32) | (w0));
+            *d2 = data;
+        }
+    }
+}
+#else
 static void bksync_hostcmd_data_op(int setget, u64 *d1, u64 *d2)
 {
     u32 w0, w1;
@@ -903,7 +980,7 @@ static void bksync_hostcmd_data_op(int setget, u64 *d1, u64 *d2)
         }
     }
 }
-
+#endif
 
 static int bksync_cmd_go(u32 cmd, void *data0, void *data1)
 {
@@ -931,10 +1008,17 @@ static int bksync_cmd_go(u32 cmd, void *data0, void *data1)
     ptp_priv->shared_addr->ksyncinit = cmd;
 
     /* init data */
+#ifdef BDE_EDK_SUPPORT
+    ptp_priv->fw_comm->dw1[0] = 0;
+    ptp_priv->fw_comm->dw1[1] = 0;
+    ptp_priv->fw_comm->dw2[0] = 0;
+    ptp_priv->fw_comm->dw2[1] = 0;
+#else
     DEV_WRITE32(ptp_priv, hostcmd_regs[1], 0x0);
     DEV_WRITE32(ptp_priv, hostcmd_regs[2], 0x0);
     DEV_WRITE32(ptp_priv, hostcmd_regs[3], 0x0);
     DEV_WRITE32(ptp_priv, hostcmd_regs[4], 0x0);
+#endif
 
     switch (cmd) {
         case BKSYNC_INIT:
@@ -958,7 +1042,6 @@ static int bksync_cmd_go(u32 cmd, void *data0, void *data1)
             snprintf(cmd_str, sizeof(cmd_str), "KSYNC_GETTIME");
             break;
         case BKSYNC_GET_TSTIME:
-            retry_cnt = (retry_cnt * 2);
             snprintf(cmd_str, sizeof(cmd_str), "KSYNC_GET_TSTIME");
             bksync_hostcmd_data_op(1, data0, data1);
             break;
@@ -1008,6 +1091,12 @@ static int bksync_cmd_go(u32 cmd, void *data0, void *data1)
             snprintf(cmd_str, sizeof(cmd_str), "KSYNC_EXTTSLOG");
             bksync_hostcmd_data_op(1, (u64 *)data0, (u64 *)data1);
             break;
+#ifdef BDE_EDK_SUPPORT
+        case BKSYNC_GET_EXTTS_BUFF:
+            snprintf(cmd_str, sizeof(cmd_str), "BKSYNC_GET_EXTTS_BUFF");
+            bksync_hostcmd_data_op(1, (u64 *)data0, (u64 *)data1);
+            break;
+#endif
         case BKSYNC_GPIO_PHASEOFFSET:
             snprintf(cmd_str, sizeof(cmd_str), "BKSYNC_GPIO_PHASEOFFSET");
             bksync_hostcmd_data_op(1, (u64 *)data0, (u64 *)data1);
@@ -1017,16 +1106,47 @@ static int bksync_cmd_go(u32 cmd, void *data0, void *data1)
             break;
     }
 
+#ifdef BDE_EDK_SUPPORT
+    ptp_priv->fw_comm->cmd = cmd;
+#else
     DEV_WRITE32(ptp_priv, hostcmd_regs[0], ptp_priv->shared_addr->ksyncinit);
+#endif
 
     do {
+#ifdef BDE_EDK_SUPPORT
+        cmd_status = ptp_priv->fw_comm->cmd;
+#else
         DEV_READ32(ptp_priv, hostcmd_regs[0], &cmd_status);
         ptp_priv->shared_addr->ksyncinit = cmd_status;
+#endif
 
         if (cmd_status == BKSYNC_DONE) {
             ret = 0;
             switch (cmd) {
                 case BKSYNC_GET_TSTIME:
+#ifndef BDE_EDK_SUPPORT
+                    {
+                        u64 d0 = 0ULL;
+                        u64 d1 = 0ULL;
+                        int retry2_cnt = 3;
+                        *(u64 *)data0 = 0ULL;
+                        *(u64 *)data1 = 0ULL;
+                        do {
+                            bksync_hostcmd_data_op(0, &d0, &d1);
+                            *(u64 *)data0 |= d0;
+                            *(u64 *)data1 |= d1;
+                            if (((*(u64 *)data0) & 0xFFFFFFFF) && ((*(u64 *)data0)>>32) &&
+                                ((*(u64 *)data1) & 0xFFFFFFFF) && ((*(u64 *)data1)>>32)) {
+                                break;
+                            }
+                            retry2_cnt--;
+                            ptp_usleep(1);
+                        } while (retry2_cnt);
+                        if (retry2_cnt == 0)
+                            ret = -1;
+                    }
+                    break;
+#endif
                 case BKSYNC_GETTIME:
                     bksync_hostcmd_data_op(0, (u64 *)data0, (u64 *)data1);
                     break;
@@ -1036,6 +1156,12 @@ static int bksync_cmd_go(u32 cmd, void *data0, void *data1)
                         bksync_hostcmd_data_op(0, (u64 *)data0, (u64 *)data1);
                     }
                     break;
+#ifdef BDE_EDK_SUPPORT
+                    /* Get the host ram address from fw.*/
+                case BKSYNC_GET_EXTTS_BUFF:
+                    bksync_hostcmd_data_op(0, (u64 *)data0, (u64 *)data1);
+                    break;
+#endif
                 default:
                     break;
             }
@@ -1065,7 +1191,6 @@ static int bksync_cmd_go(u32 cmd, void *data0, void *data1)
     return ret;
 }
 
-
 /**
  * bksync_ptp_adjfreq
  *
@@ -1176,10 +1301,26 @@ static int bksync_exttslog_cmd(int event, int enable)
     int ret;
     u64 subcmd = 0, subcmd_data = 0;
 
+#ifdef BDE_EDK_SUPPORT
+    if (NULL == ptp_priv->extts_log) {
+        ret = bksync_cmd_go(BKSYNC_GET_EXTTS_BUFF,
+                &subcmd, &subcmd_data);
+        DBG_VERB(("bksync_exttslog_cmd: Get EXTTS buff: \
+                    subcmd_data:0x%llx\n", subcmd_data));
+
+        ptp_priv->extts_log =
+            (bksync_fw_extts_log_t *)lkbde_edk_dmamem_map_p2v(subcmd_data);
+        if (NULL == ptp_priv->extts_log) {
+            DBG_ERR(("EXTTS failed to get virtual addr for the physical address\n"));
+        }
+    }
+#else
+    subcmd_data = ptp_priv->extts_dma_mem_addr;
+#endif
+
     /* upper 32b -> event
      * lower 32b -> enable/disable */
     subcmd = (u64)event << 32 | enable;
-    subcmd_data = ptp_priv->extts_dma_mem_addr;
 
     ret = bksync_cmd_go(BKSYNC_EXTTSLOG, &subcmd, &subcmd_data);
     DBG_VERB(("bksync_evlog_cmd: subcmd: 0x%llx subcmd_data: 0x%llx rv:%d\n", subcmd, subcmd_data, ret));
@@ -1439,35 +1580,43 @@ static int
 bksync_txpkt_tsts_tsamp_get(int port, uint32_t pkt_seq_id, uint32_t *ts_valid, uint32_t *seq_id, uint64_t *timestamp)
 {
     int ret = 0;
-    uint64_t data;
+    uint64_t data=0ULL;
     u32 fifo_rxctr = 0;
 
     *ts_valid = 0;
-    *timestamp = 0;
+    *timestamp = 0ULL;
     *seq_id = 0;
 
     data = (port & 0xFFFF) | ((pkt_seq_id & 0xFFFF) << 16);
 
     ret = bksync_cmd_go(BKSYNC_GET_TSTIME, &data, timestamp);
     if (ret >= 0) {
-        fifo_rxctr = (data >> 32) & 0xFFFFFFFF;
+        *ts_valid = data & 0x1ULL;
         *seq_id = (data >> 16) & 0xFFFF;
-        *ts_valid = data & 0x1;
+        fifo_rxctr = (data >> 32) & 0xFFFFFFFF;
         if (*ts_valid) {
-            data = (port & 0xFFFF) | (pkt_seq_id << 16);
-            bksync_cmd_go(BKSYNC_ACK_TSTIME, &data, 0);
-            if (fifo_rxctr != 0) {
-                if (fifo_rxctr != (ptp_priv->port_stats[port].fifo_rxctr + 1)) {
-                    DBG_ERR(("FW reset or lost timestamp FIFO_RxCtr:"
-                                "(Prev %u : Current %u) on port:%d\n",
-                                ptp_priv->port_stats[port].fifo_rxctr,
-                                fifo_rxctr, port));
+            data = (port & 0xFFFF) | ((pkt_seq_id & 0xFFFF) << 16);
+            ret = bksync_cmd_go(BKSYNC_ACK_TSTIME, &data, 0ULL);
+            if (ret >= 0) {
+                if (fifo_rxctr != 0) {
+                    if (fifo_rxctr != (ptp_priv->port_stats[port].fifo_rxctr + 1)) {
+                        DBG_ERR(("FW reset or lost timestamp FIFO_RxCtr:"
+                                    "(Prev %u : Current %u) port:%d pkt_sn:%u hw_sn:%u \n",
+                                    ptp_priv->port_stats[port].fifo_rxctr,
+                                    fifo_rxctr, port, pkt_seq_id, *seq_id));
+                    }
+                    ptp_priv->port_stats[port].fifo_rxctr = fifo_rxctr;
                 }
-                ptp_priv->port_stats[port].fifo_rxctr = fifo_rxctr;
+            } else {
+                DBG_ERR(("BKSYNC_ACK_TSTIME failed on port:%d sn:%d\n", port, pkt_seq_id));
             }
+        } else {
+            DBG_ERR(("BKSYNC_GET_TSTIME invalid on port:%d pkt_sn:%d fw_sn:%d fifo:%d prev_fifo:%d\n",
+                    port, pkt_seq_id, *seq_id, fifo_rxctr,
+                    ptp_priv->port_stats[port].fifo_rxctr));
         }
     } else {
-        DBG_ERR(("BKSYNC_GET_TSTIME failed on port:%d\n", port));
+        DBG_ERR(("BKSYNC_GET_TSTIME failed on port:%d sn:%d\n", port, pkt_seq_id));
     }
     return ret;
 }
@@ -1573,8 +1722,9 @@ int bksync_ptp_hw_tstamp_tx_time_get(int dev_no, int port, uint8_t *pkt, uint64_
                 ptp_priv->port_stats[port].tsts_match += 1;
 
                 delta = ktime_us_delta(ktime_get(), start);
-                DBG_TXTS(("Port: %d Skb_SeqID %d FW_SeqId %d and TS:%llx FetchTime %lld\n",
-                          port, pktseq_id, seq_id, timestamp, delta));
+                DBG_TXTS(("Port: %d Skb_SeqID %d FW_SeqId %d and TS:%llx FetchTime %lld retries:%d\n",
+                          port, pktseq_id, seq_id, timestamp, delta,
+                          (num_retries-retry_cnt)));
 
                 if (delta < ptp_priv->port_stats[port].tsts_best_fetch_time || ptp_priv->port_stats[port].tsts_best_fetch_time == 0) {
                     ptp_priv->port_stats[port].tsts_best_fetch_time = delta;
@@ -1593,7 +1743,7 @@ int bksync_ptp_hw_tstamp_tx_time_get(int dev_no, int port, uint8_t *pkt, uint64_
                 continue;
             }
         }
-        ptp_sleep(1);
+        ptp_usleep(1000);
         retry_cnt--;
     } while(retry_cnt);
 
@@ -2138,7 +2288,14 @@ bksync_dnx_ase1588_tsh_hdr_update_ipv6(struct sk_buff *skb, int hwts, int encap_
 {
     /* Module Hdr [16] + PTCH [2] + ITMH [5] + ASE1588 [6] + TSH [4] + Internal Hdr [12] + UDH base [1] */
 
-    ptp_hdr_offset = 0x1d;
+    /* For JR3 for CF update 1588v2_Offset should also have system_header length of
+     * PTCH [2] + ITMH [5] + ASE1588 [6] + TSH [4] + Internal Hdr [12] + UDH base [1] = 30. */
+    if ((ptp_priv->bksync_init_info).application_v2) {
+        ptp_hdr_offset = 30;
+    } else {
+        ptp_hdr_offset = 29;
+    }
+
     switch(encap_type)
     {
         case 2: /* IEEE 802.3 */
@@ -2148,14 +2305,13 @@ bksync_dnx_ase1588_tsh_hdr_update_ipv6(struct sk_buff *skb, int hwts, int encap_
             ptp_hdr_offset += 46;
             break;
         case 6: /* UDP IPv6   */
-            ptp_hdr_offset += 0x42;
+            ptp_hdr_offset += 66;
             break;
         default:
             ptp_hdr_offset += 46;
             break;
     }
 
-
     /* ITMH */
     /* App Specific Ext Present  ASE 1588*/
     skb->data [18] |= (0x1 << 3);
@@ -2204,6 +2360,12 @@ bksync_dnx_ase1588_tsh_hdr_update(struct sk_buff *skb, int hwts, int encap_type,
 {
     /* Module Hdr [16] + PTCH [2] + ITMH [5] + ASE1588 [6] + TSH [4] */
 
+    /* For JR3 for CF update 1588v2_Offset should also have system_header length of
+     * PTCH [2] + ITMH [5] + ASE1588 [6] + TSH [4] = 17. */
+    if ((ptp_priv->bksync_init_info).application_v2) {
+        ptp_hdr_offset = ptp_hdr_offset + 17;
+    }
+
     /* ITMH */
     /* App Specific Ext Present */
     skb->data [18] |= (1 << 3);
@@ -2588,7 +2750,9 @@ static void bksync_ptp_extts_logging(struct work_struct *work)
     if (!module_initialized || ptp_priv->extts_log == NULL)
         goto exit;
 
-    DBG_VERB(("Queue overflow state:%u\n", ptp_priv->extts_log->overflow));
+    if (ptp_priv->extts_log->overflow) {
+        DBG_VERB(("EXTTS queue overflow\n"));
+    }
 
     tail = (int)ptp_priv->extts_log->tail;
     head = ptp_priv->extts_event.head;
@@ -3474,6 +3638,9 @@ static void bksync_ptp_fw_data_alloc(void)
                 ptp_priv->dma_mem_size, (long unsigned int)ptp_priv->dma_mem));
     }
 
+#ifdef BDE_EDK_SUPPORT
+    /* Do nothing */
+#else
     /* Allocate dma for timestmap logging for extts */
     dma_mem = 0;
     ptp_priv->extts_dma_mem_size = sizeof(bksync_fw_extts_log_t);
@@ -3497,6 +3664,7 @@ static void bksync_ptp_fw_data_alloc(void)
         DBG_ERR(("Shared memory allocation (%d bytes) for extts log successful at 0x%016lx.\n",
                 ptp_priv->extts_dma_mem_size, (long unsigned int)ptp_priv->extts_dma_mem_addr));
     }
+#endif
     return;
 }
 
@@ -3508,12 +3676,16 @@ static void bksync_ptp_fw_data_free(void)
         ptp_priv->evlog = NULL;
     }
 
+#ifdef BDE_EDK_SUPPORT
+    /* Do nothing */
+#else
     if (ptp_priv->extts_log != NULL) {
         DBG_ERR(("Free shared memory : extts log of %d bytes\n", ptp_priv->extts_dma_mem_size));
         DMA_FREE_COHERENT(ptp_priv->dma_dev, ptp_priv->extts_dma_mem_size,
                               (void *)ptp_priv->extts_log, ptp_priv->extts_dma_mem_addr);
         ptp_priv->extts_log = NULL;
     }
+#endif
     return;
 }
 
@@ -3543,11 +3715,16 @@ static void bksync_ptp_dma_init(int dcb_type)
 #else
         endianess = 1;
 #endif
+
+#ifdef BDE_EDK_SUPPORT
+        /* Do nothing */
+        (void)endianess;
+#else
         DEV_WRITE32(ptp_priv, CMIC_CMC_SCHAN_MESSAGE_14r(CMIC_CMC_BASE), ((pci_cos << 16) | endianess));
 
         DEV_WRITE32(ptp_priv, CMIC_CMC_SCHAN_MESSAGE_15r(CMIC_CMC_BASE), 1);
         DEV_WRITE32(ptp_priv, CMIC_CMC_SCHAN_MESSAGE_16r(CMIC_CMC_BASE), 1);
-
+#endif
     }
 
     bksync_ptp_fw_data_alloc();
@@ -3556,11 +3733,15 @@ static void bksync_ptp_dma_init(int dcb_type)
 
     ptp_priv->mirror_encap_bmp = 0x0;
 
+#ifdef BDE_EDK_SUPPORT
+    /* Do Nothing */
+#else
     hostcmd_regs[0] = CMIC_CMC_SCHAN_MESSAGE_21r(CMIC_CMC_BASE);
     hostcmd_regs[1] = CMIC_CMC_SCHAN_MESSAGE_20r(CMIC_CMC_BASE);
     hostcmd_regs[2] = CMIC_CMC_SCHAN_MESSAGE_19r(CMIC_CMC_BASE);
     hostcmd_regs[3] = CMIC_CMC_SCHAN_MESSAGE_18r(CMIC_CMC_BASE);
     hostcmd_regs[4] = CMIC_CMC_SCHAN_MESSAGE_17r(CMIC_CMC_BASE);
+#endif
 
     return;
 }
@@ -3578,7 +3759,9 @@ bksync_ioctl_cmd_handler(kcom_msg_clock_cmd_t *kmsg, int len, int dcb_type)
     u32 fw_status;
     bksync_dnx_jr2_devices_system_info_t *tmp_jr2devs_sys_info = NULL;
     int tmp = 0;
-
+#ifdef BDE_EDK_SUPPORT
+    uint64_t paddr;
+#endif
     kmsg->hdr.type = KCOM_MSG_TYPE_RSP;
 
     if (!module_initialized && kmsg->clock_info.cmd != KSYNC_M_HW_INIT) {
@@ -3598,9 +3781,25 @@ bksync_ioctl_cmd_handler(kcom_msg_clock_cmd_t *kmsg, int len, int dcb_type)
                 }
 
                 fw_core = kmsg->clock_info.data[1];
+#ifdef BDE_EDK_SUPPORT
+                paddr = kmsg->clock_info.data[7] << 32;
+                paddr |= kmsg->clock_info.data[8];
+                ptp_priv->fw_comm = (bksync_fw_comm_t *)lkbde_edk_dmamem_map_p2v(paddr);
+                if (ptp_priv->fw_comm == NULL) {
+                    DBG_ERR(("Hostram address conversion to get virtual address failed\n"));
+                    kmsg->hdr.status = KCOM_E_RESOURCE;
+                    return sizeof(kcom_msg_hdr_t);
+                }
+#endif
+
                 bksync_ptp_dma_init(dcb_type);
-                DEV_READ32(ptp_priv, CMIC_CMC_SCHAN_MESSAGE_21r(CMIC_CMC_BASE), &fw_status);
 
+#ifdef BDE_EDK_SUPPORT
+                /* Data from FW, hence don't memset fw_comm after address converstion */
+                fw_status = ptp_priv->fw_comm->cmd;
+#else
+                DEV_READ32(ptp_priv, CMIC_CMC_SCHAN_MESSAGE_21r(CMIC_CMC_BASE), &fw_status);
+#endif
                 /* Return error if the app is not ready yet. */
                 if (fw_status != 0xBADC0DE1) {
                     kmsg->hdr.status = KCOM_E_RESOURCE;
@@ -3612,16 +3811,18 @@ bksync_ioctl_cmd_handler(kcom_msg_clock_cmd_t *kmsg, int len, int dcb_type)
                 (ptp_priv->bksync_init_info).host_cpu_port = kmsg->clock_info.data[4];
                 (ptp_priv->bksync_init_info).host_cpu_sysport = kmsg->clock_info.data[5];
                 (ptp_priv->bksync_init_info).udh_len = kmsg->clock_info.data[6];
+                (ptp_priv->bksync_init_info).application_v2 = kmsg->clock_info.data[9];
 
-                DBG_VERB(("fw_core:%d uc_port:%d uc_sysport:%d pci_port:%d pci_sysport:%d\n",
+                DBG_VERB(("fw_core:%d uc_port:%d uc_sysport:%d pci_port:%d pci_sysport:%d application_v2:%d\n",
                         kmsg->clock_info.data[1], kmsg->clock_info.data[2], kmsg->clock_info.data[3],
-                        kmsg->clock_info.data[4], kmsg->clock_info.data[5]));
+                        kmsg->clock_info.data[4], kmsg->clock_info.data[5], kmsg->clock_info.data[9]));
 
-                DBG_VERB(("uc_port:%d uc_sysport:%d pci_port:%d pci_sysport:%d\n",
+                DBG_VERB(("uc_port:%d uc_sysport:%d pci_port:%d pci_sysport:%d application_v2:%d\n",
                         (ptp_priv->bksync_init_info).uc_port_num,
                         (ptp_priv->bksync_init_info).uc_port_sysport,
                         (ptp_priv->bksync_init_info).host_cpu_port,
-                        (ptp_priv->bksync_init_info).host_cpu_sysport));
+                        (ptp_priv->bksync_init_info).host_cpu_sysport,
+                        (ptp_priv->bksync_init_info).application_v2));
 
                 if (bksync_ptp_init(&(ptp_priv->ptp_caps)) >= 0) {
                     module_initialized = 1;
@@ -3630,8 +3831,12 @@ bksync_ioctl_cmd_handler(kcom_msg_clock_cmd_t *kmsg, int len, int dcb_type)
             }
             break;
         case KSYNC_M_HW_DEINIT:
+#ifdef BDE_EDK_SUPPORT
+            /* Do nothing */
+#else
             DEV_WRITE32(ptp_priv, CMIC_CMC_SCHAN_MESSAGE_15r(CMIC_CMC_BASE), 0);
             DEV_WRITE32(ptp_priv, CMIC_CMC_SCHAN_MESSAGE_16r(CMIC_CMC_BASE), 0);
+#endif
             bksync_ptp_deinit(&(ptp_priv->ptp_caps));
             module_initialized = 0;
             break;
@@ -3680,7 +3885,7 @@ bksync_ioctl_cmd_handler(kcom_msg_clock_cmd_t *kmsg, int len, int dcb_type)
                         tmp, tmp_jr2devs_sys_info->pph_lif_ext_size[tmp]));
             }
 
-            DBG_VERB(("\nsystem_headers_mode %u udh_enable %u\n",
+            DBG_VERB(("system_headers_mode %u udh_enable %u\n",
                     tmp_jr2devs_sys_info->system_headers_mode, tmp_jr2devs_sys_info->udh_enable));
 
             for (tmp = 0; tmp < BKSYNC_DNXJER2_UDH_DATA_TYPE_MAX; tmp++) {
@@ -3688,7 +3893,7 @@ bksync_ioctl_cmd_handler(kcom_msg_clock_cmd_t *kmsg, int len, int dcb_type)
                         tmp, tmp_jr2devs_sys_info->udh_data_lenght_per_type[tmp]));
             }
 
-            DBG_VERB(("\ncosq_port_cpu_channel :%u cosq_port_pp_port:%u\n",
+            DBG_VERB(("cosq_port_cpu_channel :%u cosq_port_pp_port:%u\n",
                     tmp_jr2devs_sys_info->cosq_port_cpu_channel, tmp_jr2devs_sys_info->cosq_port_cpu_channel));
 #endif
             break;
@@ -3852,7 +4057,7 @@ static int bksync_ptp_remove(void)
     static int
 _pprint(struct seq_file *m)
 {
-#if LINUX_VERSION_CODE > KERNEL_VERSION(3,17,0)
+#ifdef PTPCLOCK_SUPPORTED
     /* put some goodies here */
     pprintf(m, "Broadcom BCM PTP Hardware Clock Module\n");
 #else
@@ -3875,7 +4080,7 @@ _pprint(struct seq_file *m)
     static int
 _init(void)
 {
-#if LINUX_VERSION_CODE > KERNEL_VERSION(3,17,0)
+#ifdef PTPCLOCK_SUPPORTED
     bksync_ptp_register();
     return 0;
 #else
@@ -3896,7 +4101,7 @@ _init(void)
     static int
 _cleanup(void)
 {
-#if LINUX_VERSION_CODE > KERNEL_VERSION(3,17,0)
+#ifdef PTPCLOCK_SUPPORTED
     bksync_ptp_remove();
     return 0;
 #else
diff --git a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/dcb/include/soc/defs.h b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/dcb/include/soc/defs.h
index c8671c59e933..dcf81c6f9bce 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/dcb/include/soc/defs.h
+++ b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/dcb/include/soc/defs.h
@@ -45,6 +45,10 @@
 #endif
 #include <soc/maxdef.h>
 
+#ifdef BCM_ACCESS_SUPPORT
+#include <soc/access/auto_generated/defines.h>
+#endif
+
 /* Enable per unit linkscan lock for all ESW devices. */
 #if defined(BCM_ESW_SUPPORT)
 #define BCM_LINKSCAN_LOCK_PER_UNIT
@@ -513,49 +517,6 @@
 #define BCM_TIMESYNC_SUPPORT
 #endif
 
-#if defined(BCM_56560_A0) || defined(BCM_56560_B0)
-#define BCM_56860
-#define BCM_56850
-#define BCM_56840
-#define BCM_56634
-#define BCM_56624
-#define BCM_56304
-#define BCM_56800
-#define BCM_56560
-#define BCM_APACHE_SUPPORT
-#define BCM_FIREBOLT_SUPPORT
-#define BCM_BRADLEY_SUPPORT
-#define BCM_HUMV_SUPPORT
-#define BCM_SCORPION_SUPPORT
-#define BCM_TRIUMPH_SUPPORT
-#define BCM_TRIUMPH2_SUPPORT
-#define BCM_TRX_SUPPORT
-#define BCM_TRIDENT_SUPPORT
-#define BCM_TRIUMPH3_SUPPORT
-#define BCM_TRIDENT2_SUPPORT
-#define BCM_TRIDENT2PLUS_SUPPORT
-#define BCM_TIME_V3_SUPPORT
-#define BCM_MPLS_SUPPORT
-#define BCM_XGS3_FABRIC_SUPPORT
-#define BCM_EXTND_SBUS_SUPPORT
-#define BCM_SBUSDMA_SUPPORT
-#define BCM_FIFODMA_SUPPORT
-#define BCM_TIMESYNC_SUPPORT
-#define BCM_HGPROXY_COE_SUPPORT
-#define SOC_ROBUST_HASH
-#define BCM_IPROC_SUPPORT
-#define BCM_CMICDV2_SUPPORT
-#define BCM_CMICDV3_SUPPORT
-#define BCM_CMICM_SUPPORT
-#define BCM_UC_MHOST_SUPPORT
-#define BCM_OLP_SUPPORT
-#define PORTMOD_PM4X10_SUPPORT
-#define PORTMOD_PM12X10_SUPPORT
-#define PORTMOD_PM12X10_XGS_SUPPORT
-#define PORTMOD_PM4X25_SUPPORT
-#define PORTMOD_PMNULL_SUPPORT
-#define BCM_EP_REDIRECT_VERSION_2
-#endif
 
 #if defined(BCM_56670_A0) || defined(BCM_56670_B0) || defined(BCM_56670_C0)
 #define BCM_56860
@@ -565,10 +526,8 @@
 #define BCM_56624
 #define BCM_56304
 #define BCM_56800
-#define BCM_56560
 #define BCM_56670
 #define BCM_MONTEREY_SUPPORT
-#define BCM_APACHE_SUPPORT
 #define BCM_FIREBOLT_SUPPORT
 #define BCM_BRADLEY_SUPPORT
 #define BCM_HUMV_SUPPORT
@@ -611,11 +570,9 @@
 #define BCM_56624
 #define BCM_56304
 #define BCM_56800
-#define BCM_56560
 #define BCM_56670
 #define BCM_53650
 #define BCM_MONTEREY_SUPPORT
-#define BCM_APACHE_SUPPORT
 #define BCM_FIREBOLT_SUPPORT
 #define BCM_BRADLEY_SUPPORT
 #define BCM_HUMV_SUPPORT
@@ -1278,6 +1235,20 @@
 #endif
 
 #ifdef BCM_DNX3_SUPPORT
+#ifdef BCM_Q3A_SUPPORT
+#if defined(BCM_88490_A0)
+#define BCM_88490
+#define BCM_IPROC_SUPPORT
+#define BCM_UC_MHOST_SUPPORT
+/* Compilation features */
+#define BCM_LINKSCAN_LOCK_PER_UNIT
+#define PORTMOD_PM8X100_GEN2_SUPPORT
+#define PORTMOD_PM8X50_T5_SUPPORT
+#define BCM_CMICX_SUPPORT
+#define BCM_CMICX_GEN2_SUPPORT
+#define BCM_SBUSDMA_SUPPORT
+#endif
+#endif
 #endif
 
 
@@ -1654,7 +1625,7 @@
 #endif
 
 /* Common XGS5 Port Module Support */
-#if defined(BCM_56450) || defined(BCM_56560) || defined(BCM_56860) || \
+#if defined(BCM_56450) || defined(BCM_56670) || defined(BCM_53650) || defined(BCM_56860) || \
     defined(BCM_56870) || defined(BCM_56970) || defined(BCM_56370) || \
     defined(BCM_56770) || defined(BCM_56980) || defined(BCM_56275) || \
     defined(BCM_56470)
@@ -1665,7 +1636,7 @@
  * RIOT
  */
 #if defined(INCLUDE_L3)
-#if defined(BCM_56860_A0) || defined (BCM_56560) || defined(BCM_56870_A0) || \
+#if defined(BCM_56860_A0) || defined(BCM_56670) || defined(BCM_53650) || defined(BCM_56870_A0) || \
     defined(BCM_56370) || defined(BCM_56770) || defined(BCM_56275) || \
     defined(BCM_56470) || defined(BCM_53650)
 #define BCM_RIOT_SUPPORT
@@ -1675,7 +1646,7 @@
  * SwapToItself
  */
 #if defined(INCLUDE_L3)
-#if defined (BCM_56560) || defined (BCM_56970_A0) || defined(BCM_56870_A0) || \
+#if defined(BCM_56670) || defined(BCM_53650) || defined (BCM_56970_A0) || defined(BCM_56870_A0) || \
     defined(BCM_56370) || defined(BCM_56770) || defined(BCM_56470)
 #define BCM_SWAP_TO_SELF_SUPPORT
 #endif
@@ -1684,7 +1655,7 @@
   * Multi-level ECMP
   */
 #if defined(INCLUDE_L3)
-#if defined(BCM_56860_A0) || defined (BCM_56560) || defined(BCM_56870) || \
+#if defined(BCM_56860_A0) || defined(BCM_56670) || defined(BCM_53650) || defined(BCM_56870) || \
     defined(BCM_56370) || defined(BCM_56770) || defined(BCM_56980) || \
     defined(BCM_56275) || defined(BCM_56470) || defined(BCM_53650)
 #define BCM_MULTI_LEVEL_ECMP_SUPPORT
@@ -1695,7 +1666,7 @@
  * Multi-Level Failover Support.
  */
 #if defined(INCLUDE_L3)
-#if defined(BCM_56560)
+#if defined(BCM_56670) || defined(BCM_53650)
 #define BCM_MULTI_LEVEL_FAILOVER_SUPPORT
 #endif
 #endif
@@ -1889,7 +1860,7 @@
 /*
  * If any supported chip has CLMAC ports
  */
-#if defined(BCM_56960) || defined(BCM_56860) || defined(BCM_56560) || \
+#if defined(BCM_56960) || defined(BCM_56860) || defined(BCM_56670) || defined(BCM_53650) || \
     defined(BCM_56870) || \
     defined(BCM_56965) || defined(BCM_56970) || defined(BCM_53570) || \
     defined(BCM_56980) || defined(BCM_56070)
@@ -2135,6 +2106,9 @@ typedef enum soc_chip_types_e {
 #ifdef BCM_DNX3_SUPPORT
     SOC_CHIP_BCM88860_A0,
     SOC_CHIP_BCM88870_A0,
+#ifdef BCM_Q3A_SUPPORT
+    SOC_CHIP_BCM88490_A0,
+#endif
 #endif
     SOC_CHIP_BCM88480_A0,
     SOC_CHIP_BCM88480_B0,
@@ -2154,8 +2128,6 @@ typedef enum soc_chip_types_e {
     SOC_CHIP_BCM56260_B0, /* Saber2 */
     SOC_CHIP_BCM56270_A0, /* Metrolite */
     SOC_CHIP_BCM56860_A0, /* Trident2 Plus */
-    SOC_CHIP_BCM56560_A0, /* Apache */
-    SOC_CHIP_BCM56560_B0, /* Apache */
     SOC_CHIP_BCM56670_A0, /* Monterey */
     SOC_CHIP_BCM56670_B0, /* Monterey */
     SOC_CHIP_BCM56670_C0, /* Monterey */
@@ -2200,8 +2172,14 @@ typedef enum soc_chip_types_e {
  *
  ****************************************************************/
 #ifdef BCM_DNX3_SUPPORT
+#ifdef BCM_Q3A_SUPPORT
+#define SOC_CHIP_TYPE_MAP_INIT_ADDITIONAL  /* SOC_CHIP_BCM88860_A0 */ SOC_CHIP_BCM8886X,\
+                                           /* SOC_CHIP_BCM88870_A0 */ SOC_CHIP_BCM8887X,\
+                                           /* SOC_CHIP_BCM88490_A0 */ SOC_CHIP_BCM8849X,
+#else
 #define SOC_CHIP_TYPE_MAP_INIT_ADDITIONAL  /* SOC_CHIP_BCM88860_A0 */ SOC_CHIP_BCM8886X,\
                                            /* SOC_CHIP_BCM88870_A0 */ SOC_CHIP_BCM8887X,
+#endif
 #else
 #define SOC_CHIP_TYPE_MAP_INIT_ADDITIONAL
 #endif
@@ -2303,8 +2281,6 @@ typedef enum soc_chip_types_e {
     /* SOC_CHIP_BCM56260_B0  */ SOC_CHIP_BCM56260, \
     /* SOC_CHIP_BCM56270_A0  */ SOC_CHIP_BCM56270, \
     /* SOC_CHIP_BCM56860_A0, */ SOC_CHIP_BCM56860, \
-    /* SOC_CHIP_BCM56560_A0, */ SOC_CHIP_BCM56560, \
-    /* SOC_CHIP_BCM56560_B0, */ SOC_CHIP_BCM56560, \
     /* SOC_CHIP_BCM56670_A0, */ SOC_CHIP_BCM56670, \
     /* SOC_CHIP_BCM56670_B0, */ SOC_CHIP_BCM56670, \
     /* SOC_CHIP_BCM56670_C0, */ SOC_CHIP_BCM56670, \
@@ -2344,8 +2320,14 @@ typedef enum soc_chip_types_e {
 #endif
 
 #ifdef BCM_DNX3_SUPPORT
+#ifdef BCM_Q3A_SUPPORT
+#define SOC_CHIP_TYPE_NAMES_INIT_ADDITIONAL     "BCM88860_A0", \
+                                                "BCM88870_A0", \
+                                                "BCM88490_A0",
+#else
 #define SOC_CHIP_TYPE_NAMES_INIT_ADDITIONAL     "BCM88860_A0", \
                                                 "BCM88870_A0",
+#endif
 #else
 #define SOC_CHIP_TYPE_NAMES_INIT_ADDITIONAL
 #endif
@@ -2447,8 +2429,6 @@ typedef enum soc_chip_types_e {
     "BCM56260_B0", \
     "BCM56270_A0", \
     "BCM56860_A0", \
-    "BCM56560_A0", \
-    "BCM56560_B0", \
     "BCM56670_A0", \
     "BCM56670_B0", \
     "BCM56670_C0", \
@@ -2541,6 +2521,9 @@ typedef enum soc_chip_groups_e {
 #ifdef BCM_DNX3_SUPPORT
     SOC_CHIP_BCM8886X,
     SOC_CHIP_BCM8887X,
+#ifdef BCM_Q3A_SUPPORT
+    SOC_CHIP_BCM8849X,
+#endif
 #endif
     SOC_CHIP_BCM8848X,
     SOC_CHIP_BCM88375,
@@ -2553,7 +2536,6 @@ typedef enum soc_chip_groups_e {
     SOC_CHIP_BCM56260,
     SOC_CHIP_BCM56270,
     SOC_CHIP_BCM56860,
-    SOC_CHIP_BCM56560,
     SOC_CHIP_BCM56670,
     SOC_CHIP_BCM53650,
     SOC_CHIP_BCM88770,
@@ -2586,8 +2568,14 @@ typedef enum soc_chip_groups_e {
 } soc_chip_groups_t;
 
 #ifdef BCM_DNX3_SUPPORT
+#ifdef BCM_Q3A_SUPPORT
+#define SOC_CHIP_GROUP_NAMES_INIT_ADDITIONAL      "BCM8886X", \
+                                                  "BCM8887X", \
+                                                  "BCM8849X",
+#else
 #define SOC_CHIP_GROUP_NAMES_INIT_ADDITIONAL      "BCM8886X", \
                                                   "BCM8887X",
+#endif
 #else
 #define SOC_CHIP_GROUP_NAMES_INIT_ADDITIONAL
 #endif
@@ -2659,7 +2647,6 @@ typedef enum soc_chip_groups_e {
     "BCM56260", \
     "BCM56270", \
     "BCM56860", \
-    "BCM56560", \
     "BCM56670", \
     "BCM53650", \
     "BCM88770",  \
diff --git a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/dcb/include/soc/devids.h b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/dcb/include/soc/devids.h
index f88e35e94b52..4497c2ed0a08 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/dcb/include/soc/devids.h
+++ b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/dcb/include/soc/devids.h
@@ -1356,6 +1356,11 @@
 #define BCM53653_B0_REV_ID      0x11
 #define BCM53653_C0_REV_ID      0x21
 
+#define BCM53654_DEVICE_ID      0x8654
+#define BCM53654_A0_REV_ID      1
+#define BCM53654_B0_REV_ID      0x11
+#define BCM53654_C0_REV_ID      0x21
+
 #define BCM56565_DEVICE_ID      0xb565
 #define BCM56565_A0_REV_ID      1
 #define BCM56565_B0_REV_ID      0x11
@@ -1913,6 +1918,11 @@
 #define Q3_DEVICE_ID_END        0x886f
 #define J3AI_DEVICE_ID           0x8890
 #define Q3D_DEVICE_ID           0x8870
+#ifdef BCM_Q3A_SUPPORT
+#define Q3A_DEVICE_ID           0x8490
+#define Q3U_DEVICE_ID           0x8400
+#define Q3N_DEVICE_ID           0x8405
+#endif
 #endif
 #define Q2A_DEVICE_ID           0x8480
 #define Q2A_A0_REV_ID           DNXC_A0_REV_ID
diff --git a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/dcb/include/soc/shared/dcbformats/type35.h b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/dcb/include/soc/shared/dcbformats/type35.h
index 9f377ec99117..debc1d961544 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/dcb/include/soc/shared/dcbformats/type35.h
+++ b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/dcb/include/soc/shared/dcbformats/type35.h
@@ -29,7 +29,7 @@
  *
  * File:        soc/shared/dcbformats/type35.h
  * Purpose:     Define dma control block (DCB) format for a type35 DCB
- *              used by the 56560 (APACHE)
+ *              used by the 56670 (MONTEREY)
  *
  *              This file is shared between the SDK and the embedded applications.
  */
diff --git a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/include/lkm.h b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/include/lkm.h
index 7bb0c5b3b7f2..5113c799a58c 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/include/lkm.h
+++ b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/include/lkm.h
@@ -40,13 +40,10 @@
 
 #include <linux/init.h>
 #include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0)
 #error Kernel too old
 #endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)
-/* The version kconfig.h became available in. */
 #include <linux/kconfig.h>
-#endif
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
 #if defined(INCLUDE_KNET) && LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0)
 #ifdef CONFIG_NF_CONNTRACK_MODULE
@@ -55,9 +52,6 @@
 #endif
 #include <linux/slab.h>
 #endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)
-#include <linux/smp_lock.h>
-#endif
 #include <linux/module.h>
 
 /* Helper defines for multi-version kernel  support */
@@ -143,6 +137,12 @@
 #define CONFIG_BMW
 #endif
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,8,0)
+#define DMA_FORCE_CONTIGUOUS NULL
+#else
+#define DMA_FORCE_CONTIGUOUS DMA_ATTR_FORCE_CONTIGUOUS
+#endif
+
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(5,5,0)
 #define PROC_OWNER(_m)
 #else
diff --git a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/knet-cb/knet-cb.c b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/knet-cb/knet-cb.c
index 42a6e92f5c0e..a64618e78440 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/knet-cb/knet-cb.c
+++ b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/knet-cb/knet-cb.c
@@ -1,5 +1,10 @@
 /*
- * Copyright 2017-2024 Broadcom
+ * $Copyright: 2017-2024 Broadcom Inc. All rights reserved.
+ *
+ * Permission is granted to use, copy, modify and/or distribute this
+ * software under either one of the licenses below.
+ *
+ * License Option 1: GPL
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2, as
@@ -12,11 +17,14 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 (GPLv2) along with this source code.
- */
-/*
- * $Id: $
- * $Copyright: (c) 2017 Broadcom Corp.
- * All Rights Reserved.$
+ *
+ *
+ * License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
+ *
+ * This software is governed by the Broadcom Open Network Switch APIs license:
+ * https://www.broadcom.com/products/ethernet-connectivity/software/opennsa $
+ *
+ *
  */
 
 /*
@@ -359,6 +367,7 @@ knet_netif_destroy_cb(struct net_device *dev, int unit, kcom_netif_t *netif)
     return retv;
 }
 #endif
+
 /*
  * Get statistics.
  * % cat /proc/linux-knet-cb
diff --git a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/shared/gmodule.c b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/shared/gmodule.c
index 16cfefb9ad51..0ddb1251e5f4 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/shared/gmodule.c
+++ b/platform/broadcom/saibcm-modules/systems/linux/kernel/modules/shared/gmodule.c
@@ -52,7 +52,7 @@ gvprintk(const char* fmt, va_list args)
 {
     static char _buf[256];
 
-    strcpy(_buf, "");
+    _buf[0] = 0;
     sprintf(_buf, "%s (%d): ", _gmodule->name, current->pid);
     vsprintf(_buf+strlen(_buf), fmt, args);
     printk("%s",_buf);
diff --git a/platform/broadcom/saibcm-modules/systems/linux/user/common/Makefile b/platform/broadcom/saibcm-modules/systems/linux/user/common/Makefile
index 006acfad9893..8156eb0e3a82 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/user/common/Makefile
+++ b/platform/broadcom/saibcm-modules/systems/linux/user/common/Makefile
@@ -100,7 +100,6 @@ USER_BDE := $(DEST_DIR)/$(USER_BDE_LOCAL)
 
 KNET_CB_LOCAL := linux-knet-cb.$(KOBJ)
 KNET_CB := $(DEST_DIR)/$(KNET_CB_LOCAL)
-
 export BUILD_BCM_GENL=1
 export BUILD_GENL_PACKET=0
 GENL_PACKET_LOCAL := genl-packet.$(KOBJ)
@@ -115,6 +114,9 @@ BCM_GENL := $(DEST_DIR)/$(BCM_GENL_LOCAL)
 BCM_KNET_LOCAL := linux-bcm-knet.$(KOBJ)
 BCM_KNET := $(DEST_DIR)/$(BCM_KNET_LOCAL)
 
+BCM_PTP_LOCAL := linux-bcm-ptp-clock.$(KOBJ)
+BCM_PTP := $(DEST_DIR)/$(BCM_PTP_LOCAL)
+
 ifeq (,$(findstring DELIVER,$(MAKECMDGOALS)))
 .DEFAULT_GOAL := all
 all_targets := kernel_modules $(KERNEL_BDE) $(USER_BDE)
@@ -132,6 +134,10 @@ ifndef BUILD_KNET
 BUILD_KNET = 1
 endif
 
+ifndef BUILD_PTP
+BUILD_PTP = 1
+endif
+
 ifeq ($(BUILD_KNET),1)
 # Kernel network support
 all_targets += $(BCM_KNET)
@@ -146,6 +152,11 @@ ifdef BUILD_KNET_CB
 all_targets += $(KNET_CB)
 knet_subdirs += knet-cb
 
+ifdef BUILD_PTP
+all_targets += $(BCM_PTP)
+knet_subdirs += bcm-ptp-clock
+endif
+
 ifeq ($(NO_LOCAL_TARGETS),)
 LOCAL_TARGETS +=$(patsubst %,../$(platform)/%,$(KNET_CB_LOCAL))
 all_targets +=$(LOCAL_TARGETS)
@@ -212,6 +223,10 @@ ifneq (,$(filter knet-cb,$(knet_subdirs)))
 	$(MAKE) -C $(SDK)/systems/linux/kernel/modules/knet-cb $(OPT_KERNEL_TOOLCHAIN) kernel_version=$(kernel_version) \
 		OPT_CFLAGS="$(ADD_TO_KCFLAGS)" override-target=linux-$(platform)
 endif
+ifneq (,$(filter bcm-ptp-clock,$(knet_subdirs)))
+	$(MAKE) -C $(SDK)/systems/linux/kernel/modules/bcm-ptp-clock $(OPT_KERNEL_TOOLCHAIN) kernel_version=$(kernel_version) \
+		OPT_CFLAGS="$(ADD_TO_KCFLAGS)" override-target=linux-$(platform)
+endif
 ifneq (,$(filter bcm-genl,$(knet_subdirs)))
 ifneq (,$(filter genl-packet,$(knet_subdirs)))
 	$(MAKE) -C $(SDK)/systems/linux/kernel/modules/genl-packet $(OPT_KERNEL_TOOLCHAIN) kernel_version=$(kernel_version) \
@@ -235,6 +250,9 @@ $(BCM_KNET): $(KERN_BLDROOT)/$(BCM_KNET_LOCAL)
 $(KNET_CB): $(KERN_BLDROOT)/$(KNET_CB_LOCAL)
 	$(OBJCOPY) --strip-debug $< $@
 
+$(BCM_PTP): $(KERN_BLDROOT)/$(BCM_PTP_LOCAL)
+	$(OBJCOPY) --strip-debug $< $@
+
 $(GENL_PACKET): $(KERN_BLDROOT)/$(GENL_PACKET_LOCAL)
 	$(OBJCOPY) --strip-debug $< $@
 
@@ -262,6 +280,7 @@ clean::
 	$(RM) $(KERN_BLDROOT)/$(KNET_CB_LOCAL)
 	$(RM) $(KERN_BLDROOT)/$(GENL_PACKET_LOCAL)
 	$(RM) $(KERN_BLDROOT)/$(BCM_GENL_LOCAL)
+	$(RM) $(KERN_BLDROOT)/$(BCM_PTP_LOCAL)
 	$(RM) $(LOCAL_TARGETS)
 
 distclean:: clean
diff --git a/platform/broadcom/saibcm-modules/systems/linux/user/gts/Makefile b/platform/broadcom/saibcm-modules/systems/linux/user/gts/Makefile
index 01dd4e4e6f8d..6b0d0e07c331 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/user/gts/Makefile
+++ b/platform/broadcom/saibcm-modules/systems/linux/user/gts/Makefile
@@ -60,14 +60,12 @@ endif
 
 export SDK
 
-override kernel_version=5_10
+override kernel_version=6_6
 platform=gts
 
-LINUX_MAKE_USER=1
 export LINKER_RELAX = 1
 export ADD_TO_CFLAGS
 export BR_NO_CCACHE
 
-
 include ${SDK}/make/Make.linux
 
diff --git a/platform/broadcom/saibcm-modules/systems/linux/user/iproc-3_14/Makefile b/platform/broadcom/saibcm-modules/systems/linux/user/iproc-3_14/Makefile
index 5eeee4fe03d2..67ba097a6531 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/user/iproc-3_14/Makefile
+++ b/platform/broadcom/saibcm-modules/systems/linux/user/iproc-3_14/Makefile
@@ -68,7 +68,6 @@ export IPROC_BUILD
 export BUILD_PLATFORM
 export ARM_LINUX_VERSION
 
-LINUX_MAKE_USER=1
 export ADD_TO_CFLAGS
 
 include ${SDK}/make/Make.linux
diff --git a/platform/broadcom/saibcm-modules/systems/linux/user/iproc-4_4/Makefile b/platform/broadcom/saibcm-modules/systems/linux/user/iproc-4_4/Makefile
index 26c0ffbe0ea1..a27707ef07ee 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/user/iproc-4_4/Makefile
+++ b/platform/broadcom/saibcm-modules/systems/linux/user/iproc-4_4/Makefile
@@ -61,7 +61,6 @@ export IPROC_BUILD
 export BUILD_PLATFORM
 export ARM_LINUX_VERSION
 
-LINUX_MAKE_USER=1
 export ADD_TO_CFLAGS
 export BR_NO_CCACHE
 
diff --git a/platform/broadcom/saibcm-modules/systems/linux/user/iproc/Makefile b/platform/broadcom/saibcm-modules/systems/linux/user/iproc/Makefile
index 39353225bda8..caf769f958f2 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/user/iproc/Makefile
+++ b/platform/broadcom/saibcm-modules/systems/linux/user/iproc/Makefile
@@ -53,7 +53,7 @@ endif
 
 export SDK
 
-override kernel_version=5_10
+override kernel_version=6_6
 platform=iproc
 
 IPROC_BUILD=1
@@ -61,7 +61,6 @@ export IPROC_BUILD
 export BUILD_PLATFORM
 export ARM_LINUX_VERSION
 
-LINUX_MAKE_USER=1
 export ADD_TO_CFLAGS
 export BR_NO_CCACHE
 
diff --git a/platform/broadcom/saibcm-modules/systems/linux/user/iproc_64/Makefile b/platform/broadcom/saibcm-modules/systems/linux/user/iproc_64/Makefile
index c33e0825afdf..e08d57cee872 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/user/iproc_64/Makefile
+++ b/platform/broadcom/saibcm-modules/systems/linux/user/iproc_64/Makefile
@@ -53,7 +53,7 @@ endif
 
 export SDK
 
-override kernel_version=5_10
+override kernel_version=6_6
 platform=iproc_64
 
 IPROC_BUILD=1
@@ -61,7 +61,6 @@ export IPROC_BUILD
 export BUILD_PLATFORM
 export ARM_LINUX_VERSION
 
-LINUX_MAKE_USER=1
 export ADD_TO_CFLAGS
 export BR_NO_CCACHE
 
diff --git a/platform/broadcom/saibcm-modules/systems/linux/user/slk/Makefile b/platform/broadcom/saibcm-modules/systems/linux/user/slk/Makefile
index d354882a81df..617db79980a2 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/user/slk/Makefile
+++ b/platform/broadcom/saibcm-modules/systems/linux/user/slk/Makefile
@@ -62,7 +62,6 @@ export SDK
 
 override kernel_version=3_14
 platform=slk
-LINUX_MAKE_USER=1
 export LINKER_RELAX = 1
 
 include ${SDK}/make/Make.linux
diff --git a/platform/broadcom/saibcm-modules/systems/linux/user/x86-5_10/Makefile b/platform/broadcom/saibcm-modules/systems/linux/user/x86-5_10/Makefile
index ce4f94c424a2..9daefdf2166e 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/user/x86-5_10/Makefile
+++ b/platform/broadcom/saibcm-modules/systems/linux/user/x86-5_10/Makefile
@@ -70,7 +70,6 @@ export SDK
 override kernel_version=5_10
 platform=x86-5_10
 
-LINUX_MAKE_USER=1
 export LINKER_RELAX = 1
 
 # SHARED_LIBRARY_SUPPORT will enable the shared library creation - add a PIC to the compilation flags.
diff --git a/platform/broadcom/saibcm-modules/systems/linux/user/x86-64-fc28/Makefile b/platform/broadcom/saibcm-modules/systems/linux/user/x86-64-fc28/Makefile
index 1165fedce9a6..25888af33bbe 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/user/x86-64-fc28/Makefile
+++ b/platform/broadcom/saibcm-modules/systems/linux/user/x86-64-fc28/Makefile
@@ -74,7 +74,6 @@ override kernel_version=4_18
 endif
 platform=x86-64-fc28
 
-LINUX_MAKE_USER=1
 export LINKER_RELAX = 1
 
 # SHARED_LIBRARY_SUPPORT will enable the shared library creation - add a PIC to the compilation flags.
diff --git a/platform/broadcom/saibcm-modules/systems/linux/user/x86-smp_generic_64-2_6/Makefile b/platform/broadcom/saibcm-modules/systems/linux/user/x86-smp_generic_64-2_6/Makefile
index 8fdbb9042ca3..e08224dc2096 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/user/x86-smp_generic_64-2_6/Makefile
+++ b/platform/broadcom/saibcm-modules/systems/linux/user/x86-smp_generic_64-2_6/Makefile
@@ -50,5 +50,4 @@ export SDK
 override kernel_version=2_6
 platform=x86-smp_generic_64-$(kernel_version)
 
-LINUX_MAKE_USER=1
 include ${SDK}/make/Make.linux
diff --git a/platform/broadcom/saibcm-modules/systems/linux/user/xlr/Makefile b/platform/broadcom/saibcm-modules/systems/linux/user/xlr/Makefile
index bd572a15b4dc..e0a1ac66ce90 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/user/xlr/Makefile
+++ b/platform/broadcom/saibcm-modules/systems/linux/user/xlr/Makefile
@@ -60,14 +60,12 @@ endif
 
 export SDK
 
-override kernel_version=5_10
+override kernel_version=6_6
 platform=xlr
 
-LINUX_MAKE_USER=1
 export LINKER_RELAX = 1
 export ADD_TO_CFLAGS
 export BR_NO_CCACHE
 
-
 include ${SDK}/make/Make.linux