From 8292f4160a80a391892a42c7305e5992d278d254 Mon Sep 17 00:00:00 2001
From: Elyes HAOUAS <ehaouas@noos.fr>
Date: Wed, 29 Dec 2021 08:22:01 +0100
Subject: src: Remove duplicated includes

Change-Id: I50cdffca34a6150ac11c3e83e1a603b766d1b84e
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/60438
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
---
 src/mainboard/google/brya/bootblock.c                   | 1 -
 src/mainboard/google/guybrush/variants/guybrush/gpio.c  | 1 -
 src/mainboard/google/guybrush/variants/nipperkin/gpio.c | 1 -
 src/mainboard/google/herobrine/mainboard.c              | 2 --
 src/soc/amd/picasso/fsp_s_params.c                      | 1 -
 src/soc/intel/broadwell/pch/adsp.c                      | 1 -
 6 files changed, 7 deletions(-)

diff --git a/src/mainboard/google/brya/bootblock.c b/src/mainboard/google/brya/bootblock.c
index ac0dc32da8..d391cd1de5 100644
--- a/src/mainboard/google/brya/bootblock.c
+++ b/src/mainboard/google/brya/bootblock.c
@@ -5,7 +5,6 @@
 #include <console/console.h>
 #include <fmap.h>
 #include <commonlib/region.h>
-#include <console/console.h>
 #include <cpu/intel/cpu_ids.h>
 #include <intelblocks/pmclib.h>
 #include <cf9_reset.h>
diff --git a/src/mainboard/google/guybrush/variants/guybrush/gpio.c b/src/mainboard/google/guybrush/variants/guybrush/gpio.c
index 0ebee22555..cea1f42cca 100644
--- a/src/mainboard/google/guybrush/variants/guybrush/gpio.c
+++ b/src/mainboard/google/guybrush/variants/guybrush/gpio.c
@@ -5,7 +5,6 @@
 #include <boardid.h>
 #include <gpio.h>
 #include <soc/gpio.h>
-#include <baseboard/variants.h>
 
 /* This table is used by guybrush variant with board version < 2. */
 static const struct soc_amd_gpio bid1_ramstage_gpio_table[] = {
diff --git a/src/mainboard/google/guybrush/variants/nipperkin/gpio.c b/src/mainboard/google/guybrush/variants/nipperkin/gpio.c
index df55e5227e..0b3b9b265e 100644
--- a/src/mainboard/google/guybrush/variants/nipperkin/gpio.c
+++ b/src/mainboard/google/guybrush/variants/nipperkin/gpio.c
@@ -5,7 +5,6 @@
 #include <boardid.h>
 #include <gpio.h>
 #include <soc/gpio.h>
-#include <baseboard/variants.h>
 
 /* This table is used by nipperkin variant with board version < 2. */
 static const struct soc_amd_gpio bid1_override_gpio_table[] = {
diff --git a/src/mainboard/google/herobrine/mainboard.c b/src/mainboard/google/herobrine/mainboard.c
index a2e0786866..fcc468ede3 100644
--- a/src/mainboard/google/herobrine/mainboard.c
+++ b/src/mainboard/google/herobrine/mainboard.c
@@ -3,11 +3,9 @@
 #include "board.h"
 #include <boardid.h>
 #include <bootblock_common.h>
-#include <soc/clock.h>
 #include <console/console.h>
 #include <device/device.h>
 #include <device/mmio.h>
-#include <bootblock_common.h>
 #include <soc/clock.h>
 #include <soc/qupv3_config_common.h>
 #include <soc/qup_se_handlers_common.h>
diff --git a/src/soc/amd/picasso/fsp_s_params.c b/src/soc/amd/picasso/fsp_s_params.c
index 57e51d5c02..af7de37057 100644
--- a/src/soc/amd/picasso/fsp_s_params.c
+++ b/src/soc/amd/picasso/fsp_s_params.c
@@ -9,7 +9,6 @@
 #include <soc/soc_util.h>
 #include <fsp/api.h>
 #include "chip.h"
-#include <device/pci.h>
 
 static void fsps_update_emmc_config(FSP_S_CONFIG *scfg,
 				const struct soc_amd_picasso_config *cfg)
diff --git a/src/soc/intel/broadwell/pch/adsp.c b/src/soc/intel/broadwell/pch/adsp.c
index eaae08b881..e154446aaf 100644
--- a/src/soc/intel/broadwell/pch/adsp.c
+++ b/src/soc/intel/broadwell/pch/adsp.c
@@ -9,7 +9,6 @@
 #include <device/mmio.h>
 #include <soc/adsp.h>
 #include <soc/device_nvs.h>
-#include <soc/device_nvs.h>
 #include <soc/pch.h>
 #include <soc/rcba.h>
 #include <soc/intel/broadwell/pch/chip.h>
-- 
cgit v1.2.3