#define JBUSMC_REGS_SIZE               8
 
-#define JB_MC_REG1_DIMM2_BANK3         0x8000000000000000
-#define JB_MC_REG1_DIMM1_BANK1         0x4000000000000000
-#define JB_MC_REG1_DIMM2_BANK2         0x2000000000000000
-#define JB_MC_REG1_DIMM1_BANK0         0x1000000000000000
-#define JB_MC_REG1_XOR                 0x0000010000000000
-#define JB_MC_REG1_ADDR_GEN_2          0x000000e000000000
+#define JB_MC_REG1_DIMM2_BANK3         0x8000000000000000UL
+#define JB_MC_REG1_DIMM1_BANK1         0x4000000000000000UL
+#define JB_MC_REG1_DIMM2_BANK2         0x2000000000000000UL
+#define JB_MC_REG1_DIMM1_BANK0         0x1000000000000000UL
+#define JB_MC_REG1_XOR                 0x0000010000000000UL
+#define JB_MC_REG1_ADDR_GEN_2          0x000000e000000000UL
 #define JB_MC_REG1_ADDR_GEN_2_SHIFT    37
-#define JB_MC_REG1_ADDR_GEN_1          0x0000001c00000000
+#define JB_MC_REG1_ADDR_GEN_1          0x0000001c00000000UL
 #define JB_MC_REG1_ADDR_GEN_1_SHIFT    34
-#define JB_MC_REG1_INTERLEAVE          0x0000000001800000
+#define JB_MC_REG1_INTERLEAVE          0x0000000001800000UL
 #define JB_MC_REG1_INTERLEAVE_SHIFT    23
-#define JB_MC_REG1_DIMM2_PTYPE         0x0000000000200000
+#define JB_MC_REG1_DIMM2_PTYPE         0x0000000000200000UL
 #define JB_MC_REG1_DIMM2_PTYPE_SHIFT   21
-#define JB_MC_REG1_DIMM1_PTYPE         0x0000000000100000
+#define JB_MC_REG1_DIMM1_PTYPE         0x0000000000100000UL
 #define JB_MC_REG1_DIMM1_PTYPE_SHIFT   20
 
 #define PART_TYPE_X8           0