ish: Trim down the release branchstabilize-wristpin-14469.59.B-ishstabilize-voshyr-14637.B-ishstabilize-quickfix-14695.187.B-ishstabilize-quickfix-14695.124.B-ishstabilize-quickfix-14526.91.B-ishstabilize-14695.85.B-ishstabilize-14695.107.B-ishstabilize-14682.B-ishstabilize-14633.B-ishstabilize-14616.B-ishstabilize-14589.B-ishstabilize-14588.98.B-ishstabilize-14588.14.B-ishstabilize-14588.123.B-ishstabilize-14536.B-ishstabilize-14532.B-ishstabilize-14528.B-ishstabilize-14526.89.B-ishstabilize-14526.84.B-ishstabilize-14526.73.B-ishstabilize-14526.67.B-ishstabilize-14526.57.B-ishstabilize-14498.B-ishstabilize-14496.B-ishstabilize-14477.B-ishstabilize-14469.9.B-ishstabilize-14469.8.B-ishstabilize-14469.58.B-ishstabilize-14469.41.B-ishstabilize-14442.B-ishstabilize-14438.B-ishstabilize-14411.B-ishstabilize-14396.B-ishstabilize-14395.B-ishstabilize-14388.62.B-ishstabilize-14388.61.B-ishstabilize-14388.52.B-ishstabilize-14385.B-ishstabilize-14345.B-ishstabilize-14336.B-ishstabilize-14333.B-ishrelease-R99-14469.B-ishrelease-R98-14388.B-ishrelease-R102-14695.B-ishrelease-R101-14588.B-ishrelease-R100-14526.B-ishfirmware-cherry-14454.B-ishfirmware-brya-14505.B-ishfirmware-brya-14505.71.B-ishfactory-kukui-14374.B-ishfactory-guybrush-14600.B-ishfactory-cherry-14455.B-ishfactory-brya-14517.B-ish

In the interest of making long-term branch maintenance incur as little
technical debt on us as possible, we should not maintain any files on
the branch we are not actually using.

This has the added effect of making it extremely clear when merging CLs
from the main branch when changes have the possibility to affect us.

The follow-on CL adds a convenience script to actually pull updates from
the main branch and generate a CL for the update.

BUG=b:204206272
BRANCH=ish
TEST=make BOARD=arcada_ish && make BOARD=drallion_ish

Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I17e4694c38219b5a0823e0a3e55a28d1348f4b18
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3262038
Reviewed-by: Jett Rink <jettrink@chromium.org>
Reviewed-by: Tom Hughes <tomhughes@chromium.org>

1 files changed, 0 insertions, 282 deletions

