From f1f4e43159253b8acacee4eb19e2465b67e709d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Tue, 7 Jan 2020 11:48:08 +0100 Subject: [PATCH] [ion/console] Default ion sources have console_stdio, not _display --- build/targets.mak | 2 +- ion/Makefile | 3 ++- ion/src/device/shared/drivers/Makefile | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build/targets.mak b/build/targets.mak index 3d7dbb3c1..b821b4448 100644 --- a/build/targets.mak +++ b/build/targets.mak @@ -13,7 +13,7 @@ $(BUILD_DIR)/epsilon.onboarding.beta.$(EXE): $(call object_for,$(epsilon_onboard test_base_src = $(base_src) $(apps_tests_src) $(runner_src) $(tests_src) -test_runner_src = $(test_base_src) $(ion_default_src) +test_runner_src = $(test_base_src) $(ion_console_on_screen_src) $(BUILD_DIR)/test.$(EXE): $(call object_for,$(test_runner_src)) # Define handy targets diff --git a/ion/Makefile b/ion/Makefile index d8a135bea..7dc08544e 100644 --- a/ion/Makefile +++ b/ion/Makefile @@ -56,6 +56,7 @@ ion_all_src += $(ion_simulator_sdl_src) $(ion_simulator_headless_src) ion_all_src += $(ion_device_dfu_relocated_src) $(ion_device_dfu_xip_src) ion_all_src += $(ion_console_display_src) $(ion_console_stdio_src) $(ion_console_uart_src) -ion_default_src = $(ion_src) $(ion_simulator_sdl_src) $(ion_device_dfu_relocated_src) $(ion_console_display_src) +ion_default_src = $(ion_src) $(ion_simulator_sdl_src) $(ion_device_dfu_relocated_src) $(ion_console_stdio_src) +ion_console_on_screen_src = $(ion_src) $(ion_simulator_sdl_src) $(ion_device_dfu_relocated_src) $(ion_console_display_src) ion_xip_src = $(ion_src) $(ion_simulator_sdl_src) $(ion_device_dfu_xip_src) $(ion_console_uart_src) ion_headless_src = $(ion_src) $(ion_simulator_headless_src) $(ion_device_dfu_relocated_src) $(ion_console_stdio_src) diff --git a/ion/src/device/shared/drivers/Makefile b/ion/src/device/shared/drivers/Makefile index 2b3b71efb..ea02cce02 100644 --- a/ion/src/device/shared/drivers/Makefile +++ b/ion/src/device/shared/drivers/Makefile @@ -23,4 +23,5 @@ ion_device_src += $(addprefix ion/src/device/shared/drivers/, \ ) ion_console_uart_src = ion/src/device/shared/drivers/console.cpp +ion_console_stdio_src += ion/src/device/shared/drivers/console_dummy.cpp ion_console_display_src += ion/src/device/shared/drivers/console_dummy.cpp