From 10fe0fbfd36f6a08304b9231531450f57732a630 Mon Sep 17 00:00:00 2001 From: Mary Ruthven Date: Mon, 8 Nov 2021 17:47:08 -0600 Subject: remove bds Remove bds and set cr50 as the default board BUG=b:200823466 TEST=make buildall -j ; make runtests Change-Id: I4fad3b3f903ab7aed0d4baec36aee4b426cb1cb3 Signed-off-by: Mary Ruthven Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3273183 Reviewed-by: Vadim Sukhomlinov --- Makefile | 2 +- board/bds/board.c | 41 -------------------------------------- board/bds/board.h | 55 --------------------------------------------------- board/bds/build.mk | 12 ----------- board/bds/ec.tasklist | 12 ----------- board/bds/gpio.inc | 25 ----------------------- 6 files changed, 1 insertion(+), 146 deletions(-) delete mode 100644 board/bds/board.c delete mode 100644 board/bds/board.h delete mode 100644 board/bds/build.mk delete mode 100644 board/bds/ec.tasklist delete mode 100644 board/bds/gpio.inc diff --git a/Makefile b/Makefile index c5c43722b1..c3e1a142ab 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ # This is used to exclude build targets that depend on sanitizers such as # fuzzers on architectures that don't support sanitizers yet (e.g. arm). ARCH?=amd64 -BOARD ?= bds +BOARD ?= cr50 # Directory where the board is configured (includes /$(BOARD) at the end) BDIR:=$(wildcard board/$(BOARD)) diff --git a/board/bds/board.c b/board/bds/board.c deleted file mode 100644 index 95f3ef6cfd..0000000000 --- a/board/bds/board.c +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2012 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. - */ -/* Stellaris EKB-LM4F-EAC board-specific configuration */ - -#include "adc.h" -#include "adc_chip.h" -#include "gpio.h" -#include "i2c.h" -#include "registers.h" -#include "util.h" - -/* ADC channels. Must be in the exactly same order as in enum adc_channel. */ -const struct adc_t adc_channels[] = { - /* EC internal temperature is calculated by - * 273 + (295 - 450 * ADC_VALUE / ADC_READ_MAX) / 2 - * = -225 * ADC_VALUE / ADC_READ_MAX + 420.5 - */ - {"ECTemp", LM4_ADC_SEQ0, -225, ADC_READ_MAX, 420, - LM4_AIN_NONE, 0x0e /* TS0 | IE0 | END0 */, 0, 0}, - - /* Charger current is mapped from 0~4000mA to 0~1.6V. - * And ADC maps 0~3.3V to ADC_READ_MAX. - * - * Note that on BDS, this is really just the turn pot on the Badger - * board, but that's good enough for debugging the ADC. - */ - {"BDSPot", LM4_ADC_SEQ1, 33 * 4000, ADC_READ_MAX * 16, 0, - LM4_AIN(0), 0x06 /* IE0 | END0 */, LM4_GPIO_E, (1<<3)}, -}; -BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); - - -/* I2C ports */ -const struct i2c_port_t i2c_ports[] = { - {"lightbar", 5, 400}, -}; -const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); - -#include "gpio_list.h" diff --git a/board/bds/board.h b/board/bds/board.h deleted file mode 100644 index c859089f04..0000000000 --- a/board/bds/board.h +++ /dev/null @@ -1,55 +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. - */ - -/* Stellaris EKB-LM4F-EAC board configuration */ - -#ifndef __CROS_EC_BOARD_H -#define __CROS_EC_BOARD_H - -/* Optional features */ -#define CONFIG_SYSTEM_UNLOCKED /* Allow dangerous commands */ -#define CONFIG_I2C -#define CONFIG_I2C_CONTROLLER - -/* LM4 modules we don't use on link but still want to keep compiling */ -#define CONFIG_EEPROM -#define CONFIG_PSTORE - -/* Modules we want to exclude */ -#undef CONFIG_LID_SWITCH -#undef CONFIG_HOSTCMD_LPC -#undef CONFIG_PECI -#undef CONFIG_SWITCH - -/* Write protect is active high */ -#define CONFIG_WP_ACTIVE_HIGH - -#ifndef __ASSEMBLER__ - -enum adc_channel { - ADC_CH_EC_TEMP = 0, /* EC internal die temperature in degrees K. */ - ADC_CH_BDS_POT, /* BDS pot input. */ - ADC_CH_COUNT -}; - -enum pwm_channel { - PWM_CH_COUNT -}; - -/* I2C ports */ -#define I2C_PORT_LIGHTBAR 5 /* Port 5 / PA6:7 on link, but PG6:7 on badger */ - -/* Second UART port */ -#define CONFIG_UART_HOST 1 - -#include "gpio_signal.h" - -/* EEPROM blocks */ -#define EEPROM_BLOCK_START_PSTORE 16 /* Host persistent storage */ -#define EEPROM_BLOCK_COUNT_PSTORE 16 - -#endif /* !__ASSEMBLER__ */ - -#endif /* __CROS_EC_BOARD_H */ diff --git a/board/bds/build.mk b/board/bds/build.mk deleted file mode 100644 index e3e91f0bb2..0000000000 --- a/board/bds/build.mk +++ /dev/null @@ -1,12 +0,0 @@ -# -*- makefile -*- -# Copyright 2012 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. -# -# Board specific files build -# - -# the IC is TI Stellaris LM4 -CHIP:=lm4 - -board-y=board.o diff --git a/board/bds/ec.tasklist b/board/bds/ec.tasklist deleted file mode 100644 index 7329da7d2d..0000000000 --- a/board/bds/ec.tasklist +++ /dev/null @@ -1,12 +0,0 @@ -/* Copyright 2012 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. - */ - -/** - * See CONFIG_TASK_LIST in config.h for details. - */ -#define CONFIG_TASK_LIST \ - TASK_ALWAYS(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \ - TASK_NOTEST(LIGHTBAR, lightbar_task, NULL, TASK_STACK_SIZE) \ - TASK_ALWAYS(CONSOLE, console_task, NULL, TASK_STACK_SIZE) diff --git a/board/bds/gpio.inc b/board/bds/gpio.inc deleted file mode 100644 index 374894f932..0000000000 --- a/board/bds/gpio.inc +++ /dev/null @@ -1,25 +0,0 @@ -/* -*- mode:c -*- - * - * Copyright 2014 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. - */ - -/* Declare symbolic names for all the GPIOs that we care about. - * Note: Those with interrupt handlers must be declared first. */ - -/* Recovery signal from DOWN button */ -GPIO(RECOVERY_L, PIN(D, 1), GPIO_PULL_UP) -GPIO(DEBUG_LED, PIN(A, 7), GPIO_OUT_LOW) - -/* - * Signals which aren't implemented on BDS but we'll emulate anyway, to - * make it more convenient to debug other code. - */ -UNIMPLEMENTED(WP) /* Write protect input */ -UNIMPLEMENTED(ENTERING_RW) /* EC entering RW code */ - -ALTERNATE(PIN_MASK(A, 0x03), 1, MODULE_UART, 0) /* UART0 */ -ALTERNATE(PIN_MASK(G, 0x40), 3, MODULE_I2C, 0) /* I2C5 SCL */ -ALTERNATE(PIN_MASK(G, 0x80), 3, GPIO_OPEN_DRAIN, 0) /* I2C5 SDA */ -ALTERNATE(PIN_MASK(B, 0x03), 1, MODULE_UART, 0) /* UART1 */ -- cgit v1.2.1