diff --git a/chip/host/system.c b/chip/host/system.c
deleted file mode 100644
index 60d765deab..0000000000
--- a/chip/host/system.c
+++ /dev/null
@@ -1,282 +0,0 @@
-/* Copyright 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.
- */
-
-/* System module for emulator */
-
-#include "common.h"
-#include "ec_commands.h"
-#include "host_test.h"
-#include "panic.h"
-#include "persistence.h"
-#include "reboot.h"
-#include "system.h"
-#include "timer.h"
-#include "util.h"
-
-// Forward declaration from <stdlib.h> to avoid declaration conflicts.
-void exit(int);
-
-#define SHARED_MEM_SIZE 0x2000 /* bytes */
-#define RAM_DATA_SIZE (sizeof(struct panic_data) + 512) /* bytes */
-uint8_t __shared_mem_buf[SHARED_MEM_SIZE + RAM_DATA_SIZE];
-
-static char *__ram_data = __shared_mem_buf + SHARED_MEM_SIZE;
-
-static enum ec_image __running_copy;
-
-static void ramdata_set_persistent(void)
-{
-	FILE *f = get_persistent_storage("ramdata", "wb");
-	int sz;
-
-	ASSERT(f != NULL);
-
-	sz = fwrite(__ram_data, RAM_DATA_SIZE, 1, f);
-	ASSERT(sz == 1);
-
-	release_persistent_storage(f);
-}
-
-static void ramdata_get_persistent(void)
-{
-	FILE *f = get_persistent_storage("ramdata", "rb");
-
-	if ((f == NULL) || (fread(__ram_data, RAM_DATA_SIZE, 1, f) != 1)) {
-		fprintf(stderr,
-			"No RAM data found. Initializing to 0x00.\n");
-		memset(__ram_data, 0, RAM_DATA_SIZE);
-		return;
-	}
-
-	release_persistent_storage(f);
-
-	/*
-	 * Assumes RAM data doesn't preserve across reboot except for sysjump.
-	 * Clear persistent data once it's read.
-	 */
-	remove_persistent_storage("ramdata");
-}
-
-static void set_image_copy(uint32_t copy)
-{
-	FILE *f = get_persistent_storage("image_copy", "wb");
-
-	ASSERT(f != NULL);
-	ASSERT(fwrite(&copy, sizeof(copy), 1, f) == 1);
-
-	release_persistent_storage(f);
-}
-
-static uint32_t get_image_copy(void)
-{
-	FILE *f = get_persistent_storage("image_copy", "rb");
-	uint32_t ret;
-
-	if ((f == NULL) || (fread(&ret, sizeof(ret), 1, f) != 1))
-		return EC_IMAGE_UNKNOWN;
-	release_persistent_storage(f);
-	remove_persistent_storage("image_copy");
-
-	return ret;
-}
-
-static void save_reset_flags(uint32_t flags)
-{
-	FILE *f = get_persistent_storage("reset_flags", "wb");
-
-	ASSERT(f != NULL);
-	ASSERT(fwrite(&flags, sizeof(flags), 1, f) == 1);
-
-	release_persistent_storage(f);
-}
-
-static uint32_t load_reset_flags(void)
-{
-	FILE *f = get_persistent_storage("reset_flags", "rb");
-	uint32_t ret;
-
-	if ((f == NULL) || (fread(&ret, sizeof(ret), 1, f) != 1))
-		return EC_RESET_FLAG_POWER_ON;
-	release_persistent_storage(f);
-	remove_persistent_storage("reset_flags");
-
-	return ret;
-}
-
-static void save_time(timestamp_t t)
-{
-	FILE *f = get_persistent_storage("time", "wb");
-
-	ASSERT(f != NULL);
-	ASSERT(fwrite(&t, sizeof(t), 1, f) == 1);
-
-	release_persistent_storage(f);
-}
-
-static int load_time(timestamp_t *t)
-{
-	FILE *f = get_persistent_storage("time", "rb");
-
-	if ((f == NULL) || (fread(t, sizeof(*t), 1, f) != 1))
-		return 0;
-	release_persistent_storage(f);
-	remove_persistent_storage("time");
-
-	return 1;
-}
-
-test_mockable struct panic_data *panic_get_data(void)
-{
-	return (struct panic_data *)
-		(__ram_data + RAM_DATA_SIZE - sizeof(struct panic_data));
-}
-
-test_mockable uintptr_t get_panic_data_start()
-{
-	return (uintptr_t)
-		(__ram_data + RAM_DATA_SIZE - sizeof(struct panic_data));
-}
-
-test_mockable void system_reset(int flags)
-{
-	uint32_t save_flags = 0;
-	if (flags & SYSTEM_RESET_PRESERVE_FLAGS)
-		save_flags = system_get_reset_flags() | EC_RESET_FLAG_PRESERVED;
-	if (flags & SYSTEM_RESET_LEAVE_AP_OFF)
-		save_flags |= EC_RESET_FLAG_AP_OFF;
-	if (flags & SYSTEM_RESET_HARD)
-		save_flags |= EC_RESET_FLAG_HARD;
-	if (save_flags)
-		save_reset_flags(save_flags);
-	emulator_reboot();
-}
-
-test_mockable void system_hibernate(uint32_t seconds, uint32_t microseconds)
-{
-	uint32_t i;
-
-	if (board_hibernate)
-		board_hibernate();
-
-	save_reset_flags(EC_RESET_FLAG_HIBERNATE);
-
-	if (!seconds && !microseconds)
-		exit(EXIT_CODE_HIBERNATE);
-
-	for (i = 0; i < seconds; ++i)
-		udelay(SECOND);
-	udelay(microseconds);
-	emulator_reboot();
-}
-
-test_mockable int system_is_locked(void)
-{
-	return 0;
-}
-
-#ifdef TEST_FUZZ
-/* When fuzzing, do not allow sysjumps. */
-int system_run_image_copy(enum ec_image copy)
-{
-	ccprints("Emulator would sysjump here. Fuzzing: doing nothing.");
-	return EC_ERROR_UNKNOWN;
-}
-#endif
-
-const char *system_get_chip_vendor(void)
-{
-	return "chromeos";
-}
-
-const char *system_get_chip_name(void)
-{
-	return "emu";
-}
-
-const char *system_get_chip_revision(void)
-{
-	return "";
-}
-
-int system_get_bbram(enum system_bbram_idx idx, uint8_t *value)
-{
-	return EC_ERROR_UNIMPLEMENTED;
-}
-
-int system_set_bbram(enum system_bbram_idx idx, uint8_t value)
-{
-	return EC_ERROR_UNIMPLEMENTED;
-}
-
-enum ec_image system_get_image_copy(void)
-{
-	return __running_copy;
-}
-
-int system_set_scratchpad(uint32_t value)
-{
-	FILE *f = get_persistent_storage("scratchpad", "w");
-
-	fprintf(f, "%u", value);
-	release_persistent_storage(f);
-
-	return EC_SUCCESS;
-}
-
-int system_get_scratchpad(uint32_t *value)
-{
-	FILE *f = get_persistent_storage("scratchpad", "r");
-	int success;
-
-	if (f == NULL)
-		return EC_ERROR_UNKNOWN;
-
-	success = fscanf(f, "%u", value);
-	release_persistent_storage(f);
-
-	if (success)
-		return EC_SUCCESS;
-	else
-		return EC_ERROR_UNKNOWN;
-}
-
-static void __jump_resetvec(void)
-{
-	save_time(get_time());
-	ramdata_set_persistent();
-	emulator_reboot();
-}
-
-static void __ro_jump_resetvec(void)
-{
-	set_image_copy(EC_IMAGE_RO);
-	__jump_resetvec();
-}
-
-static void __rw_jump_resetvec(void)
-{
-	set_image_copy(EC_IMAGE_RW);
-	__jump_resetvec();
-}
-
-void system_pre_init(void)
-{
-	timestamp_t t;
-
-	if (load_time(&t))
-		force_time(t);
-
-	ramdata_get_persistent();
-	__running_copy = get_image_copy();
-	if (__running_copy == EC_IMAGE_UNKNOWN) {
-		__running_copy = EC_IMAGE_RO;
-		system_set_reset_flags(load_reset_flags());
-	}
-
-	*(uintptr_t *)(__host_flash + CONFIG_RO_MEM_OFF + 4) =
-		(uintptr_t)__ro_jump_resetvec;
-	*(uintptr_t *)(__host_flash + CONFIG_RW_MEM_OFF + 4) =
-		(uintptr_t)__rw_jump_resetvec;
-}