Merge branch 'master' of git+ssh://openadk.org/git/openadk

24 files changed, 119 insertions, 90 deletions

diff --git a/target/arm/Makefile b/target/arm/Makefile
index 9ba6366e3..391afe6e4 100644
--- a/target/arm/Makefile
+++ b/target/arm/Makefile
@@ -28,6 +28,9 @@ endif
 ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9),y)
 QEMU_ARGS+=-M vexpress-a9 -cpu cortex-a9 -net user -net nic,model=lan9118
 endif
+ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_STELLARIS_M3),y)
+QEMU_ARGS+=-M lm3s6965evb -cpu cortex-m3
+endif
 ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y)
 QEMU_ARGS+=-drive file=qemu-${ADK_TARGET_CPU_ARCH}.img,if=virtio,index=0 -net nic,model=virtio -net user
 endif
diff --git a/target/arm/kernel/raspberry-pi b/target/arm/kernel/raspberry-pi
index 146fd3655..a748b42e8 100644
--- a/target/arm/kernel/raspberry-pi
+++ b/target/arm/kernel/raspberry-pi
@@ -3,12 +3,12 @@ CONFIG_FIQ=y
 CONFIG_ARM_PATCH_PHYS_VIRT=y
 CONFIG_KUSER_HELPERS=y
 CONFIG_ARCH_MULTI_V6=y
+CONFIG_VFP=y
 CONFIG_ARCH_BCM2708=y
+CONFIG_ARCH_BCM2835=y
 CONFIG_MACH_BCM2708=y
-CONFIG_BCM2708_GPIO=y
 CONFIG_BCM2708_VCMEM=y
 CONFIG_BCM2708_DMAER=y
-CONFIG_VFP=y
 CONFIG_BCM2708_VCHIQ=y
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
diff --git a/target/collections/console b/target/collections/console
index 566ba8aac..a353e01c6 100644
--- a/target/collections/console
+++ b/target/collections/console
@@ -1,5 +1,5 @@
 config ADK_PKG_CONSOLE
-	boolean "Choose packages for a desktop system without X"
+	boolean "desktop system without X"
 	default n
 	select ADK_PACKAGE_ALSA_UTILS
 	select ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER
diff --git a/target/collections/development b/target/collections/development
index 74909c341..2e11894a8 100644
--- a/target/collections/development
+++ b/target/collections/development
@@ -1,5 +1,5 @@
 config ADK_PKG_DEVELOPMENT
-	bool "Compile a ADK development system"
+	bool "development system"
 	default n
 	select ADK_PACKAGE_BASH
 	select ADK_PACKAGE_BINUTILS
diff --git a/target/collections/kodibox b/target/collections/kodibox
index 3c299109f..bd85533f5 100644
--- a/target/collections/kodibox
+++ b/target/collections/kodibox
@@ -1,5 +1,5 @@
 config ADK_PKG_KODIBOX
-	bool "Choose packages for KODIBox system"
+	bool "KODI (formely XBMC) multimedia system"
 	default n
 	select BUSYBOX_NTPD
 	select ADK_PACKAGE_GLIBC
diff --git a/target/collections/mpd b/target/collections/mpd
index 456386e8b..0f6c25780 100644
--- a/target/collections/mpd
+++ b/target/collections/mpd
@@ -1,5 +1,5 @@
 config ADK_PKG_MPD
-	bool "Choose packages for MPD system (basic)"
+	bool "MPD system (basic)"
 	default n
 	select BUSYBOX_NTPD
 	select ADK_PACKAGE_CIFS_UTILS
diff --git a/target/collections/mpdbox b/target/collections/mpdbox
index 32bb23794..a1987694c 100644
--- a/target/collections/mpdbox
+++ b/target/collections/mpdbox
@@ -1,5 +1,5 @@
 config ADK_PKG_MPDBOX
-	bool "Choose packages for MPD system with WebGUI"
+	bool "MPD system with WebGUI"
 	default n
 	select ADK_PKG_MPD
 	select ADK_PACKAGE_MPDBOX
diff --git a/target/collections/test b/target/collections/test
index edb8426d2..4a612b931 100644
--- a/target/collections/test
+++ b/target/collections/test
@@ -1,5 +1,5 @@
 config ADK_PKG_TEST
-	bool "Compile a ADK test framework system"
+	bool "test framework system"
 	select ADK_PACKAGE_ADKTEST
 	select ADK_PACKAGE_RDATE
 	select ADK_RUNTIME_START_SERVICES
diff --git a/target/collections/xorg b/target/collections/xorg
index 75ee6bb18..d48b06f53 100644
--- a/target/collections/xorg
+++ b/target/collections/xorg
@@ -1,5 +1,5 @@
 config ADK_PKG_XORG
