diff options
author | Shawn Nematbakhsh <shawnn@chromium.org> | 2015-10-30 17:52:37 -0700 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2015-10-30 23:02:23 -0700 |
commit | 9258886bd3a7a6d178738ef3daac1a1cd40ee135 (patch) | |
tree | 82d528a5816b780215871453c09fb872cbb06184 | |
parent | a023d6b0c1f3fc6dcc2e026ea324b90a5ffa7ae0 (diff) | |
download | chrome-ec-9258886bd3a7a6d178738ef3daac1a1cd40ee135.tar.gz |
glower: Remove board
Glower is no longer in use or useful, so remove it.
BUG=None
TEST=`make buildall -j
BRANCH=None
Change-Id: I8f9868e37a759fa7c1229d5ad2531bc947108010
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/309976
Commit-Ready: Shawn N <shawnn@chromium.org>
Tested-by: Shawn N <shawnn@chromium.org>
Reviewed-by: Alec Berg <alecaberg@chromium.org>
l--------- | board/glower/Makefile | 1 | ||||
-rw-r--r-- | board/glower/board.c | 59 | ||||
-rw-r--r-- | board/glower/board.h | 108 | ||||
-rw-r--r-- | board/glower/build.mk | 13 | ||||
-rw-r--r-- | board/glower/ec.tasklist | 27 | ||||
-rw-r--r-- | board/glower/gpio.inc | 94 | ||||
-rw-r--r-- | board/glower/lfw/gpio.inc | 16 | ||||
-rwxr-xr-x | util/flash_ec | 1 |
8 files changed, 0 insertions, 319 deletions
diff --git a/board/glower/Makefile b/board/glower/Makefile deleted file mode 120000 index 94aaae2c4d..0000000000 --- a/board/glower/Makefile +++ /dev/null @@ -1 +0,0 @@ -../../Makefile
\ No newline at end of file diff --git a/board/glower/board.c b/board/glower/board.c deleted file mode 100644 index 8f6e139aab..0000000000 --- a/board/glower/board.c +++ /dev/null @@ -1,59 +0,0 @@ -/* Copyright 2015 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. - */ -/* Glower board-specific configuration */ - -#include "charger.h" -#include "extpower.h" -#include "gpio.h" -#include "i2c.h" -#include "lid_switch.h" -#include "power.h" -#include "power_button.h" -#include "registers.h" -#include "spi.h" -#include "switch.h" -#include "util.h" - -#define GPIO_KB_INPUT GPIO_INPUT -#define GPIO_KB_OUTPUT (GPIO_ODR_HIGH | GPIO_PULL_UP) - -#include "gpio_list.h" - -/* power signal list. Must match order of enum power_signal. */ -const struct power_signal_info power_signal_list[] = { - {GPIO_PP1050_PGOOD, 1, "PGOOD_PP1050"}, - {GPIO_PP3300_PCH_PGOOD, 1, "PGOOD_PP3300_PCH"}, - {GPIO_PP5000_PGOOD, 1, "PGOOD_PP5000"}, - {GPIO_S5_PGOOD, 1, "PGOOD_S5"}, - {GPIO_VCORE_PGOOD, 1, "PGOOD_VCORE"}, - {GPIO_PP1000_S0IX_PGOOD, 1, "PGOOD_PP1000_S0IX"}, - {GPIO_PCH_SLP_S3_L, 1, "SLP_S3#_DEASSERTED"}, - {GPIO_PCH_SLP_S4_L, 1, "SLP_S4#_DEASSERTED"}, -#ifdef CONFIG_CHIPSET_DEBUG - {GPIO_PCH_SLP_SX_L, 1, "SLP_SX#_DEASSERTED"}, - {GPIO_PCH_SUS_STAT_L, 0, "SUS_STAT#_ASSERTED"}, - {GPIO_PCH_SUSPWRDNACK, 1, "SUSPWRDNACK_ASSERTED"}, -#endif -}; -BUILD_ASSERT(ARRAY_SIZE(power_signal_list) == POWER_SIGNAL_COUNT); - -/* I2C ports */ -const struct i2c_port_t i2c_ports[] = { - {"batt_chg", MEC1322_I2C1, 100}, - {"thermal", MEC1322_I2C2, 100}, -}; -const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); - -/* SPI devices */ -const struct spi_device_t spi_devices[] = { - { CONFIG_SPI_FLASH_PORT, 0, GPIO_PVT_CS0}, -}; -const unsigned int spi_devices_used = ARRAY_SIZE(spi_devices); - -const enum gpio_signal hibernate_wake_pins[] = { - GPIO_POWER_BUTTON_L, -}; - -const int hibernate_wake_pins_used = ARRAY_SIZE(hibernate_wake_pins); diff --git a/board/glower/board.h b/board/glower/board.h deleted file mode 100644 index 159149b514..0000000000 --- a/board/glower/board.h +++ /dev/null @@ -1,108 +0,0 @@ -/* Copyright 2015 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. - */ - -/* Glower board configuration */ - -#ifndef __CROS_EC_BOARD_H -#define __CROS_EC_BOARD_H - -/* Optional features */ -/* #define CONFIG_BACKLIGHT_LID */ -/* #define CONFIG_BATTERY_SMART */ -#define CONFIG_BOARD_VERSION - -#if 0 -#define CONFIG_CHARGER -#define CONFIG_CHARGER_V1 -#define CONFIG_CHARGER_BQ24715 -#define CONFIG_CHARGER_DISCHARGE_ON_AC -#define CONFIG_CHARGER_INPUT_CURRENT 1700 /* 33 W adapter, 19 V, 1.75 A */ -#define CONFIG_CHARGER_SENSE_RESISTOR 10 /* Charge sense resistor, mOhm */ -#define CONFIG_CHARGER_SENSE_RESISTOR_AC 10 /* Input senso resistor, mOhm */ -#endif - -#define CONFIG_CHIPSET_BAYTRAIL -#define CONFIG_CHIPSET_CAN_THROTTLE -#define CONFIG_POWER_COMMON -#define CONFIG_POWER_SHUTDOWN_PAUSE_IN_S5 -/* #define CONFIG_CMD_GSV */ -#define CONFIG_EXTPOWER_GPIO -#define CONFIG_I2C_PASSTHRU_RESTRICTED -#define CONFIG_KEYBOARD_COL2_INVERTED -#define CONFIG_KEYBOARD_IRQ_GPIO GPIO_KBD_IRQ_L -#define CONFIG_KEYBOARD_PROTOCOL_8042 -/* #define CONFIG_LED_COMMON */ -#define CONFIG_POWER_BUTTON -#define CONFIG_POWER_BUTTON_X86 -#define CONFIG_USB_PORT_POWER_IN_S3 -#define CONFIG_USB_PORT_POWER_SMART -#define CONFIG_USB_PORT_POWER_SMART_SIMPLE -/* #define CONFIG_VBOOT_HASH */ -/* -#define CONFIG_WIRELESS -#define CONFIG_WIRELESS_SUSPEND \ - (EC_WIRELESS_SWITCH_WLAN | EC_WIRELESS_SWITCH_WLAN_POWER) - */ - -#define CONFIG_SYSTEM_UNLOCKED /* Allow dangerous commands */ -#define CONFIG_WATCHDOG_HELP -#define CONFIG_CLOCK_CRYSTAL - -/* 512kb SPI flash */ -#define CONFIG_FLASH_SIZE 0x00080000 -#define CONFIG_SPI_FLASH_W25X40 -#define CONFIG_SPI_FLASH_PORT 1 - -#define CONFIG_CMD_FLASH -#define CONFIG_CMD_SPI_FLASH -#undef CONFIG_TASK_PROFILING - -/* Modules we want to exclude */ -#undef CONFIG_ADC -#undef CONFIG_EEPROM -#undef CONFIG_PECI -#undef CONFIG_PSTORE -#undef CONFIG_PWM - -#ifndef __ASSEMBLER__ - -/* I2C ports */ -#define I2C_PORT_BATTERY MEC1322_I2C1 -#define I2C_PORT_CHARGER MEC1322_I2C1 -#define I2C_PORT_THERMAL MEC1322_I2C2 - -/* USB ports */ -#define USB_PORT_COUNT 2 - -/* Wireless signals */ -#define WIRELESS_GPIO_WLAN GPIO_WLAN_OFF_L -#define WIRELESS_GPIO_WWAN GPIO_PP3300_LTE_EN -#define WIRELESS_GPIO_WLAN_POWER GPIO_PP3300_WLAN_EN - -#include "gpio_signal.h" - -/* power signal definitions */ -enum power_signal { - X86_PGOOD_PP1050 = 0, - X86_PGOOD_PP3300_PCH, - X86_PGOOD_PP5000, - X86_PGOOD_S5, - X86_PGOOD_VCORE, - X86_PGOOD_PP1000_S0IX, - X86_SLP_S3_DEASSERTED, - X86_SLP_S4_DEASSERTED, -#ifdef CONFIG_CHIPSET_DEBUG - X86_SLP_SX_DEASSERTED, - X86_SUS_STAT_ASSERTED, - X86_SUSPWRDNACK_ASSERTED, -#endif - - /* Number of X86 signals */ - POWER_SIGNAL_COUNT -}; - -#endif /* !__ASSEMBLER__ */ - -#endif /* __CROS_EC_BOARD_H */ diff --git a/board/glower/build.mk b/board/glower/build.mk deleted file mode 100644 index e28777724e..0000000000 --- a/board/glower/build.mk +++ /dev/null @@ -1,13 +0,0 @@ -# -*- makefile -*- -# Copyright 2015 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 Microchip MEC1322 -CHIP:=mec1322 -CHIP_SPI_SIZE_KB:=512 - -board-y=board.o diff --git a/board/glower/ec.tasklist b/board/glower/ec.tasklist deleted file mode 100644 index b199809ac9..0000000000 --- a/board/glower/ec.tasklist +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2015 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. - */ - -/** - * List of enabled tasks in the priority order - * - * The first one has the lowest priority. - * - * For each task, use the macro TASK_ALWAYS(n, r, d, s) for base tasks and - * TASK_NOTEST(n, r, d, s) for tasks that can be excluded in test binaries, - * where : - * 'n' in the name of the task - * 'r' in the main routine of the task - * 'd' in an opaque parameter passed to the routine at startup - * 's' is the stack size in bytes; must be a multiple of 8 - */ -#define CONFIG_TASK_LIST \ - TASK_ALWAYS(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \ - /* TASK_ALWAYS(CHARGER, charger_task, NULL, TASK_STACK_SIZE) */ \ - TASK_NOTEST(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE) \ - TASK_NOTEST(KEYPROTO, keyboard_protocol_task, NULL, TASK_STACK_SIZE) \ - TASK_ALWAYS(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \ - TASK_ALWAYS(CONSOLE, console_task, NULL, TASK_STACK_SIZE) \ - TASK_ALWAYS(POWERBTN, power_button_task, NULL, TASK_STACK_SIZE) \ - TASK_NOTEST(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) diff --git a/board/glower/gpio.inc b/board/glower/gpio.inc deleted file mode 100644 index 1eb3ca20ad..0000000000 --- a/board/glower/gpio.inc +++ /dev/null @@ -1,94 +0,0 @@ -/* -*- mode:c -*- - * - * Copyright 2015 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. - */ - -/* Inputs with interrupt handlers are first for efficiency */ -GPIO_INT(POWER_BUTTON_L, PIN(203), GPIO_INT_BOTH, power_button_interrupt) -GPIO_INT(LID_OPEN, PIN(160), GPIO_INT_BOTH, lid_interrupt) -GPIO_INT(AC_PRESENT, PIN(163), GPIO_INT_BOTH, extpower_interrupt) -GPIO_INT(PCH_SLP_S3_L, PIN(204), GPIO_INT_BOTH | GPIO_PULL_UP, power_signal_interrupt) /* SLP_S3# signal from PCH */ -GPIO_INT(PCH_SLP_S4_L, PIN(210), GPIO_INT_BOTH | GPIO_PULL_UP, power_signal_interrupt) /* SLP_S4# signal from PCH */ -GPIO_INT(PP1050_PGOOD, PIN(133), GPIO_INT_BOTH, power_signal_interrupt) /* Power good on 1.05V */ -GPIO_INT(PP3300_PCH_PGOOD, PIN(44), GPIO_INT_BOTH, power_signal_interrupt) /* Power good on 3.3V (PCH supply) */ -GPIO_INT(PP5000_PGOOD, PIN(30), GPIO_INT_BOTH, power_signal_interrupt) /* Power good on 5V */ -GPIO_INT(S5_PGOOD, PIN(62), GPIO_INT_BOTH, power_signal_interrupt) /* Power good on S5 supplies */ -GPIO_INT(VCORE_PGOOD, PIN(57), GPIO_INT_BOTH, power_signal_interrupt) /* Power good on core VR */ -GPIO_INT(WP_L, PIN(12), GPIO_INT_BOTH, switch_interrupt) /* Write protect input */ - -/* Other inputs */ -GPIO(BOARD_VERSION1, PIN(6), GPIO_INPUT) -GPIO(BOARD_VERSION2, PIN(123), GPIO_INPUT) -GPIO(BOARD_VERSION3, PIN(127), GPIO_INPUT) - -#ifdef CONFIG_CHIPSET_DEBUG -GPIO(PCH_SLP_SX_L, PIN(211), GPIO_INPUT | GPIO_PULL_UP) -GPIO(PCH_SUS_STAT_L, PIN(201), GPIO_INPUT | GPIO_PULL_UP) -GPIO(PCH_SUSPWRDNACK, PIN(46), GPIO_INPUT | GPIO_PULL_UP) -#endif - -GPIO(PP1000_S0IX_PGOOD, PIN(35), GPIO_INPUT) -GPIO(USB1_OC_L, PIN(134),GPIO_INPUT) -GPIO(USB2_OC_L, PIN(16), GPIO_INPUT) - -/* Outputs; all unasserted by default except for reset signals */ -GPIO(CPU_PROCHOT, PIN(145), GPIO_OUT_LOW) /* Force CPU to think it's overheated */ -GPIO(ENABLE_BACKLIGHT, PIN(200), GPIO_ODR_HIGH) /* Enable backlight power */ -GPIO(ENABLE_TOUCHPAD, PIN(64), GPIO_OUT_LOW) /* Enable touchpad power */ -GPIO(ENTERING_RW, PIN(33), GPIO_OUT_LOW) /* Indicate when EC is entering RW code */ -GPIO(LPC_CLKRUN_L, PIN(14), GPIO_ODR_HIGH) /* Request that PCH drive LPC clock */ -GPIO(PCH_CORE_PWROK, PIN(122), GPIO_OUT_LOW) /* Indicate core well power is stable */ -GPIO(PCH_PWRBTN_L, PIN(130), GPIO_ODR_HIGH) /* Power button output to PCH */ -GPIO(PCH_RCIN_L, PIN(140), GPIO_ODR_HIGH) /* Reset line to PCH (for 8042 emulation) */ -GPIO(PCH_RSMRST_L, PIN(143), GPIO_OUT_LOW) /* Reset PCH resume power plane logic */ -GPIO(PCH_SMI_L, PIN(55), GPIO_ODR_HIGH) /* System management interrupt to PCH */ -GPIO(PCH_SOC_OVERRIDE_L, PIN(65), GPIO_OUT_LOW) /* SOC override signal to PCH; when high, ME ignores security descriptor */ -GPIO(PCH_SYS_PWROK, PIN(124), GPIO_OUT_LOW) /* EC thinks everything is up and ready */ -GPIO(PCH_WAKE_L, PIN(202), GPIO_ODR_HIGH) /* Wake signal from EC to PCH */ -GPIO(PP1350_EN, PIN(147), GPIO_OUT_LOW) /* Enable 1.35V supply */ -GPIO(PP3300_DX_EN, PIN(50), GPIO_OUT_LOW) /* Enable power to lots of peripherals */ -GPIO(PP3300_LTE_EN, PIN(11), GPIO_OUT_LOW) /* Enable LTE radio */ -GPIO(PP3300_WLAN_EN, PIN(47), GPIO_OUT_LOW) /* Enable WiFi power */ -GPIO(PP5000_EN, PIN(27), GPIO_OUT_LOW) /* Enable 5V supply */ -GPIO(PPSX_EN, PIN(53), GPIO_INPUT) /* Enable PP1350_PCH_SX, PP1000_PCH_SX */ -GPIO(SUSP_VR_EN, PIN(66), GPIO_OUT_LOW) /* Enable 1.05V regulator */ -GPIO(TOUCHSCREEN_RESET_L, PIN(161), GPIO_OUT_HIGH) /* Reset touch screen */ -GPIO(USB_CTL1, PIN(157), GPIO_OUT_LOW) /* USB control signal 1 to both ports */ -GPIO(USB_ILIM_SEL, PIN(36), GPIO_OUT_LOW) /* USB current limit to both ports */ -GPIO(USB1_ENABLE, PIN(15), GPIO_OUT_LOW) /* USB port 1 output power enable */ -GPIO(USB2_ENABLE, PIN(17), GPIO_OUT_LOW) /* USB port 2 output power enable */ -GPIO(VCORE_EN, PIN(150), GPIO_OUT_LOW) /* Enable core power supplies */ -GPIO(WLAN_OFF_L, PIN(52), GPIO_OUT_LOW) /* Disable WiFi radio */ -GPIO(KBD_IRQ_L, PIN(67), GPIO_ODR_HIGH) /* Negative edge triggered irq. */ -GPIO(BAT_LED0, PIN(154), GPIO_ODR_HIGH) -GPIO(BAT_LED1, PIN(155), GPIO_ODR_HIGH) -GPIO(KBD_KSO2, PIN(101), GPIO_OUT_LOW) - -GPIO(SYS_RST_L, PIN(121), GPIO_INPUT) -GPIO(EC_HIB, PIN(34), GPIO_INPUT) -GPIO(ICMNT, PIN(61), GPIO_INPUT) -GPIO(PVT_CS0, PIN(146), GPIO_ODR_HIGH) - -/* Configure VCC_PWRGD as GPIO so that it's internally gated high */ -GPIO(TP78, PIN(63), GPIO_OUT_HIGH) - - -ALTERNATE(PIN_MASK(16, 0x24), 1, MODULE_UART, 0) /* UART0 */ -ALTERNATE(PIN_MASK(2, 0x0f), 2, MODULE_I2C, 0) /* I2C1 and I2C2 */ -ALTERNATE(PIN_MASK(0, 0xfe), 3, MODULE_KEYBOARD_SCAN, GPIO_KB_OUTPUT) -ALTERNATE(PIN_MASK(1, 0x03), 3, MODULE_KEYBOARD_SCAN, GPIO_KB_OUTPUT) -ALTERNATE(PIN_MASK(3, 0x04), 3, MODULE_KEYBOARD_SCAN, GPIO_KB_INPUT) -ALTERNATE(PIN_MASK(4, 0x0d), 3, MODULE_KEYBOARD_SCAN, GPIO_KB_INPUT) -ALTERNATE(PIN_MASK(10, 0xd8), 3, MODULE_KEYBOARD_SCAN, GPIO_KB_OUTPUT) -ALTERNATE(PIN_MASK(12, 0x60), 2, MODULE_KEYBOARD_SCAN, GPIO_KB_INPUT) -ALTERNATE(PIN_MASK(14, 0x14), 3, MODULE_KEYBOARD_SCAN, GPIO_KB_INPUT) -ALTERNATE(PIN_MASK(2, 0x40), 2, MODULE_LPC, 0) /* LPC SCI */ -ALTERNATE(PIN_MASK(15, 0x08), 1, MODULE_SPI, 0) -ALTERNATE(PIN_MASK(16, 0x10), 1, MODULE_SPI, 0) -ALTERNATE(PIN_MASK(5, 0x10), 1, MODULE_SPI, 0) -ALTERNATE(PIN_MASK(1, 0x10), 1, MODULE_LPC, 0) /* 14: CLKRUN# */ -ALTERNATE(PIN_MASK(11, 0x9e), 1, MODULE_LPC, 0) /* 111~114:LAD[0:3], 117:PCI_CLK */ -ALTERNATE(PIN_MASK(11, 0x40), 1, MODULE_LPC, GPIO_INT_BOTH) /* 116: LRESET# */ -ALTERNATE(PIN_MASK(12, 0x01), 1, MODULE_LPC, 0) /* 120: LFRAME# */ diff --git a/board/glower/lfw/gpio.inc b/board/glower/lfw/gpio.inc deleted file mode 100644 index 724214cc0e..0000000000 --- a/board/glower/lfw/gpio.inc +++ /dev/null @@ -1,16 +0,0 @@ -/* -*- mode:c -*- - * - * Copyright (c) 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. - * - * Minimal set of GPIOs needed for LFW loader - */ - -GPIO(PVT_CS0, PIN(146), GPIO_ODR_HIGH) /* SPI PVT Chip select */ - -/* Alternate functions GPIO definition */ -ALTERNATE(PIN_MASK(16, 0x24), 1, MODULE_UART, 0) /* UART0 */ -ALTERNATE(PIN_MASK(5, 0x10), 1, MODULE_SPI, 0) -ALTERNATE(PIN_MASK(16, 0x10), 1, MODULE_SPI, 0) -ALTERNATE(PIN_MASK(15, 0x08), 1, MODULE_SPI, 0) /* 153: CLK */ diff --git a/util/flash_ec b/util/flash_ec index bd6adcc69b..f97a693bef 100755 --- a/util/flash_ec +++ b/util/flash_ec @@ -99,7 +99,6 @@ BOARDS_NRF51=( BOARDS_MEC1322=( chell glados - glower kunimitsu lars strago |