diff options
| -rw-r--r-- | src/soc/marvell/bg4cd/include/soc/memlayout.ld | 2 | ||||
| -rw-r--r-- | src/soc/nvidia/tegra124/include/soc/memlayout.ld | 2 | ||||
| -rw-r--r-- | src/soc/nvidia/tegra132/include/soc/memlayout_vboot2.ld | 2 | ||||
| -rw-r--r-- | src/soc/qualcomm/ipq806x/include/soc/memlayout.ld | 2 | ||||
| -rw-r--r-- | src/soc/rockchip/rk3288/include/soc/memlayout.ld | 2 | ||||
| -rw-r--r-- | src/vendorcode/google/chromeos/memlayout.h (renamed from src/vendorcode/google/chromeos/vboot2/memlayout.h) | 6 | ||||
| -rw-r--r-- | src/vendorcode/google/chromeos/symbols.h (renamed from src/vendorcode/google/chromeos/vboot2/symbols.h) | 6 | ||||
| -rw-r--r-- | src/vendorcode/google/chromeos/vboot2/common.c | 2 | ||||
| -rw-r--r-- | src/vendorcode/google/chromeos/vboot2/verstub.c | 2 |
9 files changed, 13 insertions, 13 deletions
diff --git a/src/soc/marvell/bg4cd/include/soc/memlayout.ld b/src/soc/marvell/bg4cd/include/soc/memlayout.ld index 21c8f74ccc..45cf3950c3 100644 --- a/src/soc/marvell/bg4cd/include/soc/memlayout.ld +++ b/src/soc/marvell/bg4cd/include/soc/memlayout.ld @@ -18,7 +18,7 @@ */ #include <memlayout.h> -#include <vendorcode/google/chromeos/vboot2/memlayout.h> +#include <vendorcode/google/chromeos/memlayout.h> #include <arch/header.ld> diff --git a/src/soc/nvidia/tegra124/include/soc/memlayout.ld b/src/soc/nvidia/tegra124/include/soc/memlayout.ld index c8db5c535b..0d9e772d41 100644 --- a/src/soc/nvidia/tegra124/include/soc/memlayout.ld +++ b/src/soc/nvidia/tegra124/include/soc/memlayout.ld @@ -18,7 +18,7 @@ */ #include <memlayout.h> -#include <vendorcode/google/chromeos/vboot2/memlayout.h> +#include <vendorcode/google/chromeos/memlayout.h> #include <arch/header.ld> diff --git a/src/soc/nvidia/tegra132/include/soc/memlayout_vboot2.ld b/src/soc/nvidia/tegra132/include/soc/memlayout_vboot2.ld index b990f54cdc..2fdc38f320 100644 --- a/src/soc/nvidia/tegra132/include/soc/memlayout_vboot2.ld +++ b/src/soc/nvidia/tegra132/include/soc/memlayout_vboot2.ld @@ -18,7 +18,7 @@ */ #include <memlayout.h> -#include <vendorcode/google/chromeos/vboot2/memlayout.h> +#include <vendorcode/google/chromeos/memlayout.h> #include <arch/header.ld> diff --git a/src/soc/qualcomm/ipq806x/include/soc/memlayout.ld b/src/soc/qualcomm/ipq806x/include/soc/memlayout.ld index 4c06020e10..7ac066280b 100644 --- a/src/soc/qualcomm/ipq806x/include/soc/memlayout.ld +++ b/src/soc/qualcomm/ipq806x/include/soc/memlayout.ld @@ -18,7 +18,7 @@ */ #include <memlayout.h> -#include <vendorcode/google/chromeos/vboot2/memlayout.h> +#include <vendorcode/google/chromeos/memlayout.h> #include <arch/header.ld> diff --git a/src/soc/rockchip/rk3288/include/soc/memlayout.ld b/src/soc/rockchip/rk3288/include/soc/memlayout.ld index f5d3ca84d4..8a12aba926 100644 --- a/src/soc/rockchip/rk3288/include/soc/memlayout.ld +++ b/src/soc/rockchip/rk3288/include/soc/memlayout.ld @@ -18,7 +18,7 @@ */ #include <memlayout.h> -#include <vendorcode/google/chromeos/vboot2/memlayout.h> +#include <vendorcode/google/chromeos/memlayout.h> #include <arch/header.ld> diff --git a/src/vendorcode/google/chromeos/vboot2/memlayout.h b/src/vendorcode/google/chromeos/memlayout.h index 7903dd230d..140da46bcc 100644 --- a/src/vendorcode/google/chromeos/vboot2/memlayout.h +++ b/src/vendorcode/google/chromeos/memlayout.h @@ -19,8 +19,8 @@ /* This file contains macro definitions for memlayout.ld linker scripts. */ -#ifndef __CHROMEOS_VBOOT2_MEMLAYOUT_H -#define __CHROMEOS_VBOOT2_MEMLAYOUT_H +#ifndef __CHROMEOS_MEMLAYOUT_H +#define __CHROMEOS_MEMLAYOUT_H /* Careful: required work buffer size depends on RW properties such as key size * and algorithm -- what works for you might stop working after an update. Do @@ -47,4 +47,4 @@ #define OVERLAP_VERSTAGE_ROMSTAGE(addr, size) ROMSTAGE(addr, size) #endif -#endif /* __CHROMEOS_VBOOT2_MEMLAYOUT_H */ +#endif /* __CHROMEOS_MEMLAYOUT_H */ diff --git a/src/vendorcode/google/chromeos/vboot2/symbols.h b/src/vendorcode/google/chromeos/symbols.h index fda7114853..21169f0b3a 100644 --- a/src/vendorcode/google/chromeos/vboot2/symbols.h +++ b/src/vendorcode/google/chromeos/symbols.h @@ -17,8 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA */ -#ifndef __CHROMEOS_VBOOT2_SYMBOLS_H -#define __CHROMEOS_VBOOT2_SYMBOLS_H +#ifndef __CHROMEOS_SYMBOLS_H +#define __CHROMEOS_SYMBOLS_H extern u8 _vboot2_work[]; extern u8 _evboot2_work[]; @@ -29,4 +29,4 @@ extern u8 _verstage[]; extern u8 _everstage[]; #define _verstage_size (_everstage - _verstage) -#endif /* __CHROMEOS_VBOOT2_SYMBOLS_H */ +#endif /* __CHROMEOS_SYMBOLS_H */ diff --git a/src/vendorcode/google/chromeos/vboot2/common.c b/src/vendorcode/google/chromeos/vboot2/common.c index caed89fbdf..15b661a7b4 100644 --- a/src/vendorcode/google/chromeos/vboot2/common.c +++ b/src/vendorcode/google/chromeos/vboot2/common.c @@ -21,9 +21,9 @@ #include <console/console.h> #include <reset.h> #include "../chromeos.h" +#include "../symbols.h" #include "../vboot_handoff.h" #include "misc.h" -#include "symbols.h" void *vboot_load_stage(int stage_index, struct vboot_region *fw_main, diff --git a/src/vendorcode/google/chromeos/vboot2/verstub.c b/src/vendorcode/google/chromeos/vboot2/verstub.c index 323468333c..46f57ab08f 100644 --- a/src/vendorcode/google/chromeos/vboot2/verstub.c +++ b/src/vendorcode/google/chromeos/vboot2/verstub.c @@ -23,8 +23,8 @@ #include <string.h> #include <timestamp.h> #include "../chromeos.h" +#include "../symbols.h" #include "misc.h" -#include "symbols.h" static struct vb2_working_data *init_vb2_working_data(void) { |