summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLee Leahy <leroy.p.leahy@intel.com>2016-05-30 05:38:57 -0700
committerLeroy P Leahy <leroy.p.leahy@intel.com>2016-05-31 22:01:27 +0200
commitd5493683eae95e9b89fcea7e126db7c7b1caf60d (patch)
tree2027ef52a36cc53e4fa8568e25de7182f4b39da9
parent5e808cb811d9cfbf38b9d50ba0de4d5129c2b339 (diff)
downloadcoreboot-d5493683eae95e9b89fcea7e126db7c7b1caf60d.tar.xz
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>
-rw-r--r--src/soc/intel/quark/include/soc/QuarkNcSocId.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/soc/intel/quark/include/soc/QuarkNcSocId.h b/src/soc/intel/quark/include/soc/QuarkNcSocId.h
index 12f600a690..8b5ca2c0c5 100644
--- a/src/soc/intel/quark/include/soc/QuarkNcSocId.h
+++ b/src/soc/intel/quark/include/soc/QuarkNcSocId.h
@@ -24,6 +24,7 @@ Definitions beginning with "N_" are the bit position
//
// Define the bits
//
+#ifndef BIT0
#define BIT0 0x00000001
#define BIT1 0x00000002
#define BIT2 0x00000004
@@ -56,6 +57,7 @@ Definitions beginning with "N_" are the bit position
#define BIT29 0x20000000
#define BIT30 0x40000000
#define BIT31 0x80000000
+#endif
//
// QNC GMCH Equates