summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPatrick Georgi <pgeorgi@google.com>2016-10-19 16:05:20 (GMT)
committerchrome-bot <chrome-bot@chromium.org>2016-10-24 16:34:51 (GMT)
commitf336711410dd8ae5aacf8aaf144158dccdf76313 (patch)
treec86ab1f09801686c55c9dcaaadc3ab0fd8090735 /src
parent74a07395eb9976747055b4ac7a0ae7dcb603a6f4 (diff)
downloaddepthcharge-f336711410dd8ae5aacf8aaf144158dccdf76313.tar.gz
depthcharge-f336711410dd8ae5aacf8aaf144158dccdf76313.tar.xz
Rename "unified" to "vboot"
That's really what it's about. BUG=chromium:595715 BRANCH=none TEST=none Change-Id: Id33728c536221624826e0eb93efd9ad42a1e2595 Signed-off-by: Patrick Georgi <pgeorgi@google.com> Reviewed-on: https://chromium-review.googlesource.com/400818 Commit-Ready: Patrick Georgi <pgeorgi@chromium.org> Tested-by: Patrick Georgi <pgeorgi@chromium.org> Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.inc6
-rw-r--r--src/vboot/Makefile.inc2
-rw-r--r--src/vboot/util/Makefile.inc2
-rw-r--r--src/vboot/util/commonparams-vboot.c (renamed from src/vboot/util/commonparams-unified.c)0
4 files changed, 5 insertions, 5 deletions
diff --git a/src/Makefile.inc b/src/Makefile.inc
index f13c4c7..956fdec 100644
--- a/src/Makefile.inc
+++ b/src/Makefile.inc
@@ -39,16 +39,16 @@ PHONY += $(notdir $1)
endef
$(eval $(call declare_payload,$(DEPTHCHARGE),$$$$(depthcharge-objs) \
- $$$$(unified-objs),))
+ $$$$(vboot-objs),))
$(eval $(call declare_payload,$(NETBOOT),$$$$(depthcharge-objs) \
$$$$(netboot-objs) $$$$(net-objs) $$$$(uip-objs),))
$(eval $(call declare_payload,$(DEV),$$$$(depthcharge-objs) \
$$$$(netboot-objs) $$$$(net-objs) $$$$(uip-objs) $$$$(dev-objs) \
- $$$$(unified-objs),$(DONT_GC_NETBOOT)))
+ $$$$(vboot-objs),$(DONT_GC_NETBOOT)))
# Rules for creating fastboot-capable depthcharge binary
$(eval $(call declare_payload,$(FASTBOOT),$$$$(depthcharge-objs) \
- $$$$(fastboot-objs) $$$$(unified-objs),))
+ $$$$(fastboot-objs) $$$$(vboot-objs),))
diff --git a/src/vboot/Makefile.inc b/src/vboot/Makefile.inc
index 65350f6..6099344 100644
--- a/src/vboot/Makefile.inc
+++ b/src/vboot/Makefile.inc
@@ -21,7 +21,7 @@ depthcharge-y += screens.c
depthcharge-y += vbnv.c
# Where "main" lives.
-unified-y += main.c
+vboot-y += main.c
VB_LIB = $(obj)/external/vboot/vboot_fw.a
diff --git a/src/vboot/util/Makefile.inc b/src/vboot/util/Makefile.inc
index e68c11f..6400c35 100644
--- a/src/vboot/util/Makefile.inc
+++ b/src/vboot/util/Makefile.inc
@@ -14,4 +14,4 @@
depthcharge-y += commonparams.c
depthcharge-y += flag.c
depthcharge-y += memory.c
-unified-y += commonparams-unified.c
+vboot-y += commonparams-vboot.c
diff --git a/src/vboot/util/commonparams-unified.c b/src/vboot/util/commonparams-vboot.c
index 5641db0..5641db0 100644
--- a/src/vboot/util/commonparams-unified.c
+++ b/src/vboot/util/commonparams-vboot.c