From 733ad92c65d76b972dc52ef3c60bad974204b1dd Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Fri, 3 Nov 2017 12:46:26 -0600 Subject: soc/amd/stoneyridge: start header file for iomap Create a new header file, iomap.h, which serves as a single place for providing the address space definitions. Remove the amd_defs.h file that had a single define in it. Change-Id: I1b1aaa8c5d60d670c272ac7131faeb6b3edc1968 Signed-off-by: Aaron Durbin Reviewed-on: https://review.coreboot.org/22318 Tested-by: build bot (Jenkins) --- src/soc/amd/common/amd_defs.h | 22 ---------------------- src/soc/amd/stoneyridge/include/soc/gpio.h | 2 +- src/soc/amd/stoneyridge/include/soc/iomap.h | 22 ++++++++++++++++++++++ 3 files changed, 23 insertions(+), 23 deletions(-) delete mode 100644 src/soc/amd/common/amd_defs.h create mode 100644 src/soc/amd/stoneyridge/include/soc/iomap.h diff --git a/src/soc/amd/common/amd_defs.h b/src/soc/amd/common/amd_defs.h deleted file mode 100644 index e4ce1dba22..0000000000 --- a/src/soc/amd/common/amd_defs.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2017 Raptor Engineering, LLC - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - - -#ifndef __AMD_SB_DEFS_H__ -#define __AMD_SB_DEFS_H__ - -#define AMD_SB_ACPI_MMIO_ADDR 0xfed80000ul - -#endif diff --git a/src/soc/amd/stoneyridge/include/soc/gpio.h b/src/soc/amd/stoneyridge/include/soc/gpio.h index 734074aad6..0854cf3d96 100644 --- a/src/soc/amd/stoneyridge/include/soc/gpio.h +++ b/src/soc/amd/stoneyridge/include/soc/gpio.h @@ -20,7 +20,7 @@ #define GPIO_DEVICE_DESC "GPIO Controller" #ifndef __ACPI__ -#include +#include #include #define GPIO_PIN_STS (1 << 16) diff --git a/src/soc/amd/stoneyridge/include/soc/iomap.h b/src/soc/amd/stoneyridge/include/soc/iomap.h new file mode 100644 index 0000000000..d0c3f3e9d4 --- /dev/null +++ b/src/soc/amd/stoneyridge/include/soc/iomap.h @@ -0,0 +1,22 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2017 Raptor Engineering, LLC + * Copyright 2017 Google Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __SOC_STONEYRIDGE_IOMAP_H__ +#define __SOC_STONEYRIDGE_IOMAP_H__ + +#define AMD_SB_ACPI_MMIO_ADDR 0xfed80000ul + +#endif /* __SOC_STONEYRIDGE_IOMAP_H__ */ -- cgit v1.2.3