diff --git a/iopsys-brcm63xx-arm/image/Config.in b/iopsys-brcm63xx-arm/image/Config.in
index fa30989c7f4b3ebb297610e11057bf4cba6892af..29555cf810f3344ea7d7221be2f4828a337cf1e6 100644
--- a/iopsys-brcm63xx-arm/image/Config.in
+++ b/iopsys-brcm63xx-arm/image/Config.in
@@ -129,14 +129,14 @@ config TARGET_IMAGE_PRODUCTION_PRODUCTION_FLAG
 	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 ""
@@ -144,7 +144,6 @@ config TARGET_IMAGE_PRODUCTION_NUM_MACADDR
 	help
 		Number of MAC addresses.
 
-
 # END PRODUCTION PARAMETERS
 
 config TARGET_IMAGE_MIGRATOR
diff --git a/iopsys-brcm63xx-arm/image/Makefile b/iopsys-brcm63xx-arm/image/Makefile
index dca8496dcea4de1ee5ea70cfa4633eaa89338279..773d65be072583d5879ddb3e5b41ba2bc7242d83 100644
--- a/iopsys-brcm63xx-arm/image/Makefile
+++ b/iopsys-brcm63xx-arm/image/Makefile
@@ -397,10 +397,10 @@ endif
 define Production_image
 	#Copy cferom bootloader and ubi nand ecc image to bin directory.
 	echo "In Production Image"
-	
-	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)	
+
+	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