scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2026-01-13 03:15:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

lpc/espi: define new targeted config options

Browse Source 
Introduce CONFIG_HOSTCMD_LPC and CONFIG_HOSTCMD_ESPI which will replace
CONFIG_LPC and CONFIG_ESPI. Today the CONFIG_LPC option guards both
common code to eSPI and LPC and LPC-only code. Going forward
CONFIG_HOSTCMD_LPC will guard only LPC code, and a new option
CONFIG_HOSTCMD_X86 will guard common code to both LPC and eSPI.

I am leaving the CONFIG_LPC and CONFIG_ESPI defines in this CL so each
CL in the stack compiles.

BRANCH=none
BUG=chromium:818804
TEST=Full stack builds and works on yorp (espi) and grunt (lpc)

Change-Id: I6ae3a805167a3404701d8a53c14dc83299afb376
Signed-off-by: Jett Rink <jettrink@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1067498
Reviewed-by: Randall Spangler <rspangler@chromium.org>
This commit is contained in:
Jett Rink
2018-05-21 10:22:55 -06:00
committed by chrome-bot
parent 359f1b582a
commit dbfa3cf2dc
1 changed files with 39 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
include/config.h
View File

@@ -1172,9 +1172,6 @@
*/
#undef CONFIG_EMULATED_SYSRQ
/* Support for eSPI for host communication */
#undef CONFIG_ESPI
/* Use Virtual Wire signals instead of GPIO with eSPI interface */
#undef CONFIG_ESPI_VW_SIGNALS
@@ -2074,8 +2071,17 @@
*/
#undef CONFIG_LOW_POWER_S0
/* Support LPC interface */
#undef CONFIG_LPC
/*
* EC supports x86 host communication with AP. This can either be through LPC
* or eSPI. The CONFIG_HOSTCMD_X86 will get automatically defined if either
* CONFIG_HOSTCMD_LPC or CONFIG_HOSTCMD_ESPI are defined. LPC and eSPI are
* mutually exclusive.
*/
#undef CONFIG_HOSTCMD_X86
/* Support host command interface over LPC bus. */
#undef CONFIG_HOSTCMD_LPC
/* Support host command interface over eSPI bus. */
#undef CONFIG_HOSTCMD_ESPI
/* Base address of low power RAM. */
#undef CONFIG_LPRAM_BASE
@@ -3376,6 +3382,34 @@
#include "config_chip.h"
#include "board.h"
/******************************************************************************/
/*
* Automatically define CONFIG_HOSTCMD_X86 if either child option is defined.
* Ensure LPC and eSPI are mutually exclusive
*/
#if defined(CONFIG_HOSTCMD_LPC) || defined(CONFIG_HOSTCMD_ESPI)
#define CONFIG_HOSTCMD_X86
#endif
#if defined(CONFIG_HOSTCMD_LPC) && defined(CONFIG_HOSTCMD_ESPI)
#error Must select only one type of host communication bus.
#endif
#if defined(CONFIG_HOSTCMD_X86) && \
!defined(CONFIG_HOSTCMD_LPC) && \
!defined(CONFIG_HOSTCMD_ESPI)
#error Must select one type of host communication bus.
#endif
/* TODO(chromium:818804): Remove temp transition code below once finished */
#ifdef CONFIG_HOSTCMD_ESPI
#define CONFIG_LPC
#define CONFIG_ESPI
#endif
#ifdef CONFIG_HOSTCMD_LPC
#define CONFIG_LPC
#endif
/******************************************************************************/
/*
* Set default data ram size unless it's customized by the chip.