summaryrefslogtreecommitdiff
path: root/Makefile.rules
diff options
context:
space:
mode:
authorRandall Spangler <rspangler@chromium.org>2012-07-17 09:35:48 -0700
committerGerrit <chrome-bot@google.com>2012-07-17 10:50:30 -0700
commitc44c17890c2fbda1edc74361b0174fed405f9eee (patch)
tree5aef62d95ede8a41b26e763ef58d4dc045ed8842 /Makefile.rules
parentdae19428a6124300dc91ad4167ed3093d3dc3e07 (diff)
downloadchrome-ec-c44c17890c2fbda1edc74361b0174fed405f9eee.tar.gz
Rename A and B images to RW and RW_B, part 1
All of our current EC configs have RO and a single RW image. Calling that image 'A' is confusing, particularly when combined with EC software sync (where the RW image is updated from either the A or B AP RW firmware). So, rename it. This changes all the build artifacts and constants. Internal EC commands and host commands still refer to A/B; that will be fixed in part 2. BUG=none TEST=build link, snow, bds Change-Id: Icfed4914745f0799bb71befb6a6563cfd8bc90ab Signed-off-by: Randall Spangler <rspangler@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/27649 Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Diffstat (limited to 'Makefile.rules')
-rw-r--r--Makefile.rules16
1 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.rules b/Makefile.rules
index 7a06001237..0944daab79 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -50,18 +50,18 @@ cmd_sign = vbutil_ec --sign $@ \
cmd_mv = mv $^ $@
cmd_extractab-y = cd $(out) && \
dump_fmap -x $(PROJECT).bin.tmp RW_SECTION_A $(silent) && \
- mv RW_SECTION_A $(PROJECT).A.bin
+ mv RW_SECTION_A $(PROJECT).RW.bin
cmd_extractab-$(CONFIG_RW_B) += && \
dump_fmap -x $(PROJECT).bin.tmp RW_SECTION_B $(silent) && \
- mv RW_SECTION_B $(PROJECT).B.bin
-cmd_copyab-y = cd $(out) && cp $(PROJECT).A.flat $(PROJECT).A.bin
-cmd_copyab-$(CONFIG_RW_B) += && cp $(PROJECT).B.flat $(PROJECT).B.bin
+ mv RW_SECTION_B $(PROJECT).RW_B.bin
+cmd_copyab-y = cd $(out) && cp $(PROJECT).RW.flat $(PROJECT).RW.bin
+cmd_copyab-$(CONFIG_RW_B) += && cp $(PROJECT).RW_B.flat $(PROJECT).RW_B.bin
.PHONY: all tests utils
all: $(out)/$(PROJECT).bin utils
-dis-y = $(out)/$(PROJECT).RO.dis $(out)/$(PROJECT).A.dis
-dis-$(CONFIG_RW_B) += $(out)/$(PROJECT).B.dis
+dis-y = $(out)/$(PROJECT).RO.dis $(out)/$(PROJECT).RW.dis
+dis-$(CONFIG_RW_B) += $(out)/$(PROJECT).RW_B.dis
dis: $(dis-y)
utils: $(build-utils) $(host-utils)
@@ -96,8 +96,8 @@ $(out)/%.bin.tmp: $(out)/%.obj
$(if $(sign-y),$(call quiet,extractab-y,EXTR_AB), \
$(call quiet,copyab-y,COPY_AB))
-flat-y = $(out)/$(PROJECT).RO.flat $(out)/$(PROJECT).A.flat
-flat-$(CONFIG_RW_B) += $(out)/$(PROJECT).B.flat
+flat-y = $(out)/$(PROJECT).RO.flat $(out)/$(PROJECT).RW.flat
+flat-$(CONFIG_RW_B) += $(out)/$(PROJECT).RW_B.flat
$(out)/%.obj: common/firmware_image.S $(out)/firmware_image.lds $(flat-y)
$(call quiet,flat_to_obj,CAT )