-	bool "Choose packages for graphical desktop system with Xorg"
+	bool "graphical desktop system with Xorg"
 	default n
 	select ADK_PKG_CONSOLE
 	select ADK_PACKAGE_RXVT_UNICODE
diff --git a/target/collections/ympd b/target/collections/ympd
index b09591400..a5ccad930 100644
--- a/target/collections/ympd
+++ b/target/collections/ympd
@@ -1,5 +1,5 @@
 config ADK_PKG_YMPD
-	bool "Choose packages for MPD system with Ympd"
+	bool "MPD system with Ympd"
 	default n
 	select ADK_PKG_MPD
 	select ADK_PACKAGE_YMPD
diff --git a/target/config/Config.in.arm.choice b/target/config/Config.in.arm.choice
index d732b5f7a..eaae2fe5e 100644
--- a/target/config/Config.in.arm.choice
+++ b/target/config/Config.in.arm.choice
@@ -2,21 +2,26 @@
 # material, please see the LICENCE file in the top-level directory.
 
 choice ADK_TARGET_ARM_CPU_ARCH
-prompt "CPU architecture"
+prompt "CPU architecture and family"
 depends on ADK_TARGET_TOOLCHAIN && ADK_LINUX_ARM
-default ADK_CPU_ARMV7A
 
-config ADK_CPU_ARMV5TE
-        boolean "armv5te"
-        select ADK_armv5te
+config ADK_CPU_ARMV7A_CORTEX_A9
+        boolean "cortex-a9 (armv7-a)"
+        select ADK_CPU_CORTEX_A9
 
-config ADK_CPU_ARMV6
-        boolean "armv6"
-        select ADK_armv6
+config ADK_CPU_ARMV7M_CORTEX_M3
+        boolean "cortex-m3 (armv7-m)"
+        select ADK_CPU_CORTEX_M3
+	select ADK_LINUX_ARM_WITH_THUMB
+	select ADK_TARGET_UCLINUX
 
-config ADK_CPU_ARMV7A
-        boolean "armv7-a"
-        select ADK_armv7a
+config ADK_CPU_ARMV6_ARM1176JZF_S
+        boolean "arm1176jzf-s (armv6)"
+        select ADK_CPU_ARM1176JZF_S
+
+config ADK_CPU_ARMV5TE_ARM926EJ_S
+        boolean "arm926ej-s (armv5te)"
+        select ADK_CPU_ARM926EJ_S
 
 endchoice
 
diff --git a/target/config/Config.in.arm.default b/target/config/Config.in.arm.default
index 50a05b674..3e6dac47b 100644
--- a/target/config/Config.in.arm.default
+++ b/target/config/Config.in.arm.default
@@ -1,21 +1,6 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-config ADK_armv5te
-	boolean
-
-config ADK_armv6
-	boolean
-
-config ADK_armv7a
-	boolean
-
-config ADK_TARGET_ARM_CPU
-	string
-	default "armv5te" if ADK_armv5te
-	default "armv6" if ADK_armv6
-	default "armv7-a" if ADK_armv7a
-
 config ADK_soft_float
 	boolean
 
diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu
index b8fb302cb..afb99ebc9 100644
--- a/target/config/Config.in.cpu
+++ b/target/config/Config.in.cpu
@@ -113,6 +113,9 @@ config ADK_CPU_ARM926EJ_S
 config ADK_CPU_ARM1176JZF_S
 	boolean
 
+config ADK_CPU_CORTEX_M3
+	boolean
+
 config ADK_CPU_CORTEX_A9
 	boolean
 
diff --git a/target/config/Config.in.libc.choice b/target/config/Config.in.libc.choice
index 9f4772876..69296c05c 100644
--- a/target/config/Config.in.libc.choice
+++ b/target/config/Config.in.libc.choice
@@ -104,8 +104,8 @@ config ADK_TARGET_LIB_UCLIBC_0_9_33_2
 	boolean
 	depends on ADK_TARGET_LIB_UCLIBC
 
-config ADK_TARGET_LIB_MUSL_1_1_4
-	prompt "1.1.4"
+config ADK_TARGET_LIB_MUSL_1_1_5
+	prompt "1.1.5"
 	boolean
 	depends on ADK_TARGET_LIB_MUSL
 
diff --git a/target/config/Config.in.libc.default b/target/config/Config.in.libc.default
index 5f46ea41a..ba4d93294 100644
--- a/target/config/Config.in.libc.default
+++ b/target/config/Config.in.libc.default
@@ -22,7 +22,7 @@ config ADK_TARGET_LIBC
 
 config ADK_LIBC_VERSION
 	string
