From d30a49d613b117647e6e1aba08f9e31c9cf097a8 Mon Sep 17 00:00:00 2001 From: Lee Leahy Date: Mon, 30 May 2016 05:38:57 -0700 Subject: [PATCH] UPSTREAM: 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 Original-Signed-off-by: Lee Leahy Original-Reviewed-on: https://review.coreboot.org/15002 Original-Reviewed-by: Martin Roth (cherry-picked from commit d5493683eae95e9b89fcea7e126db7c7b1caf60d) Signed-off-by: Martin Roth Reviewed-on: https://chromium-review.googlesource.com/348418 Reviewed-by: Furquan Shaikh --- src/soc/intel/quark/include/soc/QuarkNcSocId.h | 2 ++ 1 file changed, 2 insertions(+) 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