Richard Spiegel has uploaded this change for review. ( https://review.coreboot.org/25845
Change subject: soc/amd/stoneyridge/include/soc/smi.h: Fix name colision ......................................................................
soc/amd/stoneyridge/include/soc/smi.h: Fix name colision
When smi.h is included to southbridge.h (to use SCI/SMI definitions within southbrige.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 richard.spiegel@silverbackltd.com --- M src/soc/amd/stoneyridge/include/soc/smi.h 1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/45/25845/1
diff --git a/src/soc/amd/stoneyridge/include/soc/smi.h b/src/soc/amd/stoneyridge/include/soc/smi.h index 34d3d74..636f9c3 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_sci_type { - NONE, - SCI, - SMI, - BOTH, + INTERRUPT_NONE, + INTERRUPT_SCI, + INTERRUPT_SMI, + INTERRUPT_BOTH, };
enum smi_sci_lvl {