-	default "1.1.4" if ADK_TARGET_LIB_MUSL_1_1_4
+	default "1.1.5" if ADK_TARGET_LIB_MUSL_1_1_5
 	default "0.9.33.2" if ADK_TARGET_LIB_UCLIBC_0_9_33_2
 	default "2.20" if ADK_TARGET_LIB_GLIBC_2_20
 	default "git" if ADK_TARGET_LIB_UCLIBC_NG_GIT || \
diff --git a/target/config/Config.in.qemu b/target/config/Config.in.qemu
index 04bd97c67..4f1ec85a4 100644
--- a/target/config/Config.in.qemu
+++ b/target/config/Config.in.qemu
@@ -32,15 +32,15 @@ choice
 prompt "Qemu XTENSA Emulation"
 depends on ADK_TARGET_SYSTEM_QEMU_XTENSA
 
-config ADK_TARGET_QEMU_XTENSA_DC232B
-	boolean "dc232b"
-	select ADK_KERNEL_XTENSA_VARIANT_DC232B
-
 config ADK_TARGET_QEMU_XTENSA_DC233C
 	boolean "dc233c"
 	select ADK_KERNEL_XTENSA_VARIANT_DC233C
 	select ADK_KERNEL_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX
 
+config ADK_TARGET_QEMU_XTENSA_DC232B
+	boolean "dc232b"
+	select ADK_KERNEL_XTENSA_VARIANT_DC232B
+
 endchoice
 
 config ADK_TARGET_XTENSA
@@ -56,6 +56,14 @@ config ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9
 	boolean "ARM Ltd. Versatile Express for Cortex-A9"
 	select ADK_CPU_CORTEX_A9
 
+config ADK_TARGET_QEMU_ARM_MODEL_STELLARIS_M3
+	boolean "Stellaris LM3S6965EVB"
+	select ADK_soft_float
+	select ADK_eabi
+	select ADK_CPU_CORTEX_M3
+	select ADK_LINUX_ARM_WITH_THUMB
+	depends on ADK_TARGET_ARM_SOFT_FLOAT
+
 config ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB
 	boolean "ARM Ltd. Versatile/PB"
 	select ADK_soft_float
diff --git a/target/config/Config.in.target b/target/config/Config.in.target
index 0415e0ce5..623874606 100644
--- a/target/config/Config.in.target
+++ b/target/config/Config.in.target
@@ -22,7 +22,7 @@ config ADK_TARGET_CFLAGS
 	default "-march=atom" if ADK_CPU_ATOM
 	default "-march=amdfam10" if ADK_CPU_AMDFAM10
 	default "-mcpu=v8" if ADK_CPU_SPARC_V8
-	default "-m64 -mcpu=ultrasparc" if ADK_CPU_SPARC_V9
+	default "-mcpu=ultrasparc -m64" if ADK_CPU_SPARC_V9
 	default "-march=loongson2f -Wa,-mfix-loongson2f-nop" if ADK_CPU_LOONGSON2F
 	default "-march=mips32" if ADK_CPU_MIPS32
 	default "-march=mips64" if ADK_CPU_MIPS64
@@ -32,8 +32,9 @@ config ADK_TARGET_CFLAGS
 	default "-march=armv5te -mtune=arm926ej-s -mfloat-abi=hard" if ADK_CPU_ARM926EJ_S && ADK_hard_float
 	default "-march=armv6 -mtune=arm1176jzf-s -mfloat-abi=soft" if ADK_CPU_ARM1176JZF_S && ADK_soft_float
 	default "-march=armv6 -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard" if ADK_CPU_ARM1176JZF_S && ADK_hard_float
-	default "-march=armv7-a -mtune=cortex-a9 -mfloat-abi=soft" if ADK_CPU_CORTEX_A9 && ADK_soft_float
-	default "-march=armv7-a -mtune=cortex-a9 -mfpu=neon -mfloat-abi=hard" if ADK_CPU_CORTEX_A9 && ADK_hard_float
+	default "-mcpu=cortex-m3 -mfloat-abi=soft" if ADK_CPU_CORTEX_M3 && ADK_soft_float
+	default "-mcpu=cortex-a9 -mfloat-abi=soft" if ADK_CPU_CORTEX_A9 && ADK_soft_float
+	default "-mcpu=cortex-a9 -mfpu=neon -mfloat-abi=hard" if ADK_CPU_CORTEX_A9 && ADK_hard_float
 	default "-march=armv5te" if ADK_CPU_ARMV5TE
 	default "-march=armv6" if ADK_CPU_ARMV6
 	default "-march=armv7-a" if ADK_CPU_ARMV7A
