diff --git a/conf/machine/include/tegra-common.inc b/conf/machine/include/tegra-common.inc
index bca70e03a9d5..e97da0aaf4cd 100644
--- a/conf/machine/include/tegra-common.inc
+++ b/conf/machine/include/tegra-common.inc
@@ -119,6 +119,9 @@ TEGRA_SIGNING_ENV ?= "CHIPREV=${TEGRA_CHIPREV} BOARDID=${TEGRA_BOARDID} FAB=${TE
 
 TEGRA_FLASHVARS ?= "BPFDTB_FILE BPF_FILE BR_CMD_CONFIG CHIP_SKU DEVICEPROD_CONFIG DEVICE_CONFIG DEV_PARAMS DEV_PARAMS_B EMC_FUSE_DEV_PARAMS GPIOINT_CONFIG MB2BCT_CFG MINRATCHET_CONFIG MISC_CONFIG PINMUX_CONFIG PMC_CONFIG PMIC_CONFIG PROD_CONFIG SCR_CONFIG RAMCODE TBCDTB_FILE UPHY_CONFIG WB0SDRAM_BCT"
 TEGRA_FLASHVAR_TBCDTB_FILE ?= "@DTBFILE@"
+TEGRA_FLASH_CHECK_VARS ?= "BOARDID BOARDSKU"
+TEGRA_FLASH_CHECK_BOARDID ?= "${TEGRA_BOARDID}"
+TEGRA_FLASH_CHECK_BOARDSKU ?= "${TEGRA_BOARDSKU}"
 
 EMMC_BCTS ?= "${EMMC_BCT}${@',' + d.getVar('EMMC_BCT_OVERRIDE') if d.getVar('EMMC_BCT_OVERRIDE') else ''}"