diff options
| author | Julius Werner <jwerner@chromium.org> | 2015-01-22 11:19:10 -0800 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2015-04-17 09:55:46 +0200 |
| commit | 731bfefd785729fddde667cc9a34bb6bcddec812 (patch) | |
| tree | 84dbf0a2f027a3da788d0139f0a2edaa4dfab808 /src/vendorcode/google | |
| parent | f97b88bee8f65e3d7d73a5eede632d027b6a08a6 (diff) | |
| download | coreboot-731bfefd785729fddde667cc9a34bb6bcddec812.tar.xz | |
chromeos: Move memlayout.h/symbols.h into common directory
Turns out there are uses for memlayout regions not specific to vboot2.
Rather than add yet another set of headers for a single region, let's
make the vboot2 one common for chromeos.
BRANCH=veyron
BUG=chrome-os-partner:35705
TEST=Booted Jerry, compiled Blaze, Cosmos, Ryu and Storm.
Change-Id: I228e0ffce1ccc792e7f5f5be6facaaca2650d818
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: c6d7aab9f4e6d0cfa12aa0478288e54ec3096d9b
Original-Change-Id: I1dd7d9c4b6ab24de695d42a38913b6d9b952d49b
Original-Signed-off-by: Julius Werner <jwerner@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/242630
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/9748
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/vendorcode/google')
| -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 |
4 files changed, 8 insertions, 8 deletions
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) { |