diff --git a/target/config/Config.in.toolchain b/target/config/Config.in.toolchain
index 16c075212..a5c91f0f7 100644
--- a/target/config/Config.in.toolchain
+++ b/target/config/Config.in.toolchain
@@ -130,11 +130,12 @@ config ADK_TARGET_CFLAGS_OPT_O0
 endchoice
 
 config ADK_LINUX_ARM_WITH_THUMB
-	prompt "Use THUMB2 ARM mode"
+	prompt "Use THUMB2 only mode"
 	boolean
-	depends on ADK_CPU_CORTEX_A9 && ADK_TARGET_LIB_GLIBC
 	select ADK_KERNEL_THUMB2_KERNEL
 	default n
+	help
+	  Experimental option. Use with care.
 
 config ADK_TOOLCHAIN_WITH_SSP
 	boolean
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio
index 594274c40..7ff42afe9 100644
--- a/target/linux/config/Config.in.audio
+++ b/target/linux/config/Config.in.audio
@@ -74,15 +74,25 @@ config ADK_KERNEL_SND_SOC_I2C_AND_SPI
 	boolean
 
 config ADK_KERNEL_SND_SOC_WM8804
-	boolean
+	tristate
 	select ADK_KERNEL_SND_SOC_I2C_AND_SPI
 
 config ADK_KERNEL_SND_SOC_PCM5102A
-	boolean
+	tristate
+	select ADK_KERNEL_SND_SOC_I2C_AND_SPI
+
+config ADK_KERNEL_SND_SOC_PCM512x
+	tristate
 	select ADK_KERNEL_SND_SOC_I2C_AND_SPI
 
 config ADK_KERNEL_SND_SOC_PCM512x_I2C
-	boolean
+	tristate
+	select ADK_KERNEL_SND_SOC_PCM512x
+	select ADK_KERNEL_SND_SOC_I2C_AND_SPI
+
+config ADK_KERNEL_SND_SOC_PCM512x_SPI
+	tristate
+	select ADK_KERNEL_SND_SOC_PCM512x
 	select ADK_KERNEL_SND_SOC_I2C_AND_SPI
 
 config ADK_KERNEL_SND_PCM_DMAENGINE
@@ -161,11 +171,13 @@ config ADK_KERNEL_SND_BCM2835
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
-config ADK_KERNEL_SND_BCM2835_SOC_I2S
-	boolean
+config ADK_KERNEL_SND_BCM2708_SOC_I2S
+	tristate
 	select ADK_KERNEL_SND
 	select ADK_KERNEL_SND_ARM
 	select ADK_KERNEL_SND_SOC
+	select ADK_KERNEL_SND_BCM2835
+	select ADK_KERNEL_DMA_BCM2835
 	select ADK_KERNEL_SND_DMAENGINE_PCM
 	select ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM
 	select ADK_KERNEL_REGMAP_MMIO
@@ -174,35 +186,31 @@ config ADK_KERNEL_SND_BCM2835_SOC_I2S
 
 config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DAC
 	prompt "Raspberry PI hifiberry DAC"
-	boolean
-	select ADK_KERNEL_DMA_BCM2708
-	select ADK_KERNEL_SND_BCM2835_SOC_I2S
+	tristate
+	select ADK_KERNEL_SND_BCM2708_SOC_I2S
 	select ADK_KERNEL_SND_SOC_PCM5102A
 	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
 config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DIGI
 	prompt "Raspberry PI hifiberry DIGI"
-	boolean
-	select ADK_KERNEL_DMA_BCM2708
-	select ADK_KERNEL_SND_BCM2835_SOC_I2S
+	tristate
+	select ADK_KERNEL_SND_BCM2708_SOC_I2S
 	select ADK_KERNEL_SND_SOC_WM8804
 	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
 config ADK_KERNEL_SND_BCM2708_SOC_RPI_DAC
 	prompt "Raspberry PI RPI-DAC"
-	boolean
-	select ADK_KERNEL_DMA_BCM2708
-	select ADK_KERNEL_SND_BCM2835_SOC_I2S
+	tristate
+	select ADK_KERNEL_SND_BCM2708_SOC_I2S
 	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
 config ADK_KERNEL_SND_BCM2708_SOC_IQAUDIO_DAC
 	prompt "Raspberry PI IQAudio-DAC"
-	boolean
-	select ADK_KERNEL_DMA_BCM2708
-	select ADK_KERNEL_SND_BCM2835_SOC_I2S
+	tristate
+	select ADK_KERNEL_SND_BCM2708_SOC_I2S
 	select ADK_KERNEL_SND_SOC_PCM512x_I2C
 	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
