summaryrefslogtreecommitdiff
path: root/src/arch/lm4f120h5qr-stellaris
diff options
context:
space:
mode:
authorDaniel Friesel <daniel.friesel@uos.de>2021-05-28 15:17:20 +0200
committerDaniel Friesel <daniel.friesel@uos.de>2021-05-28 15:17:20 +0200
commit460ecf074d133cbe026cbddb7cf5fad1180c9831 (patch)
tree2beb0cfa84698dbb723c7c62acec703fad3437da /src/arch/lm4f120h5qr-stellaris
parentcf3ba89c46301bb8c0a1eda470c353801117fc0b (diff)
Set loop/wakeup/ostream either via .config or via app/commandline
Diffstat (limited to 'src/arch/lm4f120h5qr-stellaris')
-rw-r--r--src/arch/lm4f120h5qr-stellaris/arch.cc10
-rw-r--r--src/arch/lm4f120h5qr-stellaris/lm4f_cpp_wrapper.c2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/arch/lm4f120h5qr-stellaris/arch.cc b/src/arch/lm4f120h5qr-stellaris/arch.cc
index c87af2f..e613e42 100644
--- a/src/arch/lm4f120h5qr-stellaris/arch.cc
+++ b/src/arch/lm4f120h5qr-stellaris/arch.cc
@@ -20,16 +20,16 @@ extern "C" {
void Arch::setup(void)
{
arch_clock_init();
-#if defined(WITH_LOOP)
+#if defined(CONFIG_loop)
arch_init_loop();
#endif
}
-#ifdef WITH_WAKEUP
+#ifdef CONFIG_wakeup
extern void wakeup();
#endif
-#if defined(WITH_LOOP)
+#if defined(CONFIG_loop)
extern void loop();
extern volatile char run_loop;
#endif
@@ -56,7 +56,7 @@ void Arch::idle_loop(void)
{
while (1) {
__asm__("wfi");
-#ifdef WITH_LOOP
+#ifdef CONFIG_loop
if (run_loop) {
#ifdef TIMER_S
uptime.tick_s();
@@ -71,7 +71,7 @@ void Arch::idle_loop(void)
void Arch::idle(void)
{
__asm__("wfi");
-#ifdef WITH_WAKEUP
+#ifdef CONFIG_wakeup
wakeup();
#endif
}
diff --git a/src/arch/lm4f120h5qr-stellaris/lm4f_cpp_wrapper.c b/src/arch/lm4f120h5qr-stellaris/lm4f_cpp_wrapper.c
index 62f1c20..877316f 100644
--- a/src/arch/lm4f120h5qr-stellaris/lm4f_cpp_wrapper.c
+++ b/src/arch/lm4f120h5qr-stellaris/lm4f_cpp_wrapper.c
@@ -17,7 +17,7 @@ void arch_clock_init()
rcc_sysclk_config(OSCSRC_MOSC, XTAL_16M, 5);
}
-#ifdef WITH_LOOP
+#ifdef CONFIG_loop
volatile char run_loop = 1;
void arch_init_loop()