Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/57843 )
Change subject: [RFC] mb/google/guybrush,mancomb,zork: use soc/gpio.h include ......................................................................
[RFC] mb/google/guybrush,mancomb,zork: use soc/gpio.h include
Replace the amdblocks/gpio.h includes with soc/gpio.h includes which will include amdblocks/gpio.h and add the SoC-specific defines.
The files where this gets replaced only use the subset that is in the amdblocks/gpio.h include, but it would be more uniform to only include soc/gpio.h in the mainboard code. Since I'm not sure if there was some intention behind the current state, I've added an RFC tag and wait for some comments whether this is a good or a bad idea. Haven't changed mb/pcengines/apu2, since soc/gpio.h on that platform is mostly a stub that just provides enough to make the compiler happy.
Signed-off-by: Felix Held felix-coreboot@felixheld.de Change-Id: I3627120302f7e4639675d05c1c08d0d62ad67ba5 --- M src/mainboard/google/guybrush/ec.c M src/mainboard/google/guybrush/variants/baseboard/include/baseboard/variants.h M src/mainboard/google/guybrush/verstage.c M src/mainboard/google/mancomb/ec.c M src/mainboard/google/mancomb/variants/baseboard/include/baseboard/variants.h M src/mainboard/google/mancomb/verstage.c M src/mainboard/google/zork/mainboard.c M src/mainboard/google/zork/verstage.c 8 files changed, 7 insertions(+), 8 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/43/57843/1
diff --git a/src/mainboard/google/guybrush/ec.c b/src/mainboard/google/guybrush/ec.c index f62ca20..9509cc2 100644 --- a/src/mainboard/google/guybrush/ec.c +++ b/src/mainboard/google/guybrush/ec.c @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */
#include <acpi/acpi.h> -#include <amdblocks/gpio.h> #include <amdblocks/smi.h> #include <ec/google/chromeec/ec.h> +#include <soc/gpio.h> #include <soc/smi.h> #include <variant/ec.h>
diff --git a/src/mainboard/google/guybrush/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/guybrush/variants/baseboard/include/baseboard/variants.h index aab905b..5439d5f 100644 --- a/src/mainboard/google/guybrush/variants/baseboard/include/baseboard/variants.h +++ b/src/mainboard/google/guybrush/variants/baseboard/include/baseboard/variants.h @@ -3,7 +3,7 @@ #ifndef __BASEBOARD_VARIANTS_H__ #define __BASEBOARD_VARIANTS_H__
-#include <amdblocks/gpio.h> +#include <soc/gpio.h> #include <soc/pci_devs.h>
#define WLAN_DEVFN PCIE_GPP_2_0_DEVFN diff --git a/src/mainboard/google/guybrush/verstage.c b/src/mainboard/google/guybrush/verstage.c index aaaaf03..745681d 100644 --- a/src/mainboard/google/guybrush/verstage.c +++ b/src/mainboard/google/guybrush/verstage.c @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */
#include <amdblocks/acpimmio.h> -#include <amdblocks/gpio.h> #include <arch/io.h> #include <baseboard/variants.h> #include <security/vboot/vboot_common.h> +#include <soc/gpio.h>
static void setup_gpio(void) { diff --git a/src/mainboard/google/mancomb/ec.c b/src/mainboard/google/mancomb/ec.c index f62ca20..9509cc2 100644 --- a/src/mainboard/google/mancomb/ec.c +++ b/src/mainboard/google/mancomb/ec.c @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */
#include <acpi/acpi.h> -#include <amdblocks/gpio.h> #include <amdblocks/smi.h> #include <ec/google/chromeec/ec.h> +#include <soc/gpio.h> #include <soc/smi.h> #include <variant/ec.h>
diff --git a/src/mainboard/google/mancomb/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/mancomb/variants/baseboard/include/baseboard/variants.h index 632849d..29d8431 100644 --- a/src/mainboard/google/mancomb/variants/baseboard/include/baseboard/variants.h +++ b/src/mainboard/google/mancomb/variants/baseboard/include/baseboard/variants.h @@ -3,7 +3,7 @@ #ifndef __BASEBOARD_VARIANTS_H__ #define __BASEBOARD_VARIANTS_H__
-#include <amdblocks/gpio.h> +#include <soc/gpio.h>
/* * This function provides base GPIO configuration table. It is typically provided by diff --git a/src/mainboard/google/mancomb/verstage.c b/src/mainboard/google/mancomb/verstage.c index d2d9277..d8282a1 100644 --- a/src/mainboard/google/mancomb/verstage.c +++ b/src/mainboard/google/mancomb/verstage.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */
-#include <amdblocks/gpio.h> #include <baseboard/variants.h> #include <security/vboot/vboot_common.h> +#include <soc/gpio.h>
static void setup_gpio(void) { diff --git a/src/mainboard/google/zork/mainboard.c b/src/mainboard/google/zork/mainboard.c index ea292f1..fca5610 100644 --- a/src/mainboard/google/zork/mainboard.c +++ b/src/mainboard/google/zork/mainboard.c @@ -7,7 +7,6 @@ #include <acpi/acpi.h> #include <acpi/acpigen.h> #include <amdblocks/amd_pci_util.h> -#include <amdblocks/gpio.h> #include <amdblocks/smi.h> #include <baseboard/variants.h> #include <boardid.h> diff --git a/src/mainboard/google/zork/verstage.c b/src/mainboard/google/zork/verstage.c index e1277f4..16e72bd 100644 --- a/src/mainboard/google/zork/verstage.c +++ b/src/mainboard/google/zork/verstage.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */
-#include <amdblocks/gpio.h> #include <baseboard/variants.h> #include <security/vboot/vboot_common.h> +#include <soc/gpio.h>
static void setup_gpio(void) {