diff --git a/target/linux/config/Config.in.dma b/target/linux/config/Config.in.dma
index 9ea4a2e12..ce5a86f1e 100644
--- a/target/linux/config/Config.in.dma
+++ b/target/linux/config/Config.in.dma
@@ -4,6 +4,9 @@ config ADK_KERNEL_DMADEVICES
 config ADK_KERNEL_DMA_BCM2708
         boolean
         select ADK_KERNEL_DMADEVICES
+	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
+	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
+	default n
 
 config ADK_KERNEL_IMX_SDMA
 	boolean
diff --git a/target/linux/config/Config.in.gpio b/target/linux/config/Config.in.gpio
index 678b04674..64b4c46ab 100644
--- a/target/linux/config/Config.in.gpio
+++ b/target/linux/config/Config.in.gpio
@@ -13,6 +13,16 @@ config ADK_KERNEL_GPIO_SYSFS
 config ADK_KERNEL_GPIO_GENERIC
 	boolean
 
+config ADK_KERNEL_BCM2708_GPIO
+	boolean
+	select ADK_KERNEL_GPIOLIB
+	select ADK_KERNEL_GPIO_SYSFS
+	select ADK_KERNEL_GPIO_GENERIC
+	select ADK_KERNEL_RESET_CONTROLLER
+	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
+	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
+	default n
+
 config ADK_KERNEL_GPIO_MXC
 	boolean
 	select ADK_KERNEL_GPIOLIB
@@ -20,5 +30,6 @@ config ADK_KERNEL_GPIO_MXC
 	select ADK_KERNEL_GPIO_GENERIC
 	select ADK_KERNEL_RESET_CONTROLLER
 	select ADK_KERNEL_RESET_GPIO
+	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc
index 6823ee612..931bda8a8 100644
--- a/target/linux/config/Config.in.misc
+++ b/target/linux/config/Config.in.misc
@@ -31,6 +31,7 @@ source "target/linux/config/Config.in.leds"
 source "target/linux/config/Config.in.watchdog"
 source "target/linux/config/Config.in.i2c"
 source "target/linux/config/Config.in.spi"
+source "target/linux/config/Config.in.regmap"
 source "target/linux/config/Config.in.regulator"
 source "target/linux/config/Config.in.gpio"
 source "target/linux/config/Config.in.dma"
diff --git a/target/linux/config/Config.in.regmap b/target/linux/config/Config.in.regmap
new file mode 100644
index 000000000..44a8bcca0
--- /dev/null
+++ b/target/linux/config/Config.in.regmap
@@ -0,0 +1,25 @@
+config ADK_KERNEL_REGMAP
+	boolean
+	select ADK_KERNEL_LZO_COMPRESS
+	select ADK_KERNEL_LZO_DECOMPRESS
+	default n
+
+config ADK_KERNEL_REGMAP_I2C
+	boolean
+	select ADK_KERNEL_REGMAP
+	default n
+
+config ADK_KERNEL_REGMAP_SPI
+	boolean
+	select ADK_KERNEL_REGMAP
+	default n
+
+config ADK_KERNEL_REGMAP_MMIO
+	boolean
+	select ADK_KERNEL_REGMAP
+	default n
+
+config ADK_KERNEL_REGMAP_IRQ
+	boolean
+	select ADK_KERNEL_REGMAP
+	default n
diff --git a/target/linux/config/Config.in.regulator b/target/linux/config/Config.in.regulator
index 6e8f8dfd1..a6a6c90a7 100644
--- a/target/linux/config/Config.in.regulator
+++ b/target/linux/config/Config.in.regulator
@@ -37,28 +37,3 @@ config ADK_KERNEL_REGULATOR_PFUZE100
 	select ADK_KERNEL_REGULATOR
 	default n
 
-config ADK_KERNEL_REGMAP
-	boolean
-	select ADK_KERNEL_LZO_COMPRESS
-	select ADK_KERNEL_LZO_DECOMPRESS
-	default n
-
-config ADK_KERNEL_REGMAP_I2C
-	boolean
-	select ADK_KERNEL_REGMAP
-	default n
-
-config ADK_KERNEL_REGMAP_SPI
-	boolean
-	select ADK_KERNEL_REGMAP
-	default n
-
-config ADK_KERNEL_REGMAP_MMIO
-	boolean
-	select ADK_KERNEL_REGMAP
-	default n
-
-config ADK_KERNEL_REGMAP_IRQ
-	boolean
-	select ADK_KERNEL_REGMAP
-	default n