Merge pull request #9984 from kaspar030/refactor_atmega_libc

cpu/atmega_common: refactor AVR libc code into module
RIOT-OS · Jan 22, 2019 · 0edf76d · 0edf76d
2 parents e22e582 + 7313525
commit 0edf76d
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 2 deletions.
diff --git a/boards/common/atmega/board.c b/boards/common/atmega/board.c
@@ -31,8 +31,13 @@ void led_init(void);
 
 void board_init(void)
 {
+
     atmega_set_prescaler(CPU_ATMEGA_CLK_SCALE_INIT);
+
+#ifdef MODULE_AVR_LIBC_EXTRA
     atmega_stdio_init();
+#endif
+
     cpu_init();
     led_init();
     irq_enable();

diff --git a/boards/waspmote-pro/board.c b/boards/waspmote-pro/board.c
@@ -58,7 +58,10 @@ void board_init(void)
 #endif
 #endif
 
+#ifdef MODULE_AVR_LIBC_EXTRA
     atmega_stdio_init();
+#endif
+
     cpu_init();
     led_init();
     irq_enable();

diff --git a/cpu/atmega_common/Makefile b/cpu/atmega_common/Makefile
@@ -2,6 +2,6 @@
 MODULE = atmega_common
 
 # add a list of subdirectories, that should also be build
-DIRS = periph
+DIRS = periph avr_libc_extra
 
 include $(RIOTBASE)/Makefile.base
diff --git a/cpu/atmega_common/Makefile.include b/cpu/atmega_common/Makefile.include
@@ -18,7 +18,9 @@ export USEMODULE += periph_common
 export USEMODULE += stdio_uart
 
 # include module specific includes
-export INCLUDES += -I$(RIOTCPU)/atmega_common/include -isystem$(RIOTCPU)/atmega_common/include/vendor
+export INCLUDES += -I$(RIOTCPU)/atmega_common/include \
+                   -isystem$(RIOTCPU)/atmega_common/avr_libc_extra/include \
+                   -isystem$(RIOTCPU)/atmega_common/avr_libc_extra/include/vendor
 
 ifeq ($(LTO),1)
   # avr-gcc <4.8.3 has a bug when using LTO which causes a warning to be printed always:
@@ -37,3 +39,6 @@ LINKFLAGS += $(LINKFLAGPREFIX)--defsym=__DATA_REGION_LENGTH__=$(RAM_LEN)
 LDSCRIPT_COMPAT = $(if $(shell $(TARGET_ARCH)-ld --verbose | grep __TEXT_REGION_LENGTH__),,\
                     -T$(RIOTCPU)/$(CPU)/ldscripts_compat/avr_2.26.ld)
 LINKFLAGS += $(LDSCRIPT_COMPAT)
+
+# avr libc needs some RIOT-specific support code
+USEMODULE += avr_libc_extra
diff --git a/cpu/atmega_common/avr_libc_extra/Makefile b/cpu/atmega_common/avr_libc_extra/Makefile
@@ -0,0 +1 @@
+include $(RIOTBASE)/Makefile.base
diff --git a/cpu/atmega_common/atmega_stdio.c → ...mega_common/avr_libc_extra/atmega_stdio.c b/cpu/atmega_common/atmega_stdio.c → ...mega_common/avr_libc_extra/atmega_stdio.c
diff --git a/cpu/atmega_common/include/vendor/errno.h → ...ega_common/avr_libc_extra/include/errno.h b/cpu/atmega_common/include/vendor/errno.h → ...ega_common/avr_libc_extra/include/errno.h
diff --git a/cpu/atmega_common/include/vendor/inttypes.h → ..._common/avr_libc_extra/include/inttypes.h b/cpu/atmega_common/include/vendor/inttypes.h → ..._common/avr_libc_extra/include/inttypes.h
diff --git a/cpu/atmega_common/include/sys/time.h → ..._common/avr_libc_extra/include/sys/time.h b/cpu/atmega_common/include/sys/time.h → ..._common/avr_libc_extra/include/sys/time.h
diff --git a/cpu/atmega_common/include/sys/types.h → ...common/avr_libc_extra/include/sys/types.h b/cpu/atmega_common/include/sys/types.h → ...common/avr_libc_extra/include/sys/types.h
diff --git a/cpu/atmega_common/include/vendor/unistd.h → ...ga_common/avr_libc_extra/include/unistd.h b/cpu/atmega_common/include/vendor/unistd.h → ...ga_common/avr_libc_extra/include/unistd.h
diff --git a/cpu/atmega_common/include/sys/stat.h → .../avr_libc_extra/include/vendor/sys/stat.h b/cpu/atmega_common/include/sys/stat.h → .../avr_libc_extra/include/vendor/sys/stat.h
diff --git a/cpu/atmega_common/include/vendor/time.h → ...mmon/avr_libc_extra/include/vendor/time.h b/cpu/atmega_common/include/vendor/time.h → ...mmon/avr_libc_extra/include/vendor/time.h
diff --git a/cpu/atmega_common/posix_unistd.c → ...mega_common/avr_libc_extra/posix_unistd.c b/cpu/atmega_common/posix_unistd.c → ...mega_common/avr_libc_extra/posix_unistd.c