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 /common | |
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 'common')
-rw-r--r-- | common/build.mk | 9 | ||||
-rw-r--r-- | common/main.c | 20 |
2 files changed, 8 insertions, 21 deletions
diff --git a/common/build.mk b/common/build.mk index 28d454bf10..1024a8a0ad 100644 --- a/common/build.mk +++ b/common/build.mk @@ -5,6 +5,9 @@ # Common files build # -common-objs=main.o util.o console.o vboot.o x86_power.o pwm_commands.o -common-objs+=flash_commands.o host_command.o port80.o keyboard.o i8042.o -common-objs+=memory_commands.o shared_mem.o temp_sensor_commands.o usb_charge.o +common-y=main.o util.o console.o vboot.o pwm_commands.o +common-y+=flash_commands.o port80.o +common-y+=memory_commands.o shared_mem.o temp_sensor_commands.o usb_charge.o +common-$(CONFIG_TASK_HOSTCMD)+=host_command.o +common-$(CONFIG_TASK_I8042CMD)+=i8042.o keyboard.o +common-$(CONFIG_TASK_X86POWER)+=x86_power.o diff --git a/common/main.c b/common/main.c index 15a2547665..9fa1c0e7d6 100644 --- a/common/main.c +++ b/common/main.c @@ -34,24 +34,6 @@ #include "watchdog.h" #include "usb_charge.h" -/* example task blinking the user LED */ -/* TODO: This also kicks the watchdog, so MUST be present! */ -void UserLedBlink(void) -{ - while (1) { -#ifdef BOARD_bds - gpio_set_level(GPIO_DEBUG_LED, 1); -#endif - usleep(500000); - watchdog_reload(); -#ifdef BOARD_bds - gpio_set_level(GPIO_DEBUG_LED, 0); -#endif - usleep(500000); - watchdog_reload(); - } -} - int main(void) { @@ -75,7 +57,9 @@ int main(void) task_init(); +#ifdef CONFIG_TASK_WATCHDOG watchdog_init(1100); +#endif timer_init(); uart_init(); system_init(); |