The magic values for Iopsys single-UBI pureUBI has been moved into one

common header for all who needs it. This reduces code duplication.

brcm_fw_tool/image-ubi.h

 #ifndef IMAGE_UBI_H
 #define IMAGE_UBI_H
 
+#include "iopsys_pureUBI.h"
+
 
 //-------------------------------------------------------------
-#define METAVOLID0		1									// VOLID_METADATA in Broadcom nomenclature.
-#define METAVOLID1		2									// VOLID_METADATA_COPY in Broadcom nomenclature.
-#define METAVOLID2		86 // 88
-#define METAVOLID3		87 // 89
+/* Iopsys pureUBI with a single large UBI. These contant
+ * numbers must match in all of these files:
+ *  brcm_fw_tool/image-ubi.h
+ *  bcmkernel/bcm963xx/shared/opensource/include/bcm963xx/bcm_ubi.h
+ *  bcmkernel/bcm963xx/kernel/linux-4.1/drivers/mtd/ubi/build.c  */
+#define METAVOLID0		(VOLID_METADATA0)
+#define METAVOLID1		(VOLID_METADATA1)
+#define METAVOLID2		(VOLID_METADATA2)
+#define METAVOLID3		(VOLID_METADATA3)
 #define METAINVALID		-1
 #define MAX_METAS		4									// Max number of metadata volumes in the system.
 
-#define BOOTVOL0		10									// VOLID_UBIFILES in Broadcom nomenclature.
-#define BOOTVOL1		88 // 92
+#define BOOTVOL0		(VOLID_UBIFILES0)
+#define BOOTVOL1		(VOLID_UBIFILES1)
 
-#define ROOTFS0			0									// VOLID_UBIFS in Broadcom nomenclature.
-#define ROOTFS1			89 // 95
+#define ROOTFS0			(VOLID_UBIFS0Q)
+#define ROOTFS1			(VOLID_UBIFS1)
 
 
 //-------------------------------------------------------------