diff options
author | Vincent Palatin <vpalatin@chromium.org> | 2012-01-24 21:15:26 +0000 |
---|---|---|
committer | Vincent Palatin <vpalatin@chromium.org> | 2012-01-24 23:17:07 +0000 |
commit | d356dea61ee170366acddc373953dad20f6fc48e (patch) | |
tree | 5f7e408361838d08cd345c35144f2cf03a871bd9 /test | |
parent | 396a94c43f5b23d3c3535237e1ed6a1d90af3f3b (diff) | |
download | chrome-ec-d356dea61ee170366acddc373953dad20f6fc48e.tar.gz |
Add modularity to the build
You can now enable/disable tasks more easily.
To conditionally compile a C file depending on the task FOO activation,
just write something like that in the build.mk file :
common-$(CONFIG_TASK_FOO)+=foo_source.o
Signed-off-by: Vincent Palatin <vpalatin@chromium.org>
BUG=None
TEST=make all BOARD=link && make qemu-tests
Change-Id: I760fb248e1599d13190ccd937a68ef47da17b510
Diffstat (limited to 'test')
-rw-r--r-- | test/build.mk | 8 | ||||
-rw-r--r-- | test/hello.py | 1 | ||||
-rw-r--r-- | test/hello.tasklist | 7 | ||||
-rw-r--r-- | test/pingpong.tasklist | 8 | ||||
-rw-r--r-- | test/powerdemo.tasklist | 2 | ||||
-rw-r--r-- | test/timer_calib.tasklist | 8 | ||||
-rw-r--r-- | test/timer_dos.tasklist | 8 |
7 files changed, 12 insertions, 30 deletions
diff --git a/test/build.mk b/test/build.mk index 20df88c04b..44739752a0 100644 --- a/test/build.mk +++ b/test/build.mk @@ -5,7 +5,7 @@ test-list=hello pingpong timer_calib timer_dos #disable: powerdemo -pingpong-objs=pingpong.o -powerdemo-objs=powerdemo.o -timer_calib-objs=timer_calib.o -timer_dos-objs=timer_dos.o +pingpong-y=pingpong.o +powerdemo-y=powerdemo.o +timer_calib-y=timer_calib.o +timer_dos-y=timer_dos.o diff --git a/test/hello.py b/test/hello.py index 861cbf0bb4..a717185fd0 100644 --- a/test/hello.py +++ b/test/hello.py @@ -7,7 +7,6 @@ def test(helper): helper.wait_output("--- Chrome EC initialized! ---") - helper.wait_prompt() helper.ec_command("version") ro = helper.wait_output("RO version:\s*(?P<ro>\S+)", use_re=True)["ro"] wa = helper.wait_output("RW-A version:\s*(?P<a>\S+)", use_re=True)["a"] diff --git a/test/hello.tasklist b/test/hello.tasklist index 923f91989e..7f07c8a959 100644 --- a/test/hello.tasklist +++ b/test/hello.tasklist @@ -14,9 +14,6 @@ * 'd' in an opaque parameter passed to the routine at startup */ #define CONFIG_TASK_LIST \ - TASK(BLINK, UserLedBlink, NULL) \ - TASK(GPIOISR, gpio_task, NULL) \ - TASK(KEYSCAN, keyboard_scan_task, NULL) \ + TASK(WATCHDOG, watchdog_task, NULL) \ TASK(CONSOLE, console_task, NULL) \ - TASK(HOSTCMD, host_command_task, NULL) \ - TASK(I8042CMD, i8042_command_task, NULL) + TASK(HOSTCMD, host_command_task, NULL) diff --git a/test/pingpong.tasklist b/test/pingpong.tasklist index 6a5f528a1c..dd95534238 100644 --- a/test/pingpong.tasklist +++ b/test/pingpong.tasklist @@ -5,13 +5,9 @@ * The first one has the lowest priority. */ #define CONFIG_TASK_LIST \ - TASK(BLINK, UserLedBlink, NULL) \ - TASK(KEYSCAN, keyboard_scan_task, NULL) \ - TASK(GPIOISR, gpio_task, NULL) \ + TASK(WATCHDOG, watchdog_task, NULL) \ TASK(CONSOLE, console_task, NULL) \ TASK(TESTA, TaskAbc, (void *)'A') \ TASK(TESTB, TaskAbc, (void *)'B') \ TASK(TESTC, TaskAbc, (void *)'C') \ - TASK(TESTT, TaskTick, (void *)'T')\ - TASK(HOSTCMD, host_command_task, NULL) \ - TASK(I8042CMD, i8042_command_task, NULL) + TASK(TESTT, TaskTick, (void *)'T') diff --git a/test/powerdemo.tasklist b/test/powerdemo.tasklist index 60c77a8285..e0f7466954 100644 --- a/test/powerdemo.tasklist +++ b/test/powerdemo.tasklist @@ -1,6 +1,4 @@ #define CONFIG_TASK_LIST \ TASK(CONSOLE, console_task, NULL) \ - TASK(HOSTCMD, host_command_task, NULL) \ - TASK(I8042CMD, i8042_command_task, NULL) \ TASK(POWERDEMO, power_demo_task, NULL) diff --git a/test/timer_calib.tasklist b/test/timer_calib.tasklist index ca184fb22c..eee74b4df7 100644 --- a/test/timer_calib.tasklist +++ b/test/timer_calib.tasklist @@ -5,10 +5,6 @@ * The first one has the lowest priority. */ #define CONFIG_TASK_LIST \ - TASK(BLINK, UserLedBlink, NULL) \ - TASK(KEYSCAN, keyboard_scan_task, NULL) \ - TASK(GPIOISR, gpio_task, NULL) \ + TASK(WATCHDOG, watchdog_task, NULL) \ TASK(TESTTMR, timer_calib_task, (void *)'T')\ - TASK(CONSOLE, console_task, NULL) \ - TASK(HOSTCMD, host_command_task, NULL) \ - TASK(I8042CMD, i8042_command_task, NULL) + TASK(CONSOLE, console_task, NULL) diff --git a/test/timer_dos.tasklist b/test/timer_dos.tasklist index 8212088351..7fced26663 100644 --- a/test/timer_dos.tasklist +++ b/test/timer_dos.tasklist @@ -5,13 +5,9 @@ * The first one has the lowest priority. */ #define CONFIG_TASK_LIST \ - TASK(BLINK, UserLedBlink, NULL) \ - TASK(KEYSCAN, keyboard_scan_task, NULL) \ - TASK(GPIOISR, gpio_task, NULL) \ + TASK(WATCHDOG, watchdog_task, NULL) \ TASK(CONSOLE, console_task, NULL) \ TASK(TMRA, TaskTimer, (void *)1234) \ TASK(TMRB, TaskTimer, (void *)5678) \ TASK(TMRC, TaskTimer, (void *)8462) \ - TASK(TMRD, TaskTimer, (void *)3719) \ - TASK(HOSTCMD, host_command_task, NULL)\ - TASK(I8042CMD, i8042_command_task, NULL) + TASK(TMRD, TaskTimer, (void *)3719) |