Makefile: remove burn_my_ec

burn_my_ec is an utility that flash an image embedded in its code.
We can not compile it as part of ec-[dev]utils, because we have
devices that firmware should be build as part of chrome-ec package.
Remove burn_my_ec, barely used.

Split the makefile to build just the host utility when requested.

BRANCH=ToT
BUG=chrome-os-partner:32025,chromium:408713
TEST=Check that files are stil built when needed and
not when utils-host is invoked.

Change-Id: I3fabe16067d57c74ae36b05138f4c6fd2483c7c4
Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/233347

3 files changed, 9 insertions, 152 deletions

diff --git a/Makefile.rules b/Makefile.rules
index 27f0d73f70..a0bd355202 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -70,7 +70,7 @@ cmd_etags = etags -o $@ $(shell cat $<)
 cmd_ctags = ctags -o $@ $(shell cat $<)
 targ_if_prog = $(if $(shell which $(1) 2>/dev/null),$(2),)
 
-.PHONY: all tests utils hosttests
+.PHONY: all tests utils utils-host utils-build hosttests
 
 buildall: $(foreach b, $(boards), proj-$(b)) runtests
 	@touch .tests-passed
@@ -86,7 +86,11 @@ dis: $(dis-y)
 hex-y = $(out)/$(PROJECT).RO.hex $(out)/$(PROJECT).RW.hex
 hex: $(hex-y)
 
-utils: $(build-utils) $(host-utils)
+utils-host: $(host-utils)
+
+utils-build: $(build-utils)
+
+utils: utils-host utils-build
 
 # On board test binaries
 test-targets=$(foreach t,$(test-list-y),test-$(t))
@@ -223,8 +227,6 @@ $(build-utils): $(out)/%:$(build-srcs)
 $(host-utils): $(out)/%:$(host-srcs)
 	$(call quiet,c_to_host,HOSTCC )
 
-$(out)/util/burn_my_ec: $(out)/$(PROJECT).bin
-
 $(out)/cscope.files: $(out)/$(PROJECT).bin
 	$(call quiet,deps_to_list,SH     )
 
diff --git a/util/build.mk b/util/build.mk
index de6f4297e1..00782face6 100644
--- a/util/build.mk
+++ b/util/build.mk
@@ -6,7 +6,8 @@
 # Host tools build
 #
 
-host-util-bin=ectool lbplay burn_my_ec stm32mon ec_sb_firmware_update lbcc
+host-util-bin=ectool lbplay stm32mon ec_sb_firmware_update lbcc
+build-util-bin=ec_uartd iteflash
 
 comm-objs=$(util-lock-objs:%=lock/%) comm-host.o comm-dev.o
 ifeq ($(CHIP),mec1322)
@@ -15,11 +16,7 @@ else
 comm-objs+=comm-lpc.o
 endif
 comm-objs+=comm-i2c.o
-ectool-objs=ectool.o ectool_keyscan.o misc_util.o ec_flash.o $(comm-objs)
 
+ectool-objs=ectool.o ectool_keyscan.o misc_util.o ec_flash.o $(comm-objs)
 ec_sb_firmware_update-objs=ec_sb_firmware_update.o $(comm-objs) misc_util.o
-
 lbplay-objs=lbplay.o $(comm-objs)
