diff options
| author | Philipp Deppenwiese <zaolin@das-labor.org> | 2017-10-17 17:02:29 +0200 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2017-10-22 02:14:46 +0000 |
| commit | fea2429e254c41b192dd0856966d5f80eb15a07a (patch) | |
| tree | 40e81b3ca7ee3c1f9985af9a8a24a3a9b21e8700 /src/vendorcode/google | |
| parent | 9e0d69bf1e0194509108eba23511a12d597ae49e (diff) | |
security/vboot: Move vboot2 to security kconfig section
This commit just moves the vboot sources into
the security directory and fixes kconfig/makefile paths.
Fix vboot2 headers
Change-Id: Icd87f95640186f7a625242a3937e1dd13347eb60
Signed-off-by: Philipp Deppenwiese <zaolin@das-labor.org>
Reviewed-on: https://review.coreboot.org/22074
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin Roth <martinroth@google.com>
Diffstat (limited to 'src/vendorcode/google')
| -rw-r--r-- | src/vendorcode/google/chromeos/acpi/chromeos.asl | 2 | ||||
| -rw-r--r-- | src/vendorcode/google/chromeos/chromeos.h | 4 | ||||
| -rw-r--r-- | src/vendorcode/google/chromeos/cr50_enable_update.c | 2 | ||||
| -rw-r--r-- | src/vendorcode/google/chromeos/elog.c | 2 | ||||
| -rw-r--r-- | src/vendorcode/google/chromeos/gnvs.c | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/vendorcode/google/chromeos/acpi/chromeos.asl b/src/vendorcode/google/chromeos/acpi/chromeos.asl index 44d9d155e3..d813b22ac0 100644 --- a/src/vendorcode/google/chromeos/acpi/chromeos.asl +++ b/src/vendorcode/google/chromeos/acpi/chromeos.asl @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <vboot/vbnv_layout.h> +#include <security/vboot/vbnv_layout.h> #if IS_ENABLED(CONFIG_CHROMEOS) diff --git a/src/vendorcode/google/chromeos/chromeos.h b/src/vendorcode/google/chromeos/chromeos.h index a739ab7b37..df61596684 100644 --- a/src/vendorcode/google/chromeos/chromeos.h +++ b/src/vendorcode/google/chromeos/chromeos.h @@ -21,8 +21,8 @@ #include <bootmode.h> #include <device/device.h> #include <rules.h> -#include <vboot/misc.h> -#include <vboot/vboot_common.h> +#include <security/vboot/misc.h> +#include <security/vboot/vboot_common.h> #if IS_ENABLED(CONFIG_CHROMEOS) /* functions implemented in watchdog.c */ diff --git a/src/vendorcode/google/chromeos/cr50_enable_update.c b/src/vendorcode/google/chromeos/cr50_enable_update.c index 0ec0e70864..6e67cc2d3b 100644 --- a/src/vendorcode/google/chromeos/cr50_enable_update.c +++ b/src/vendorcode/google/chromeos/cr50_enable_update.c @@ -20,7 +20,7 @@ #include <halt.h> #include <tpm_lite/tlcl.h> #include <vb2_api.h> -#include <vboot/vboot_common.h> +#include <security/vboot/vboot_common.h> static void enable_update(void *unused) { diff --git a/src/vendorcode/google/chromeos/elog.c b/src/vendorcode/google/chromeos/elog.c index f16f0add0b..fbbfd16196 100644 --- a/src/vendorcode/google/chromeos/elog.c +++ b/src/vendorcode/google/chromeos/elog.c @@ -16,7 +16,7 @@ #include <bootstate.h> #include <console/console.h> #include <elog.h> -#include <vboot/vboot_common.h> +#include <security/vboot/vboot_common.h> #if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME) #include <arch/acpi.h> diff --git a/src/vendorcode/google/chromeos/gnvs.c b/src/vendorcode/google/chromeos/gnvs.c index 8a5cc64182..a278b4109c 100644 --- a/src/vendorcode/google/chromeos/gnvs.c +++ b/src/vendorcode/google/chromeos/gnvs.c @@ -20,8 +20,8 @@ #include <cbmem.h> #include <console/console.h> #include <elog.h> -#include <vboot/vbnv.h> -#include <vboot/vboot_common.h> +#include <security/vboot/vbnv.h> +#include <security/vboot/vboot_common.h> #include <vboot_struct.h> #include "chromeos.h" |