Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/31693 )
Change subject: Fix <io.h> includes ......................................................................
Fix <io.h> includes
These resolved to <device/oprom/include/io.h> which included <arch/io.h> that we really wanted.
Change-Id: I9aa0bdf34cd1d53e20b4494c7986f0878f4fd840 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com Reviewed-on: https://review.coreboot.org/c/31693 Reviewed-by: Arthur Heymans arthur@aheymans.xyz Reviewed-by: Felix Held felix-coreboot@felixheld.de Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/soc/amd/stoneyridge/smbus.c M src/soc/intel/denverton_ns/uart_debug.c M src/southbridge/amd/agesa/hudson/smbus.c M src/southbridge/amd/pi/hudson/smbus.c 4 files changed, 3 insertions(+), 4 deletions(-)
Approvals: build bot (Jenkins): Verified Felix Held: Looks good to me, approved Arthur Heymans: Looks good to me, approved
diff --git a/src/soc/amd/stoneyridge/smbus.c b/src/soc/amd/stoneyridge/smbus.c index 21750d8..c4a022a 100644 --- a/src/soc/amd/stoneyridge/smbus.c +++ b/src/soc/amd/stoneyridge/smbus.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */
-#include <io.h> +#include <arch/io.h> #include <stdint.h> #include <soc/smbus.h> #include <soc/southbridge.h> diff --git a/src/soc/intel/denverton_ns/uart_debug.c b/src/soc/intel/denverton_ns/uart_debug.c index 5911a45..f7d523e 100644 --- a/src/soc/intel/denverton_ns/uart_debug.c +++ b/src/soc/intel/denverton_ns/uart_debug.c @@ -17,7 +17,6 @@ #include <stdint.h> #include <device/pci_def.h> #include <device/pci_ops.h> -#include <io.h> #include <soc/uart.h>
#define MY_PCI_DEV(SEGBUS, DEV, FN) \ diff --git a/src/southbridge/amd/agesa/hudson/smbus.c b/src/southbridge/amd/agesa/hudson/smbus.c index 33bc917..783c324 100644 --- a/src/southbridge/amd/agesa/hudson/smbus.c +++ b/src/southbridge/amd/agesa/hudson/smbus.c @@ -16,7 +16,7 @@ #ifndef _HUDSON_SMBUS_C_ #define _HUDSON_SMBUS_C_
-#include <io.h> +#include <arch/io.h> #include <stdint.h> #include "smbus.h"
diff --git a/src/southbridge/amd/pi/hudson/smbus.c b/src/southbridge/amd/pi/hudson/smbus.c index 33bc917..783c324 100644 --- a/src/southbridge/amd/pi/hudson/smbus.c +++ b/src/southbridge/amd/pi/hudson/smbus.c @@ -16,7 +16,7 @@ #ifndef _HUDSON_SMBUS_C_ #define _HUDSON_SMBUS_C_
-#include <io.h> +#include <arch/io.h> #include <stdint.h> #include "smbus.h"