diff --git a/iopsys-brcm63xx-arm/image/Config.in b/iopsys-brcm63xx-arm/image/Config.in
index 95443dba8c33a5392e9235ea5cf216a2aef07ad3..fa30989c7f4b3ebb297610e11057bf4cba6892af 100644
--- a/iopsys-brcm63xx-arm/image/Config.in
+++ b/iopsys-brcm63xx-arm/image/Config.in
@@ -88,12 +88,65 @@ config TARGET_IMAGE_Y3
 	default y if BRCM_SDK_VER_502002 || BRCM_SDK_VER_502003 || BRCM_SDK_VER_502006 || BRCM_SDK_VER_502007
 	depends on BRCM_SDK_VER_502002 || BRCM_SDK_VER_502003 || BRCM_SDK_VER_502006 || BRCM_SDK_VER_502007
 
+# BEGIN PRODUCTION PARAMETERS
 config TARGET_IMAGE_PRODUCTION
 	bool "Production image"
 	default n
 	help
 		Generate manufacturing image, raw nand with ecc data
 
+config TARGET_IMAGE_PRODUCTION_PARAMS
+	bool "Edit nvram parameters"
+	default n
+	depends TARGET_IMAGE_PRODUCTION
+	help
+		Edit the nvram parameters on file.
+
+config TARGET_IMAGE_PRODUCTION_BOARD_ID
+	string "Board ID"
+	default ""
+	depends TARGET_IMAGE_PRODUCTION_PARAMS
+	help
+		Sets board id in nvram.
+
+config TARGET_IMAGE_PRODUCTION_VOICEBOARD_ID
+	string "Voice board ID"
+	default ""
+	depends TARGET_IMAGE_PRODUCTION_PARAMS
+	help
+		Sets voiceboard id in nvram.
+
+config TARGET_IMAGE_PRODUCTION_NVRAM_OFFSET
+	hex "Offset to nvram in ECC file"
+	default 0x10580
+	depends TARGET_IMAGE_PRODUCTION_PARAMS
+	help
+		Offset to nvram in the nand.v-image.
+
+config TARGET_IMAGE_PRODUCTION_PRODUCTION_FLAG
+	bool "Set the production flag"
+	default y
+	depends TARGET_IMAGE_PRODUCTION_PARAMS
+	help
+		Sets the nvram production flag.
+		
+config TARGET_IMAGE_PRODUCTION_BASE_MACADDR
+	string "Base MAC address"
+	default ""
+	depends TARGET_IMAGE_PRODUCTION_PARAMS
+	help
+		Sets base mac address.
+		
+config TARGET_IMAGE_PRODUCTION_NUM_MACADDR
+	string "Number of MAC addresses"
+	default ""
+	depends TARGET_IMAGE_PRODUCTION_PARAMS
+	help
+		Number of MAC addresses.
+
+
+# END PRODUCTION PARAMETERS
+
 config TARGET_IMAGE_MIGRATOR
 	bool "Build iopsysWrt 4 to 5 migrator image"
 	default N
diff --git a/iopsys-brcm63xx-arm/image/Makefile b/iopsys-brcm63xx-arm/image/Makefile
index 9bc47d4a062ab704082a2f27cf3b1ed56042ccd6..dca8496dcea4de1ee5ea70cfa4633eaa89338279 100644
--- a/iopsys-brcm63xx-arm/image/Makefile
+++ b/iopsys-brcm63xx-arm/image/Makefile
@@ -373,12 +373,38 @@ else
 ADDVTOKEN_DDR_TYPE=
 endif
 
