summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2021-11-04 16:51:45 +0200
committerFelix Held <felix-coreboot@felixheld.de>2021-11-09 00:13:25 +0000
commitf40a25bb119555755c9714ca841292c85258c3e3 (patch)
treeedad1e13e5554a3b30f48c63a5d6600da5a7eae9
parent586b1beb9c11165265310883bfca209a0356c0ab (diff)
downloadcoreboot-f40a25bb119555755c9714ca841292c85258c3e3.tar.gz
coreboot-f40a25bb119555755c9714ca841292c85258c3e3.tar.bz2
coreboot-f40a25bb119555755c9714ca841292c85258c3e3.zip
soc/nvidia,qualcomm: Fix indirect includes
Avoid indirect <vc/google/chromeos/chromeos.h> as the files really only need <security/vboot/vboot_common.h>. Change-Id: Ic02bd5dcdde0bb5c8be0e2c52c20048ed0d4ad94 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/58949 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Paul Menzel <paulepanter@mailbox.org> Reviewed-by: Julius Werner <jwerner@chromium.org>
-rw-r--r--src/mainboard/google/gale/verstage.c2
-rw-r--r--src/soc/nvidia/tegra124/verstage.c2
-rw-r--r--src/soc/nvidia/tegra210/include/soc/verstage.h8
-rw-r--r--src/soc/qualcomm/ipq40xx/include/soc/verstage.h8
4 files changed, 2 insertions, 18 deletions
diff --git a/src/mainboard/google/gale/verstage.c b/src/mainboard/google/gale/verstage.c
index 9bdd307bc1a5..6dfc2307af4c 100644
--- a/src/mainboard/google/gale/verstage.c
+++ b/src/mainboard/google/gale/verstage.c
@@ -2,7 +2,7 @@
#include <delay.h>
#include <gpio.h>
-#include <soc/verstage.h>
+#include <security/vboot/vboot_common.h>
#define TPM_RESET_GPIO 19
diff --git a/src/soc/nvidia/tegra124/verstage.c b/src/soc/nvidia/tegra124/verstage.c
index f5fdb8d197a4..62bdbdadf9c5 100644
--- a/src/soc/nvidia/tegra124/verstage.c
+++ b/src/soc/nvidia/tegra124/verstage.c
@@ -5,10 +5,10 @@
#include <arch/hlt.h>
#include <arch/stages.h>
#include <program_loading.h>
+#include <security/vboot/vboot_common.h>
#include <soc/cache.h>
#include <soc/early_configs.h>
#include <symbols.h>
-#include <vendorcode/google/chromeos/chromeos.h>
static void enable_cache(void)
{
diff --git a/src/soc/nvidia/tegra210/include/soc/verstage.h b/src/soc/nvidia/tegra210/include/soc/verstage.h
deleted file mode 100644
index 5bc3da054f6c..000000000000
--- a/src/soc/nvidia/tegra210/include/soc/verstage.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#ifndef __SOC_NVIDIA_TEGRA210_SOC_VERSTAGE_H__
-#define __SOC_NVIDIA_TEGRA210_SOC_VERSTAGE_H__
-
-#include <vendorcode/google/chromeos/chromeos.h>
-
-#endif /* __SOC_NVIDIA_TEGRA210_SOC_VERSTAGE_H__ */
diff --git a/src/soc/qualcomm/ipq40xx/include/soc/verstage.h b/src/soc/qualcomm/ipq40xx/include/soc/verstage.h
deleted file mode 100644
index 779a90e5f5ab..000000000000
--- a/src/soc/qualcomm/ipq40xx/include/soc/verstage.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#ifndef __SOC_QUALCOMM_IPQ40XX_INCLUDE_SOC_VERSTAGE_H__
-#define __SOC_QUALCOMM_IPQ40XX_INCLUDE_SOC_VERSTAGE_H__
-
-#include <vendorcode/google/chromeos/chromeos.h>
-
-#endif /* __SOC_QUALCOMM_IPQ40XX_INCLUDE_SOC_VERSTAGE_H__ */