summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
Diffstat (limited to 'board')
-rw-r--r--board/bds/ec.tasklist2
-rw-r--r--board/daisy/board.c12
-rw-r--r--board/daisy/board.h9
-rw-r--r--board/daisy/ec.tasklist6
-rw-r--r--board/link/board.c2
-rw-r--r--board/link/board.h3
-rw-r--r--board/link/ec.tasklist6
-rw-r--r--board/mccroskey/ec.tasklist4
-rw-r--r--board/snow/board.c13
-rw-r--r--board/snow/board.h13
-rw-r--r--board/snow/ec.tasklist6
-rw-r--r--board/spring/board.c14
-rw-r--r--board/spring/board.h9
-rw-r--r--board/spring/ec.tasklist6
14 files changed, 54 insertions, 51 deletions
diff --git a/board/bds/ec.tasklist b/board/bds/ec.tasklist
index b6ceedcfd5..d5f66a6570 100644
--- a/board/bds/ec.tasklist
+++ b/board/bds/ec.tasklist
@@ -15,6 +15,6 @@
* 's' is the stack size in bytes; must be a multiple of 8
*/
#define CONFIG_TASK_LIST \
- TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
+ TASK(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \
TASK(LIGHTBAR, lightbar_task, NULL, TASK_STACK_SIZE) \
TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE)
diff --git a/board/daisy/board.c b/board/daisy/board.c
index f8612a1231..10a5c2e39f 100644
--- a/board/daisy/board.c
+++ b/board/daisy/board.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 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.
*/
@@ -33,14 +33,14 @@
#define GPIO_KB_OUTPUT (GPIO_OUTPUT | GPIO_PULL_UP | GPIO_OPEN_DRAIN)
/* GPIO interrupt handlers prototypes */
-#ifndef CONFIG_TASK_GAIAPOWER
-#define gaia_power_event NULL
-#define gaia_suspend_event NULL
-#define gaia_lid_event NULL
-#else
+#ifdef CONFIG_CHIPSET_GAIA
void gaia_power_event(enum gpio_signal signal);
void gaia_suspend_event(enum gpio_signal signal);
void gaia_lid_event(enum gpio_signal signal);
+#else
+#define gaia_power_event NULL
+#define gaia_suspend_event NULL
+#define gaia_lid_event NULL
#endif
#ifndef CONFIG_TASK_KEYSCAN
#define matrix_interrupt NULL
diff --git a/board/daisy/board.h b/board/daisy/board.h
index 0f7f2169a4..0e342b19b9 100644
--- a/board/daisy/board.h
+++ b/board/daisy/board.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 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.
*/
@@ -14,13 +14,14 @@
/* Use USART1 as console serial port */
#define CONFIG_CONSOLE_UART 1
-/* use I2C for host communication */
-#define CONFIG_I2C
-
/* Debug features */
#define CONFIG_PANIC_HELP
#define CONFIG_ASSERT_HELP
+/* Optional features */
+#define CONFIG_CHIPSET_GAIA
+#define CONFIG_I2C
+
/* Allow dangerous commands all the time, since we don't have a write protect
* switch. */
/* TODO: (crosbug.com/p/9986) This is a serious security hole and should be
diff --git a/board/daisy/ec.tasklist b/board/daisy/ec.tasklist
index 1097aeb4e1..12e777fee8 100644
--- a/board/daisy/ec.tasklist
+++ b/board/daisy/ec.tasklist
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 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.
*/
@@ -15,11 +15,11 @@
* 's' is the stack size in bytes; must be a multiple of 8
*/
#define CONFIG_TASK_LIST \
- TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
+ TASK(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \
TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
TASK(POWERLED, power_led_task, NULL, TASK_STACK_SIZE) \
TASK(PMU_TPS65090_CHARGER, pmu_charger_task, NULL, TASK_STACK_SIZE) \
TASK(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) \
- TASK(GAIAPOWER, gaia_power_task, NULL, TASK_STACK_SIZE) \
+ TASK(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE) \
TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE) \
TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE)
diff --git a/board/link/board.c b/board/link/board.c
index fd3c573d26..476be6dc79 100644
--- a/board/link/board.c
+++ b/board/link/board.c
@@ -15,7 +15,7 @@
#include "util.h"
#include "x86_power.h"
-#ifndef CONFIG_TASK_X86POWER
+#ifndef CONFIG_CHIPSET_X86
#define x86_power_interrupt NULL
#endif
#ifndef CONFIG_TASK_SWITCH
diff --git a/board/link/board.h b/board/link/board.h
index cc7463c961..b5ced2755d 100644
--- a/board/link/board.h
+++ b/board/link/board.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 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.
*/
@@ -17,6 +17,7 @@
#define CONFIG_BATTERY_LINK
#define CONFIG_CHARGER
#define CONFIG_CHARGER_BQ24725
+#define CONFIG_CHIPSET_X86
#define CONFIG_CONSOLE_CMDHELP
#define CONFIG_EXTPOWER_GPIO
#define CONFIG_LPC
diff --git a/board/link/ec.tasklist b/board/link/ec.tasklist
index 51ec29cdd6..c6a37c2b9c 100644
--- a/board/link/ec.tasklist
+++ b/board/link/ec.tasklist
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 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.
*/
@@ -15,13 +15,13 @@
* 's' is the stack size in bytes; must be a multiple of 8
*/
#define CONFIG_TASK_LIST \
- TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
+ TASK(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \
TASK(VBOOTHASH, vboot_hash_task, NULL, LARGER_TASK_STACK_SIZE) \
TASK(LIGHTBAR, lightbar_task, NULL, TASK_STACK_SIZE) \
TASK(CHARGER, charge_state_machine_task, NULL, TASK_STACK_SIZE) \
TASK(THERMAL, thermal_task, NULL, TASK_STACK_SIZE) \
TASK(TYPEMATIC, keyboard_typematic_task, NULL, TASK_STACK_SIZE) \
- TASK(X86POWER, x86_power_task, NULL, TASK_STACK_SIZE) \
+ TASK(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE) \
TASK(I8042CMD, i8042_command_task, NULL, TASK_STACK_SIZE) \
TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
TASK(CONSOLE, console_task, NULL, LARGER_TASK_STACK_SIZE) \
diff --git a/board/mccroskey/ec.tasklist b/board/mccroskey/ec.tasklist
index dab971ccb3..6820cd84b4 100644
--- a/board/mccroskey/ec.tasklist
+++ b/board/mccroskey/ec.tasklist
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 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.
*/
@@ -15,7 +15,7 @@
* 's' is the stack size in bytes; must be a multiple of 8
*/
#define CONFIG_TASK_LIST \
- TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
+ TASK(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \
TASK(KEYSCAN, keyboard_scan_task, NULL, 360) \
TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE) \
TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE)
diff --git a/board/snow/board.c b/board/snow/board.c
index cf5ac61ab4..507a732c07 100644
--- a/board/snow/board.c
+++ b/board/snow/board.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 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.
*/
@@ -28,15 +28,16 @@
#define HARD_RESET_TIMEOUT_MS 5
/* GPIO interrupt handlers prototypes */
-#ifndef CONFIG_TASK_GAIAPOWER
-#define gaia_power_event NULL
-#define gaia_suspend_event NULL
-#define gaia_lid_event NULL
-#else
+#ifdef CONFIG_CHIPSET_GAIA
void gaia_power_event(enum gpio_signal signal);
void gaia_suspend_event(enum gpio_signal signal);
void gaia_lid_event(enum gpio_signal signal);
+#else
+#define gaia_power_event NULL
+#define gaia_suspend_event NULL
+#define gaia_lid_event NULL
#endif
+
#ifndef CONFIG_TASK_KEYSCAN
#define matrix_interrupt NULL
#endif
diff --git a/board/snow/board.h b/board/snow/board.h
index f7f3683322..448b3bb17b 100644
--- a/board/snow/board.h
+++ b/board/snow/board.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 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.
*/
@@ -14,17 +14,16 @@
/* Use USART1 as console serial port */
#define CONFIG_CONSOLE_UART 1
-/* use I2C for host communication */
-#define CONFIG_I2C
-
-#define CONFIG_CONFIGURE_BOARD_LATE
-#define CONFIG_HOST_COMMAND_STATUS
-
/* Debug features */
#define CONFIG_PANIC_HELP
#define CONFIG_ASSERT_HELP
#define CONFIG_CONSOLE_CMDHELP
+/* Optional features */
+#define CONFIG_CHIPSET_GAIA
+#define CONFIG_CONFIGURE_BOARD_LATE
+#define CONFIG_HOST_COMMAND_STATUS
+#define CONFIG_I2C
#undef CONFIG_TASK_PROFILING
#define CONFIG_WATCHDOG_HELP
diff --git a/board/snow/ec.tasklist b/board/snow/ec.tasklist
index 80d808ede9..375d534b64 100644
--- a/board/snow/ec.tasklist
+++ b/board/snow/ec.tasklist
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 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.
*/
@@ -15,11 +15,11 @@
* 's' is the stack size in bytes; must be a multiple of 8
*/
#define CONFIG_TASK_LIST \
- TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
+ TASK(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \
TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
TASK(POWERLED, power_led_task, NULL, 256) \
TASK(PMU_TPS65090_CHARGER, pmu_charger_task, NULL, TASK_STACK_SIZE) \
TASK(KEYSCAN, keyboard_scan_task, NULL, 360) \
- TASK(GAIAPOWER, gaia_power_task, NULL, TASK_STACK_SIZE) \
+ TASK(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE) \
TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE) \
TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE)
diff --git a/board/spring/board.c b/board/spring/board.c
index 774f466814..cd98e21d7e 100644
--- a/board/spring/board.c
+++ b/board/spring/board.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 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.
*/
@@ -46,18 +46,20 @@ uint8_t breathing_prog[] = {0x41, 0xff, /* 0x80 -> 0x0 */
0x00, 0x00}; /* Repeat */
/* GPIO interrupt handlers prototypes */
-#ifndef CONFIG_TASK_GAIAPOWER
-#define gaia_power_event NULL
-#define gaia_suspend_event NULL
-#define gaia_lid_event NULL
-#else
+#ifdef CONFIG_CHIPSET_GAIA
void gaia_power_event(enum gpio_signal signal);
void gaia_suspend_event(enum gpio_signal signal);
void gaia_lid_event(enum gpio_signal signal);
+#else
+#define gaia_power_event NULL
+#define gaia_suspend_event NULL
+#define gaia_lid_event NULL
#endif
+
#ifndef CONFIG_TASK_KEYSCAN
#define matrix_interrupt NULL
#endif
+
void usb_charge_interrupt(enum gpio_signal signal);
/* GPIO signal list. Must match order from enum gpio_signal. */
diff --git a/board/spring/board.h b/board/spring/board.h
index 1132f759c5..7c39ac54e4 100644
--- a/board/spring/board.h
+++ b/board/spring/board.h
@@ -14,16 +14,15 @@
/* Use USART1 as console serial port */
#define CONFIG_CONSOLE_UART 1
-/* use I2C for host communication */
-#define CONFIG_I2C
-
-#define CONFIG_HOST_COMMAND_STATUS
-
/* Debug features */
#define CONFIG_PANIC_HELP
#define CONFIG_ASSERT_HELP
#define CONFIG_CONSOLE_CMDHELP
+/* Optional features */
+#define CONFIG_CHIPSET_GAIA
+#define CONFIG_HOST_COMMAND_STATUS
+#define CONFIG_I2C
#undef CONFIG_TASK_PROFILING
#define CONFIG_WATCHDOG_HELP
diff --git a/board/spring/ec.tasklist b/board/spring/ec.tasklist
index c29cca16df..0daf6727d7 100644
--- a/board/spring/ec.tasklist
+++ b/board/spring/ec.tasklist
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 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.
*/
@@ -15,10 +15,10 @@
* 's' is the stack size in bytes; must be a multiple of 8
*/
#define CONFIG_TASK_LIST \
- TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
+ TASK(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \
TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
TASK(PMU_TPS65090_CHARGER, pmu_charger_task, NULL, TASK_STACK_SIZE) \
TASK(KEYSCAN, keyboard_scan_task, NULL, 256) \
- TASK(GAIAPOWER, gaia_power_task, NULL, TASK_STACK_SIZE) \
+ TASK(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE) \
TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE) \
TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE)
View Lorry Controller Status