-define Production_image
+ifeq ($(CONFIG_TARGET_IMAGE_PRODUCTION_PRODUCTION_FLAG),y)
+TARGET_IMAGE_PRODUCTION_FLAG=1
+else
+TARGET_IMAGE_PRODUCTION_FLAG=0
+endif
+ifeq ($(CONFIG_BIG_ENDIAN),y)
+TARGET_IMAGE_IS_LITTLE_ENDIAN=
+else
+TARGET_IMAGE_IS_LITTLE_ENDIAN=--endian=little
+endif
+ifeq ($(CONFIG_TARGET_IMAGE_PRODUCTION_BASE_MACADDR),"")
+TARGET_IMAGE_BASE_MAC=
+else
+TARGET_IMAGE_BASE_MAC=--macaddr=$(CONFIG_TARGET_IMAGE_PRODUCTION_BASE_MACADDR)
+endif
+ifeq ($(CONFIG_TARGET_IMAGE_PRODUCTION_NUM_MACADDR),"")
+TARGET_IMAGE_MAC_NUM=
+else
+TARGET_IMAGE_MAC_NUM=--numbermac=$(CONFIG_TARGET_IMAGE_PRODUCTION_NUM_MACADDR)
+endif
 
+define Production_image
 	#Copy cferom bootloader and ubi nand ecc image to bin directory.
 	echo "In Production Image"
-
-	cd $(KDIR) ; $(STAGING_DIR_HOST)/bin/nand-image-builder -i cfe$(CONFIG_BCM_CHIP_ID)_nand.v -o cfe$(CONFIG_BCM_CHIP_ID)_nand.ecc -b $(CONFIG_TARGET_NAND_BLOCKSZ) \
+	
+	cp $(KDIR) ; cp $(KDIR)/cfe$(CONFIG_BCM_CHIP_ID)_nand.v $(KDIR)/cfe$(CONFIG_BCM_CHIP_ID)_nand.v.tmp 
+	
+ifeq ($(CONFIG_TARGET_IMAGE_PRODUCTION_PARAMS),y)	
+	cd $(KDIR) ; $(HOSTTOOLS_DIR)/editnvram $(TARGET_IMAGE_IS_LITTLE_ENDIAN) --boardid=$(CONFIG_TARGET_IMAGE_PRODUCTION_BOARD_ID) --voiceboardid=$(CONFIG_TARGET_IMAGE_PRODUCTION_VOICEBOARD_ID) --production=$(TARGET_IMAGE_PRODUCTION_FLAG) $(TARGET_IMAGE_MAC_NUM) $(TARGET_IMAGE_BASE_MAC) -O $(CONFIG_TARGET_IMAGE_PRODUCTION_NVRAM_OFFSET) cfe$(CONFIG_BCM_CHIP_ID)_nand.v.tmp cfe$(CONFIG_BCM_CHIP_ID)_nand.v.out && \
+		mv cfe$(CONFIG_BCM_CHIP_ID)_nand.v.out cfe$(CONFIG_BCM_CHIP_ID)_nand.v.tmp
+endif
+	cd $(KDIR) ; $(STAGING_DIR_HOST)/bin/nand-image-builder -i cfe$(CONFIG_BCM_CHIP_ID)_nand.v.tmp -o cfe$(CONFIG_BCM_CHIP_ID)_nand.ecc -b $(CONFIG_TARGET_NAND_BLOCKSZ) \
 		-p $(CONFIG_TARGET_NAND_PAGESZ) -s $(CONFIG_TARGET_NAND_SPARE_SIZE) -e $(CONFIG_TARGET_NAND_BCH_LEVEL) -m $(FIELD_ORDER)
 
 	cd $(KDIR) ; $(STAGING_DIR_HOST)/bin/nand-image-builder -i root.ubi -o root-nand.ecc -b $(CONFIG_TARGET_NAND_BLOCKSZ) \
@@ -394,7 +420,7 @@ define Production_image
 
 	ln -sf $(BIN_DIR)/$(IHGSP_BUILD_VERSION)_cfe.ecc $(BIN_DIR)/cfe.ecc
 	ln -sf $(BIN_DIR)/$(IHGSP_BUILD_VERSION)_root.ecc $(BIN_DIR)/root.ecc
-
+	rm $(KDIR)/cfe$(CONFIG_BCM_CHIP_ID)_nand.v.tmp
 endef
 
 define Image/Build/imgY3