From 12c12d1e070bc8fb4ed8602f21c142e9c3bbc9d3 Mon Sep 17 00:00:00 2001 From: Richard Spiegel Date: Wed, 25 Apr 2018 16:49:41 -0700 Subject: soc/amd/stoneyridge/include/soc/smi.h: Fix name collision When smi.h is included to southbridge.h (to use SCI/SMI definitions within southbridge.h definitions), this causes a collision of the definition of NONE (ioapic.h also has a NONE definition). As NONE is an enumeration of interrupt types (SCI/SMI), add INTERRUPT_ at the start of each definition. This is preparation to have GPIO table/code also declare/program SCI/SMI. BUG=b:72875858 TEST=Build grunt. Change-Id: I5c7b798f9f4d7c2a9f9c606c7ebffb7004a37b99 Signed-off-by: Richard Spiegel Reviewed-on: https://review.coreboot.org/25845 Reviewed-by: Martin Roth Reviewed-by: Marshall Dawson Reviewed-by: Paul Menzel Tested-by: build bot (Jenkins) --- src/soc/amd/stoneyridge/include/soc/smi.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/soc') diff --git a/src/soc/amd/stoneyridge/include/soc/smi.h b/src/soc/amd/stoneyridge/include/soc/smi.h index 34d3d74848..636f9c3559 100644 --- a/src/soc/amd/stoneyridge/include/soc/smi.h +++ b/src/soc/amd/stoneyridge/include/soc/smi.h @@ -201,10 +201,10 @@ enum smi_mode { }; enum smi_sci_type { - NONE, - SCI, - SMI, - BOTH, + INTERRUPT_NONE, + INTERRUPT_SCI, + INTERRUPT_SMI, + INTERRUPT_BOTH, }; enum smi_sci_lvl { -- cgit v1.2.3