the following patch was just integrated into master: commit d5493683eae95e9b89fcea7e126db7c7b1caf60d Author: Lee Leahy <leroy.p.leahy@intel.com> Date: Mon May 30 05:38:57 2016 -0700 soc/intel/quark: Conditionally define BIT names Only define BIT names if they are not already defined. TEST=Build and run on Galileo Gen2 Change-Id: Ief4c4bb7a42a1bb2a7f46f13dc9b8bbb4d233e3c Signed-off-by: Lee Leahy <leroy.p.leahy@intel.com> Reviewed-on: https://review.coreboot.org/15002 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth <martinroth@google.com> See https://review.coreboot.org/15002 for details. -gerrit