Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/34854 )
Change subject: intel/icelake,cannonlake: Fix smi_espi_smihandler ......................................................................
intel/icelake,cannonlake: Fix smi_espi_smihandler
Implementations pulled prototype from <soc/smm.h> while caller pulled it from <intelblocks/smihandler.h>
Remove former.
Change-Id: Ie79702efab519b16cff45ccad61b95e7d8c2fbac Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/mainboard/google/dragonegg/smihandler.c M src/mainboard/google/drallion/smihandler.c M src/mainboard/google/eve/smihandler.c M src/mainboard/google/fizz/smihandler.c M src/mainboard/google/hatch/smihandler.c M src/mainboard/google/poppy/smihandler.c M src/mainboard/google/sarien/smihandler.c M src/soc/intel/cannonlake/include/soc/smm.h M src/soc/intel/icelake/include/soc/smm.h 9 files changed, 7 insertions(+), 12 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/54/34854/1
diff --git a/src/mainboard/google/dragonegg/smihandler.c b/src/mainboard/google/dragonegg/smihandler.c index 9c72cb6..8d2afd6 100644 --- a/src/mainboard/google/dragonegg/smihandler.c +++ b/src/mainboard/google/dragonegg/smihandler.c @@ -17,7 +17,7 @@ #include <ec/google/chromeec/smm.h> #include <gpio.h> #include <soc/gpio.h> -#include <soc/smm.h> +#include <intelblocks/smihandler.h> #include <variant/ec.h>
void mainboard_smi_espi_handler(void) diff --git a/src/mainboard/google/drallion/smihandler.c b/src/mainboard/google/drallion/smihandler.c index 0efcaa9..18dbfbc 100644 --- a/src/mainboard/google/drallion/smihandler.c +++ b/src/mainboard/google/drallion/smihandler.c @@ -15,7 +15,7 @@
#include <cpu/x86/smm.h> #include <ec/google/wilco/smm.h> -#include <soc/smm.h> +#include <intelblocks/smihandler.h> #include <variant/ec.h>
void mainboard_smi_espi_handler(void) diff --git a/src/mainboard/google/eve/smihandler.c b/src/mainboard/google/eve/smihandler.c index 7b97446..5bca488 100644 --- a/src/mainboard/google/eve/smihandler.c +++ b/src/mainboard/google/eve/smihandler.c @@ -16,7 +16,7 @@ #include <cpu/x86/smm.h> #include <ec/google/chromeec/smm.h> #include <gpio.h> -#include <soc/smm.h> +#include <intelblocks/smihandler.h> #include "ec.h" #include "gpio.h"
diff --git a/src/mainboard/google/fizz/smihandler.c b/src/mainboard/google/fizz/smihandler.c index 2b7367a..d20780c 100644 --- a/src/mainboard/google/fizz/smihandler.c +++ b/src/mainboard/google/fizz/smihandler.c @@ -15,7 +15,7 @@
#include <cpu/x86/smm.h> #include <ec/google/chromeec/smm.h> -#include <soc/smm.h> +#include <intelblocks/smihandler.h>
#include <baseboard/variants.h> #include <variant/ec.h> diff --git a/src/mainboard/google/hatch/smihandler.c b/src/mainboard/google/hatch/smihandler.c index 68d562d..c7833e3 100644 --- a/src/mainboard/google/hatch/smihandler.c +++ b/src/mainboard/google/hatch/smihandler.c @@ -17,7 +17,7 @@ #include <ec/google/chromeec/ec.h> #include <ec/google/chromeec/smm.h> #include <elog.h> -#include <soc/smm.h> +#include <intelblocks/smihandler.h> #include <variant/ec.h>
void mainboard_smi_espi_handler(void) diff --git a/src/mainboard/google/poppy/smihandler.c b/src/mainboard/google/poppy/smihandler.c index 4f45687..44ab10c 100644 --- a/src/mainboard/google/poppy/smihandler.c +++ b/src/mainboard/google/poppy/smihandler.c @@ -19,7 +19,7 @@ #include <elog.h> #include <gpio.h> #include <soc/gpio.h> -#include <soc/smm.h> +#include <intelblocks/smihandler.h>
#include <baseboard/variants.h> #include <variant/gpio.h> diff --git a/src/mainboard/google/sarien/smihandler.c b/src/mainboard/google/sarien/smihandler.c index 0efcaa9..18dbfbc 100644 --- a/src/mainboard/google/sarien/smihandler.c +++ b/src/mainboard/google/sarien/smihandler.c @@ -15,7 +15,7 @@
#include <cpu/x86/smm.h> #include <ec/google/wilco/smm.h> -#include <soc/smm.h> +#include <intelblocks/smihandler.h> #include <variant/ec.h>
void mainboard_smi_espi_handler(void) diff --git a/src/soc/intel/cannonlake/include/soc/smm.h b/src/soc/intel/cannonlake/include/soc/smm.h index 3c1f35c..f371286 100644 --- a/src/soc/intel/cannonlake/include/soc/smm.h +++ b/src/soc/intel/cannonlake/include/soc/smm.h @@ -28,8 +28,6 @@ u8 reserved[34]; } __packed;
-/* Mainboard handler for eSPI SMIs */ -void mainboard_smi_espi_handler(void);
void smm_relocation_handler(int cpu, uintptr_t curr_smbase, uintptr_t staggered_smbase); diff --git a/src/soc/intel/icelake/include/soc/smm.h b/src/soc/intel/icelake/include/soc/smm.h index b427085..e75193d 100644 --- a/src/soc/intel/icelake/include/soc/smm.h +++ b/src/soc/intel/icelake/include/soc/smm.h @@ -28,9 +28,6 @@ } __packed;
-/* Mainboard handler for eSPI SMIs */ -void mainboard_smi_espi_handler(void); - void smm_relocation_handler(int cpu, uintptr_t curr_smbase, uintptr_t staggered_smbase); void smm_info(uintptr_t *perm_smbase, size_t *perm_smsize,