From f1eddf778abd12ab48d77a60130291cfdd7d0f68 Mon Sep 17 00:00:00 2001 From: Vic Yang Date: Thu, 11 Apr 2013 11:04:17 +0800 Subject: Exclude chipset task from test binaries For most tests, we don't need to power the AP. Let's exclude chipset task to save memory space. BUG=chrome-os-partner:18598 TEST=Run pingpong test on Spring BRANCH=none Change-Id: I545c5b3e1c27b0067d4ffe09a7971d32b75d6039 Signed-off-by: Vic Yang Reviewed-on: https://gerrit.chromium.org/gerrit/47833 Reviewed-by: Randall Spangler Reviewed-by: Vincent Palatin --- Makefile | 2 +- board/daisy/board.h | 2 ++ board/daisy/ec.tasklist | 2 +- board/link/board.h | 2 ++ board/link/ec.tasklist | 2 +- board/pit/board.h | 2 ++ board/pit/ec.tasklist | 2 +- board/snow/board.h | 2 ++ board/snow/ec.tasklist | 2 +- board/spring/board.h | 2 ++ board/spring/ec.tasklist | 2 +- 11 files changed, 16 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 38a8fc0d55..51f8db91d3 100644 --- a/Makefile +++ b/Makefile @@ -31,12 +31,12 @@ else -D"TASK_ALWAYS(n, r, d, s)=n" -imacros ec.tasklist) endif _tsk_cfg:=$(foreach t,$(_tsk_lst) ,CONFIG_TASK_$(t)) +CPPFLAGS+=$(foreach t,$(_tsk_cfg),-D$(t)) _flag_cfg:=$(shell $(CPP) $(CPPFLAGS) -P -dN chip/$(CHIP)/config.h | \ grep -o "CONFIG_.*") \ $(shell $(CPP) $(CPPFLAGS) -P -dN board/$(BOARD)/board.h | \ grep -o "CONFIG_.*") $(foreach c,$(_tsk_cfg) $(_flag_cfg),$(eval $(c)=y)) -CPPFLAGS+=$(foreach t,$(_tsk_cfg),-D$(t)) # Get build configuration from sub-directories -include private/build.mk diff --git a/board/daisy/board.h b/board/daisy/board.h index c94606c8d1..6c2dec6d65 100644 --- a/board/daisy/board.h +++ b/board/daisy/board.h @@ -20,7 +20,9 @@ /* Optional features */ #define CONFIG_BOARD_POST_GPIO_INIT +#ifdef CONFIG_TASK_CHIPSET #define CONFIG_CHIPSET_GAIA +#endif #define CONFIG_EXTPOWER_SNOW #define CONFIG_I2C #define CONFIG_I2C_HOST_AUTO diff --git a/board/daisy/ec.tasklist b/board/daisy/ec.tasklist index 092b1faa7b..6a767f6fe9 100644 --- a/board/daisy/ec.tasklist +++ b/board/daisy/ec.tasklist @@ -21,6 +21,6 @@ TASK_NOTEST(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \ TASK_ALWAYS(CHARGER, charger_task, NULL, TASK_STACK_SIZE) \ TASK_NOTEST(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) \ - TASK_ALWAYS(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE) \ + TASK_NOTEST(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE) \ TASK_ALWAYS(CONSOLE, console_task, NULL, TASK_STACK_SIZE) \ TASK_ALWAYS(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) diff --git a/board/link/board.h b/board/link/board.h index 8049358383..8200a53379 100644 --- a/board/link/board.h +++ b/board/link/board.h @@ -19,7 +19,9 @@ #define CONFIG_BATTERY_LINK #define CONFIG_CHARGER #define CONFIG_CHARGER_BQ24725 +#ifdef CONFIG_TASK_CHIPSET #define CONFIG_CHIPSET_X86 +#endif #define CONFIG_EXTPOWER_GPIO #define CONFIG_KEYBOARD_PROTOCOL_8042 #define CONFIG_LID_SWITCH diff --git a/board/link/ec.tasklist b/board/link/ec.tasklist index e3b02e5f94..07a0eb1d29 100644 --- a/board/link/ec.tasklist +++ b/board/link/ec.tasklist @@ -22,7 +22,7 @@ TASK_NOTEST(LIGHTBAR, lightbar_task, NULL, TASK_STACK_SIZE) \ TASK_ALWAYS(CHARGER, charger_task, NULL, TASK_STACK_SIZE) \ TASK_NOTEST(THERMAL, thermal_task, NULL, TASK_STACK_SIZE) \ - TASK_ALWAYS(CHIPSET, chipset_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, LARGER_TASK_STACK_SIZE) \ diff --git a/board/pit/board.h b/board/pit/board.h index f28fc01b13..53a63d87b0 100644 --- a/board/pit/board.h +++ b/board/pit/board.h @@ -23,7 +23,9 @@ /* Optional features */ #define CONFIG_BATTERY_BQ20Z453 #define CONFIG_BOARD_POST_GPIO_INIT +#ifdef CONFIG_TASK_CHIPSET #define CONFIG_CHIPSET_GAIA +#endif #define CONFIG_CMD_PMU #define CONFIG_EXTPOWER_SNOW #define CONFIG_HOST_COMMAND_STATUS diff --git a/board/pit/ec.tasklist b/board/pit/ec.tasklist index aa27474785..7f1f1de257 100644 --- a/board/pit/ec.tasklist +++ b/board/pit/ec.tasklist @@ -19,6 +19,6 @@ TASK_NOTEST(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \ TASK_ALWAYS(CHARGER, charger_task, NULL, TASK_STACK_SIZE) \ TASK_NOTEST(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) \ - TASK_ALWAYS(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE) \ + TASK_NOTEST(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE) \ TASK_ALWAYS(CONSOLE, console_task, NULL, TASK_STACK_SIZE) \ TASK_ALWAYS(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) diff --git a/board/snow/board.h b/board/snow/board.h index f828e50044..b404e94aa0 100644 --- a/board/snow/board.h +++ b/board/snow/board.h @@ -25,7 +25,9 @@ #define CONFIG_BATTERY_BQ20Z453 #define CONFIG_BOARD_PRE_INIT #define CONFIG_BOARD_POST_GPIO_INIT +#ifdef CONFIG_TASK_CHIPSET #define CONFIG_CHIPSET_GAIA +#endif #define CONFIG_CMD_PMU #define CONFIG_EXTPOWER_SNOW #define CONFIG_HOST_COMMAND_STATUS diff --git a/board/snow/ec.tasklist b/board/snow/ec.tasklist index 39ce64e09b..45d75b6b9e 100644 --- a/board/snow/ec.tasklist +++ b/board/snow/ec.tasklist @@ -22,6 +22,6 @@ TASK_NOTEST(POWERLED, power_led_task, NULL, 256) \ TASK_ALWAYS(CHARGER, charger_task, NULL, TASK_STACK_SIZE) \ TASK_NOTEST(KEYSCAN, keyboard_scan_task, NULL, 360) \ - TASK_ALWAYS(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE) \ + TASK_NOTEST(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE) \ TASK_ALWAYS(CONSOLE, console_task, NULL, TASK_STACK_SIZE) \ TASK_ALWAYS(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) diff --git a/board/spring/board.h b/board/spring/board.h index 4b416f40ac..4e7ef827e2 100644 --- a/board/spring/board.h +++ b/board/spring/board.h @@ -25,7 +25,9 @@ #define CONFIG_ADC #define CONFIG_BATTERY_BQ20Z453 #define CONFIG_BOARD_PRE_INIT +#ifdef CONFIG_TASK_CHIPSET #define CONFIG_CHIPSET_GAIA +#endif #define CONFIG_CMD_PMU #define CONFIG_EXTPOWER_USB #define CONFIG_HOST_COMMAND_STATUS diff --git a/board/spring/ec.tasklist b/board/spring/ec.tasklist index 3c57844983..4e90d23b00 100644 --- a/board/spring/ec.tasklist +++ b/board/spring/ec.tasklist @@ -21,6 +21,6 @@ TASK_NOTEST(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \ TASK_ALWAYS(CHARGER, charger_task, NULL, TASK_STACK_SIZE) \ TASK_NOTEST(KEYSCAN, keyboard_scan_task, NULL, 256) \ - TASK_ALWAYS(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE) \ + TASK_NOTEST(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE) \ TASK_ALWAYS(CONSOLE, console_task, NULL, TASK_STACK_SIZE) \ TASK_ALWAYS(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) -- cgit v1.2.1