-burn_my_ec-objs=ec_flash.o $(comm-objs) misc_util.o
-
-build-util-bin=ec_uartd iteflash
diff --git a/util/burn_my_ec.c b/util/burn_my_ec.c
deleted file mode 100644
index 4e2e1de866..0000000000
--- a/util/burn_my_ec.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/param.h>
-#include <unistd.h>
-
-#include "comm-host.h"
-#include "ec_flash.h"
-
-#define STR0(name)  #name
-#define STR(name)   STR0(name)
-
-static const char * const part_name[] = {"unknown", "RO", "RW"};
-
-enum ec_current_image get_version(enum ec_current_image *version_ptr)
-{
-	struct ec_response_get_version r;
-	char *build_info = (char *)ec_inbuf;
-	int res;
-
-	res = ec_command(EC_CMD_GET_VERSION, 0, NULL, 0, &r, sizeof(r));
-	if (res < 0)
-		return res;
-	res = ec_command(EC_CMD_GET_BUILD_INFO, 0, NULL, 0,
-			 ec_inbuf, ec_max_insize);
-	if (res < 0)
-		return res;
-
-	/* Ensure versions are null-terminated before we print them */
-	r.version_string_ro[sizeof(r.version_string_ro) - 1] = '\0';
-	r.version_string_rw[sizeof(r.version_string_rw) - 1] = '\0';
-	build_info[ec_max_insize - 1] = '\0';
-
-	/* Print versions */
-	printf("RO version:    %s\n", r.version_string_ro);
-	printf("RW version:    %s\n", r.version_string_rw);
-	printf("Firmware copy: %s\n",
-	       (r.current_image < sizeof(part_name)/sizeof(part_name[0]) ?
-		part_name[r.current_image] : "?"));
-	printf("Build info:    %s\n", build_info);
-
-	if (version_ptr)
-		*version_ptr = r.current_image;
-
-	return 0;
-}
-
-int flash_partition(enum ec_current_image part, const uint8_t *payload,
-		    uint32_t offset, uint32_t size)
-{
-	struct ec_params_reboot_ec rst_req;
-	int res;
-	enum ec_current_image current = EC_IMAGE_UNKNOWN;
-
-	res = get_version(&current);
-	if (res < 0) {
-		fprintf(stderr, "Get version failed : %d\n", res);
-		return -1;
-	}
-
-	if (current == part) {
-		printf("Jumping EC to %s partition\n",
-		       part == EC_IMAGE_RO ? "RW" : "RO");
-		rst_req.cmd = part == EC_IMAGE_RO ?
-			      EC_REBOOT_JUMP_RW : EC_REBOOT_JUMP_RO;
-		ec_command(EC_CMD_REBOOT_EC, 0, &rst_req, sizeof(rst_req),
-			   NULL, 0);
-
-		/*
-		 * Wait for EC to reboot; this may take a while if EC is
-		 * flushing large amounts of debug output.
-		 */
-		usleep(2000000);
-
-		/* Check partition */
-		res = get_version(&current);
-		if (res < 0) {
-			fprintf(stderr, "Get version failed : %d\n", res);
-			return -1;
-		}
-		if (current == part) {
-			fprintf(stderr, "Jump failed!\n");
-			return -1;
-		}
-	}
-
-	printf("Erasing partition %s : 0x%x bytes at 0x%08x\n",
-	       part_name[part], size, offset);
-	res = ec_flash_erase(offset, size);
-	if (res < 0) {
-		fprintf(stderr, "Erase failed : %d\n", res);
-		return -1;
-	}
-
-	printf("Writing partition %s : 0x%x bytes at 0x%08x\n",
-	       part_name[part], size, offset);
-	res = ec_flash_write(payload, offset, size);
-	if (res < 0) {
-		fprintf(stderr, "Write failed : %d\n", res);
-		return -1;
-	}
-
-	printf("Verifying partition %s : 0x%x bytes at 0x%08x\n",
-	       part_name[part], size, offset);
-	res = ec_flash_verify(payload, offset, size);
-	if (res < 0) {
-		fprintf(stderr, "Verify failed : %d\n", res);
-		return -1;
-	}
-
-	printf("Done.\n");
-
-	return get_version(NULL);
-}
-
-/* black magic to include the EC firmware binary as a payload inside
- * the flashing program without relying on external tools such as objcopy or a
- * binary to header converter. */
-__asm__ (".section .payload, \"ax\"\n"
-	 "_payload_start:\n"
-	 ".incbin \""STR(OUTDIR)"/"STR(PROJECT)".bin\"\n");
-
-int main(int argc, char *argv[])
-{
-	extern uint8_t data[] asm("_payload_start");
-
-	if (comm_init(COMM_ALL, NULL) < 0)
-		return -3;
-
-	flash_partition(EC_IMAGE_RW, data + CONFIG_FW_RW_OFF,
-			CONFIG_FW_RW_OFF, CONFIG_FW_RW_SIZE);
-	flash_partition(EC_IMAGE_RO, data + CONFIG_FW_RO_OFF,
-			CONFIG_FW_RO_OFF, CONFIG_FW_RO_SIZE);
-
-	return 0;
-}