Merge pull request #124 from enunes/avr

avr: add support for AVR avr-libc toolchains

6 files changed, 87 insertions, 0 deletions

diff --git a/config/arch/avr.in b/config/arch/avr.in
new file mode 100644
index 00000000..cf8e9af7
--- /dev/null
+++ b/config/arch/avr.in
@@ -0,0 +1,8 @@
+# AVR specific config options
+
+## select ARCH_SUPPORTS_8
+## select ARCH_DEFAULT_8
+## select ARCH_REQUIRES_MULTILIB
+##
+## help The 8-bit AVR architecture, as defined by:
+## help     http://www.atmel.com/products/microcontrollers/avr
diff --git a/config/kernel/linux.in b/config/kernel/linux.in
index bdd0bae0..eacc65e9 100644
--- a/config/kernel/linux.in
+++ b/config/kernel/linux.in
@@ -1,5 +1,6 @@
 # Linux kernel options
 
+## depends on ! ARCH_avr
 ## select KERNEL_SUPPORTS_SHARED_LIBS
 ##
 ## help Build a toolchain targeting systems running Linux as a kernel.
diff --git a/config/libc/avr-libc.in b/config/libc/avr-libc.in
new file mode 100644
index 00000000..968ca6be
--- /dev/null
+++ b/config/libc/avr-libc.in
@@ -0,0 +1,51 @@
+# avr-libc options
+
+## depends on ARCH_avr
+## depends on ! LINUX && ! WINDOWS && BARE_METAL
+##
+## select LIBC_SUPPORT_THREADS_NONE
+##
+## help The AVR Libc package provides a subset of the standard C library for
+## help Atmel AVR 8-bit RISC microcontrollers. In addition, the library
+## help provides the basic startup code needed by most applications.
+
+choice
+    bool
+    prompt "avr-libc version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
+
+config LIBC_AVR_LIBC_V_1_8_1
+    bool
+    prompt "1.8.1"
+
+config LIBC_AVR_LIBC_V_1_8_0
+    bool
+    prompt "1.8.0"
+
+config LIBC_AVR_LIBC_CUSTOM
+    bool
+    prompt "Custom avr-libc"
+    depends on EXPERIMENTAL
+
+endchoice
+
+if LIBC_AVR_LIBC_CUSTOM
+
+config LIBC_AVR_LIBC_CUSTOM_LOCATION
+    string
+    prompt "Full path to custom avr-libc source"
+    default ""
+    help
+      Enter the path to the directory (or tarball) of your source for avr-libc,
+      or leave blank to use default CT_CUSTOM_LOCATION_ROOT_DIR/avr-libc
+
+endif # LIBC_AVR_LIBC_CUSTOM
+
+config LIBC_VERSION
+    string
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
+    default "1.8.1" if LIBC_AVR_LIBC_V_1_8_1
+    default "1.8.0" if LIBC_AVR_LIBC_V_1_8_0
+    default "custom" if LIBC_AVR_LIBC_CUSTOM
diff --git a/config/libc/avr-libc.in.2 b/config/libc/avr-libc.in.2
new file mode 100644
index 00000000..89a182fe
--- /dev/null
+++ b/config/libc/avr-libc.in.2
@@ -0,0 +1,8 @@
+# avr-libc second-part options
+
+config LIBC_AVR_LIBC_EXTRA_CONFIG_ARRAY
+    string
+    prompt "Extra config for avr-libc"
+    default ""
+    help
+      Extra flags to pass onto ./configure when configuring the avr-libc.
diff --git a/config/target.in b/config/target.in
index fb5bbc06..31d2dc1b 100644
--- a/config/target.in
+++ b/config/target.in
@@ -8,6 +8,7 @@ config ARCH
 # Pre-declare target optimisation variables
 config ARCH_SUPPORTS_BOTH_MMU
 config ARCH_SUPPORTS_BOTH_ENDIAN
+config ARCH_SUPPORTS_8
 config ARCH_SUPPORTS_32
 config ARCH_SUPPORTS_64
 config ARCH_SUPPORTS_WITH_ARCH
@@ -60,6 +61,10 @@ config ARCH_SUFFIX
 comment "Generic target options"
 
 #--------------------------------------
+config ARCH_REQUIRES_MULTILIB
+    bool
+    select MULTILIB
+
 config MULTILIB
     bool
     prompt "Build a multilib toolchain (READ HELP!!!)"
@@ -133,12 +138,18 @@ config ARCH_ENDIAN
     default "little"    if ARCH_LE
 
 #--------------------------------------
+config ARCH_SUPPORTS_8
+    bool
+
 config ARCH_SUPPORTS_32
     bool
 
 config ARCH_SUPPORTS_64
     bool
 
+config ARCH_DEFAULT_8
+    bool
+
 config ARCH_DEFAULT_32
     bool
 
@@ -147,15 +158,22 @@ config ARCH_DEFAULT_64
 
 config ARCH_BITNESS
     int
+    default "8"     if ARCH_8
     default "32"    if ARCH_32
     default "64"    if ARCH_64
 
 choice
     bool
     prompt "Bitness:"
+    default ARCH_8  if ARCH_DEFAULT_8
     default ARCH_32 if ARCH_DEFAULT_32
     default ARCH_64 if ARCH_DEFAULT_64
 
+config ARCH_8
+    bool
+    prompt "8-bit"
+    depends on ARCH_SUPPORTS_8
+
 config ARCH_32
     bool
     prompt "32-bit"
diff --git a/config/toolchain.in b/config/toolchain.in
index 5048e919..361c6bd0 100644
--- a/config/toolchain.in
+++ b/config/toolchain.in
@@ -99,6 +99,7 @@ comment "Tuple completion and aliasing"
 config TARGET_VENDOR
     string
     prompt "Tuple's vendor string"
+    depends on !LIBC_avr_libc
     default "unknown"
     help
       Vendor part of the target tuple.