aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulius Werner <jwerner@chromium.org>2015-01-22 11:19:10 -0800
committerPatrick Georgi <pgeorgi@google.com>2015-04-17 09:55:46 +0200
commit731bfefd785729fddde667cc9a34bb6bcddec812 (patch)
tree84dbf0a2f027a3da788d0139f0a2edaa4dfab808
parentf97b88bee8f65e3d7d73a5eede632d027b6a08a6 (diff)
downloadcoreboot-731bfefd785729fddde667cc9a34bb6bcddec812.tar.gz
coreboot-731bfefd785729fddde667cc9a34bb6bcddec812.tar.xz
coreboot-731bfefd785729fddde667cc9a34bb6bcddec812.zip
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>
-rw-r--r--src/soc/marvell/bg4cd/include/soc/memlayout.ld2
-rw-r--r--src/soc/nvidia/tegra124/include/soc/memlayout.ld2
-rw-r--r--src/soc/nvidia/tegra132/include/soc/memlayout_vboot2.ld2
-rw-r--r--src/soc/qualcomm/ipq806x/include/soc/memlayout.ld2
-rw-r--r--src/soc/rockchip/rk3288/include/soc/memlayout.ld2
-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.c2
-rw-r--r--src/vendorcode/google/chromeos/vboot2/verstub.c2
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 21c8f74cc..45cf3950c 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 c8db5c535..0d9e772d4 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 b990f54cd..2fdc38f32 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 4c06020e1..7ac066280 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 f5d3ca84d..8a12aba92 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 7903dd230..140da46bc 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 fda711485..21169f0b3 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 caed89fbd..15b661a7b 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 323468333..46f57ab08 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)
{