From 2768e36f07edf4574d264b74febe9fe803153c17 Mon Sep 17 00:00:00 2001 From: Felix Held Date: Mon, 8 Jan 2024 17:26:52 +0100 Subject: sb/amd/pi/hudson: fix gpio.h and smi.h include location This fixes the following compile error when trying to build the APU2 board with HAVE_SMI_HANDLER selected and the NO_SMM select removed: In file included from src/soc/amd/common/block/gpio/gpio.c:8: src/include/gpio.h:6:10: fatal error: soc/gpio.h: No such file or directory 6 | #include /* IWYU pragma: export */ | ^~~~~~~~~~~~ Signed-off-by: Felix Held Change-Id: Ie06044b12f5cbcc55a2706ec566afd2eb294c62b Reviewed-on: https://review.coreboot.org/c/coreboot/+/79846 Reviewed-by: Matt DeVillier Tested-by: build bot (Jenkins) --- src/southbridge/amd/pi/hudson/Makefile.inc | 2 ++ src/southbridge/amd/pi/hudson/include/soc/gpio.h | 11 +++++++++++ src/southbridge/amd/pi/hudson/include/soc/smi.h | 11 +++++++++++ src/southbridge/amd/pi/hudson/soc/gpio.h | 11 ----------- src/southbridge/amd/pi/hudson/soc/smi.h | 11 ----------- 5 files changed, 24 insertions(+), 22 deletions(-) create mode 100644 src/southbridge/amd/pi/hudson/include/soc/gpio.h create mode 100644 src/southbridge/amd/pi/hudson/include/soc/smi.h delete mode 100644 src/southbridge/amd/pi/hudson/soc/gpio.h delete mode 100644 src/southbridge/amd/pi/hudson/soc/smi.h diff --git a/src/southbridge/amd/pi/hudson/Makefile.inc b/src/southbridge/amd/pi/hudson/Makefile.inc index a7be5a98f3..e7ec1b73ec 100644 --- a/src/southbridge/amd/pi/hudson/Makefile.inc +++ b/src/southbridge/amd/pi/hudson/Makefile.inc @@ -36,6 +36,8 @@ all-y += reset.c smm-y += smihandler.c smm-y += smi_util.c +CPPFLAGS_common += -I$(src)/southbridge/amd/pi/hudson/include + # ROMSIG At ROMBASE + 0x20000: # +-----------+---------------+----------------+------------+ # |0x55AA55AA |EC ROM Address |GEC ROM Address |USB3 ROM | diff --git a/src/southbridge/amd/pi/hudson/include/soc/gpio.h b/src/southbridge/amd/pi/hudson/include/soc/gpio.h new file mode 100644 index 0000000000..0850fe1764 --- /dev/null +++ b/src/southbridge/amd/pi/hudson/include/soc/gpio.h @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef SOC_GPIO_H +#define SOC_GPIO_H + +/* must provide gpio_t. */ +#include + +#define SOC_GPIO_TOTAL_PINS 133 + +#endif /* SOC_GPIO_H */ diff --git a/src/southbridge/amd/pi/hudson/include/soc/smi.h b/src/southbridge/amd/pi/hudson/include/soc/smi.h new file mode 100644 index 0000000000..da5ddbc2f7 --- /dev/null +++ b/src/southbridge/amd/pi/hudson/include/soc/smi.h @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef SOC_SMI_H +#define SOC_SMI_H + +#define SMI_SCI_TRIG 0x08 +#define SMI_SCI_LEVEL 0x0c +#define SMI_SCI_STATUS 0x10 +#define SMI_SCI_EN 0x14 + +#endif /* SOC_SMI_H */ diff --git a/src/southbridge/amd/pi/hudson/soc/gpio.h b/src/southbridge/amd/pi/hudson/soc/gpio.h deleted file mode 100644 index 0850fe1764..0000000000 --- a/src/southbridge/amd/pi/hudson/soc/gpio.h +++ /dev/null @@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#ifndef SOC_GPIO_H -#define SOC_GPIO_H - -/* must provide gpio_t. */ -#include - -#define SOC_GPIO_TOTAL_PINS 133 - -#endif /* SOC_GPIO_H */ diff --git a/src/southbridge/amd/pi/hudson/soc/smi.h b/src/southbridge/amd/pi/hudson/soc/smi.h deleted file mode 100644 index da5ddbc2f7..0000000000 --- a/src/southbridge/amd/pi/hudson/soc/smi.h +++ /dev/null @@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#ifndef SOC_SMI_H -#define SOC_SMI_H - -#define SMI_SCI_TRIG 0x08 -#define SMI_SCI_LEVEL 0x0c -#define SMI_SCI_STATUS 0x10 -#define SMI_SCI_EN 0x14 - -#endif /* SOC_SMI_H */ -- cgit v1.2.3