From 252457d4b21f46889eebad61d4c0a65331919cec Mon Sep 17 00:00:00 2001 From: Jack Rosenthal Date: Thu, 4 Nov 2021 12:11:58 -0600 Subject: ish: Trim down the release branch 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 Change-Id: I17e4694c38219b5a0823e0a3e55a28d1348f4b18 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3262038 Reviewed-by: Jett Rink Reviewed-by: Tom Hughes --- board/adlrvpm_ite/board.c | 1 - board/adlrvpm_ite/board.h | 1 - board/adlrvpm_ite/build.mk | 1 - board/adlrvpm_ite/ec.tasklist | 23 ----------------------- board/adlrvpm_ite/gpio.inc | 1 - board/adlrvpm_ite/vif_override.xml | 3 --- 6 files changed, 30 deletions(-) delete mode 120000 board/adlrvpm_ite/board.c delete mode 120000 board/adlrvpm_ite/board.h delete mode 120000 board/adlrvpm_ite/build.mk delete mode 100644 board/adlrvpm_ite/ec.tasklist delete mode 120000 board/adlrvpm_ite/gpio.inc delete mode 100644 board/adlrvpm_ite/vif_override.xml (limited to 'board/adlrvpm_ite') diff --git a/board/adlrvpm_ite/board.c b/board/adlrvpm_ite/board.c deleted file mode 120000 index ea1b98c873..0000000000 --- a/board/adlrvpm_ite/board.c +++ /dev/null @@ -1 +0,0 @@ -../adlrvpp_ite/board.c \ No newline at end of file diff --git a/board/adlrvpm_ite/board.h b/board/adlrvpm_ite/board.h deleted file mode 120000 index 2c75a3883c..0000000000 --- a/board/adlrvpm_ite/board.h +++ /dev/null @@ -1 +0,0 @@ -../adlrvpp_ite/board.h \ No newline at end of file diff --git a/board/adlrvpm_ite/build.mk b/board/adlrvpm_ite/build.mk deleted file mode 120000 index ceffb75d7e..0000000000 --- a/board/adlrvpm_ite/build.mk +++ /dev/null @@ -1 +0,0 @@ -../adlrvpp_ite/build.mk \ No newline at end of file diff --git a/board/adlrvpm_ite/ec.tasklist b/board/adlrvpm_ite/ec.tasklist deleted file mode 100644 index d593fbbf5f..0000000000 --- a/board/adlrvpm_ite/ec.tasklist +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright 2020 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. - */ - -/* - * Intel ADL-M-RVP-ITE board-specific configuration. - * See CONFIG_TASK_LIST in config.h for details. - */ - -#define CONFIG_TASK_LIST \ - TASK_ALWAYS(HOOKS, hook_task, NULL, LARGER_TASK_STACK_SIZE) \ - TASK_ALWAYS(CHARGER, charger_task, NULL, VENTI_TASK_STACK_SIZE) \ - TASK_NOTEST(CHIPSET, chipset_task, NULL, VENTI_TASK_STACK_SIZE) \ - TASK_NOTEST(KEYPROTO, keyboard_protocol_task, NULL, TASK_STACK_SIZE) \ - TASK_ALWAYS(HOSTCMD, host_command_task, NULL, LARGER_TASK_STACK_SIZE) \ - TASK_ALWAYS(CONSOLE, console_task, NULL, VENTI_TASK_STACK_SIZE) \ - TASK_ALWAYS(POWERBTN, power_button_task, NULL, LARGER_TASK_STACK_SIZE) \ - TASK_NOTEST(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) \ - TASK_ALWAYS(PD_C0, pd_task, NULL, ULTRA_TASK_STACK_SIZE) \ - TASK_ALWAYS(PD_C1, pd_task, NULL, ULTRA_TASK_STACK_SIZE) \ - TASK_ALWAYS(PD_INT_C1, pd_interrupt_handler_task, 1, ULTRA_TASK_STACK_SIZE) diff --git a/board/adlrvpm_ite/gpio.inc b/board/adlrvpm_ite/gpio.inc deleted file mode 120000 index 23611687c6..0000000000 --- a/board/adlrvpm_ite/gpio.inc +++ /dev/null @@ -1 +0,0 @@ -../adlrvpp_ite/gpio.inc \ No newline at end of file diff --git a/board/adlrvpm_ite/vif_override.xml b/board/adlrvpm_ite/vif_override.xml deleted file mode 100644 index 32736caf64..0000000000 --- a/board/adlrvpm_ite/vif_override.xml +++ /dev/null @@ -1,3 +0,0 @@ - -- cgit v1.2.1