diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 926bee501e5..18288e21b8a 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -77,7 +77,7 @@ endchoice
 
 config ARCH
 	string
-	default "c5471"	if ARCH_CHIP_C5471
+	default "c5471"		if ARCH_CHIP_C5471
 	default "calypso"	if ARCH_CHIP_CALYPSO
 	default "dm320"		if ARCH_CHIP_DM320
 	default "imx"		if ARCH_CHIP_IMX
diff --git a/arch/avr/Kconfig b/arch/avr/Kconfig
index ae2bf31307d..c2ded908096 100644
--- a/arch/avr/Kconfig
+++ b/arch/avr/Kconfig
@@ -2,3 +2,80 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
+if ARCH_AVR
+choice
+	prompt "Atmel AVR chip selection"
+	default ARCH_CHIP_AT32UC3B0256
+
+config ARCH_CHIP_ATMEGA128
+	bool "ATMega128"
+	---help---
+		Atmel ATMega128 8-bit AVR.
+
+config ARCH_CHIP_AT90USB646
+	bool "AT90USB646"
+	---help---
+		Atmel AT90USB646 8-bit AVR.
+
+config ARCH_CHIP_AT90USB647
+	bool "AT90USB647"
+	---help---
+		Atmel AT90USB647 8-bit AVR.
+
+config ARCH_CHIP_AT90USB1286
+	bool "AT90USB1286"
+	---help---
+		Atmel AT90USB1286 8-bit AVR.
+
+config ARCH_CHIP_AT90USB1287
+	bool "AT90USB1287"
+	---help---
+		Atmel AT90USB1287 8-bit AVR.
+
+config ARCH_CHIP_AT32UC3B0256
+	bool "AT32UC3B0256"
+	---help---
+		Atmel AT32UC3B0256 32-bit AVR32.
+
+endchoice
+
+config ARCH_FAMILY_AVR
+	bool
+	default y			if ARCH_CHIP_ATMEGA128 || ARCH_CHIP_AT90USB646 || ARCH_CHIP_AT90USB647 || ARCH_CHIP_AT90USB1286 || ARCH_CHIP_AT90USB1287
+
+config ARCH_FAMILY_AVR32
+	bool
+	default y			if ARCH_CHIP_AT32UC3B0256
+
+config ARCH_FAMILY
+	string
+	default "avr"		if ARCH_FAMILY_AVR
+	default "avr32"		if ARCH_FAMILY_AVR32
+
+config ARCH_ATMEGA
+	bool
+	default y			if ARCH_CHIP_ATMEGA128
+
+config ARCH_AT90USB
+	bool
+	default y			if ARCH_CHIP_AT90USB646 || ARCH_CHIP_AT90USB647 || ARCH_CHIP_AT90USB1286 || ARCH_CHIP_AT90USB1287
+
+config ARCH_AT32UC3
+	bool
+	default y			if ARCH_CHIP_AT32UC3B0256
+
+config ARCH
+	string
+	default "atmega"	if ARCH_ATMEGA
+	default "at90usb"	if ARCH_AT90USB
+	default "at32uc3"	if ARCH_AT32UC3
+
+source arch/avr/src/common/Kconfig
+source arch/avr/src/avr/Kconfig
+source arch/avr/src/at90usb/Kconfig
+source arch/avr/src/atmega/Kconfig
+source arch/avr/src/avr32/Kconfig
+source arch/avr/src/at32uc3/Kconfig
+
+endif
diff --git a/arch/avr/src/at32uc3/Kconfig b/arch/avr/src/at32uc3/Kconfig
new file mode 100644
index 00000000000..4c3bd28c660
--- /dev/null
+++ b/arch/avr/src/at32uc3/Kconfig
@@ -0,0 +1,7 @@
+#
+# For a description of the syntax of this configuration file,
+# see misc/tools/kconfig-language.txt.
+#
+
+if ARCH_AT32UC3
+endif
diff --git a/arch/avr/src/at90usb/Kconfig b/arch/avr/src/at90usb/Kconfig
new file mode 100644
index 00000000000..78cd6d059be
--- /dev/null
+++ b/arch/avr/src/at90usb/Kconfig
@@ -0,0 +1,7 @@
+#
+# For a description of the syntax of this configuration file,
+# see misc/tools/kconfig-language.txt.
+#
+
+if ARCH_AT90USB
+endif
diff --git a/arch/avr/src/atmega/Kconfig b/arch/avr/src/atmega/Kconfig
new file mode 100644
index 00000000000..f0004d7fecf
--- /dev/null
+++ b/arch/avr/src/atmega/Kconfig
@@ -0,0 +1,8 @@
+#
+# For a description of the syntax of this configuration file,
+# see misc/tools/kconfig-language.txt.
+#
+
+if ARCH_ATMEGA
+endif
+
diff --git a/arch/avr/src/avr/Kconfig b/arch/avr/src/avr/Kconfig
new file mode 100644
index 00000000000..1b21ce810c1
--- /dev/null
+++ b/arch/avr/src/avr/Kconfig
@@ -0,0 +1,7 @@
+#
+# For a description of the syntax of this configuration file,
+# see misc/tools/kconfig-language.txt.
+#
+
+if ARCH_FAMILY_AVR
+endif
diff --git a/arch/avr/src/avr32/Kconfig b/arch/avr/src/avr32/Kconfig
new file mode 100644
index 00000000000..ca1fcd2bf7e
--- /dev/null
+++ b/arch/avr/src/avr32/Kconfig
@@ -0,0 +1,7 @@
+#
+# For a description of the syntax of this configuration file,
+# see misc/tools/kconfig-language.txt.
+#
+
+if ARCH_FAMILY_AVR32
+endif
diff --git a/arch/avr/src/common/Kconfig b/arch/avr/src/common/Kconfig
new file mode 100644
index 00000000000..7966a39c5a8
--- /dev/null
+++ b/arch/avr/src/common/Kconfig
@@ -0,0 +1,7 @@
+#
+# For a description of the syntax of this configuration file,
+# see misc/tools/kconfig-language.txt.
+#
+
+if ARCH_AVR
+endif
diff --git a/arch/sh/src/m16c/m16c_head.S b/arch/sh/src/m16c/m16c_head.S
index d0ab4376124..4e6b0e2c83f 100644
--- a/arch/sh/src/m16c/m16c_head.S
+++ b/arch/sh/src/m16c/m16c_head.S
@@ -158,7 +158,7 @@ _g_heapbase:
  ************************************************************************************/
 
 /************************************************************************************
- * Name: _start
+ * Name: __start
  *
  * Description:
  *   After reset, program execution starts here.