diff options
| author | Vincent Palatin <vpalatin@chromium.org> | 2014-07-09 20:22:21 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-07-10 21:21:00 +0000 |
| commit | bc4973c1f9a49d8ce17b42a74e7373f2a8e8ca09 (patch) | |
| tree | abf4c33b468c51a078cf9e1d2d9a51d5e06d1bc2 | |
| parent | 55aee3888af07bedaacbcc5c345bad342c22457e (diff) | |
| download | chrome-ec-bc4973c1f9a49d8ce17b42a74e7373f2a8e8ca09.tar.gz | |
ryu: bringup fixes
- tune stack sizes
- re-order properly the ADC definitions
- select the right battery gas gauge
Signed-off-by: Vincent Palatin <vpalatin@chromium.org>
BRANCH=none
BUG=none
TEST=on Ryu, exercise ADC and battery using the EC command-line.
Change-Id: Idc307b1c1ce1d35e7b5fa2c86f956cc4c8b08783
Reviewed-on: https://chromium-review.googlesource.com/207272
Tested-by: Vincent Palatin <vpalatin@chromium.org>
Reviewed-by: Alec Berg <alecaberg@chromium.org>
Commit-Queue: Vincent Palatin <vpalatin@chromium.org>
| -rw-r--r-- | board/ryu/board.h | 9 | ||||
| -rw-r--r-- | board/ryu/ec.tasklist | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/board/ryu/board.h b/board/ryu/board.h index 596c25aac4..0e7087a98b 100644 --- a/board/ryu/board.h +++ b/board/ryu/board.h @@ -15,6 +15,9 @@ #undef CONFIG_UART_CONSOLE #define CONFIG_UART_CONSOLE 2 +/* By default, enable all console messages excepted USB */ +#define CC_DEFAULT (CC_ALL & ~CC_MASK(CC_USBPD)) + /* Optional features */ #define CONFIG_STM_HWTIMER32 #define CONFIG_USB_POWER_DELIVERY @@ -30,7 +33,7 @@ /* Charging configuration */ #undef CONFIG_BATTERY_RYU /* TODO implement */ -#define CONFIG_BATTERY_SMART +#define CONFIG_BATTERY_BQ27541 #define CONFIG_BATTERY_REQUESTS_NIL_WHEN_DEAD #define CONFIG_CHARGER #define CONFIG_CHARGER_V2 @@ -58,9 +61,9 @@ /* ADC signal */ enum adc_channel { - ADC_CC1_PD = 0, + ADC_VBUS = 0, + ADC_CC1_PD, ADC_CC2_PD, - ADC_VBUS, ADC_IADP, ADC_IBAT, /* Number of ADC channels */ diff --git a/board/ryu/ec.tasklist b/board/ryu/ec.tasklist index 8ce15522f7..280f4c81bd 100644 --- a/board/ryu/ec.tasklist +++ b/board/ryu/ec.tasklist @@ -17,9 +17,9 @@ * '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, LARGER_TASK_STACK_SIZE) \ + TASK_ALWAYS(HOOKS, hook_task, NULL, LARGER_TASK_STACK_SIZE) \ + TASK_ALWAYS(CHARGER, charger_task, NULL, TASK_STACK_SIZE) \ /* DISABLED: TASK_NOTEST(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE)*/ \ TASK_NOTEST(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \ - TASK_ALWAYS(CONSOLE, console_task, NULL, LARGER_TASK_STACK_SIZE) \ + TASK_ALWAYS(CONSOLE, console_task, NULL, TASK_STACK_SIZE) \ TASK_ALWAYS(PD, pd_task, NULL, TASK_STACK_SIZE) |