17 files changed, 107 insertions, 117 deletions
diff --git a/target/arm/kernel/cubox-i2ultra b/target/arm/kernel/cubox-i
index 47bc235c5..0b56db7d7 100644
--- a/target/arm/kernel/cubox-i2ultra
+++ b/target/arm/kernel/cubox-i
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARM_PATCH_PHYS_VIRT=y
-CONFIG_SMP=y
 CONFIG_ARCH_MULTI_V7=y
 CONFIG_ARCH_MXC=y
 CONFIG_ARCH_MX6=y
diff --git a/target/arm/kernel/cubox-i1 b/target/arm/kernel/cubox-i1
deleted file mode 100644
index 82934afc0..000000000
--- a/target/arm/kernel/cubox-i1
+++ /dev/null
@@ -1,16 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARM_PATCH_PHYS_VIRT=y
-CONFIG_ARCH_MULTI_V7=y
-CONFIG_ARCH_MXC=y
-CONFIG_ARCH_MX6=y
-CONFIG_SOC_IMX6SL=y
-CONFIG_KUSER_HELPERS=y
-CONFIG_AEABI=y
-CONFIG_VFP=y
-CONFIG_VFPv3=y
-CONFIG_NEON=y
-CONFIG_DTC=y
-CONFIG_OF=y
-CONFIG_PCI_IMX6=y
-CONFIG_SERIAL_IMX=y
-CONFIG_SERIAL_IMX_CONSOLE=y
diff --git a/target/arm/kernel/cubox-i2 b/target/arm/kernel/cubox-i2
deleted file mode 100644
index 3a6fecdf5..000000000
--- a/target/arm/kernel/cubox-i2
+++ /dev/null
@@ -1,17 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARM_PATCH_PHYS_VIRT=y
-CONFIG_SMP=y
-CONFIG_ARCH_MULTI_V7=y
-CONFIG_ARCH_MXC=y
-CONFIG_ARCH_MX6=y
-CONFIG_SOC_IMX6SL=y
-CONFIG_KUSER_HELPERS=y
-CONFIG_AEABI=y
-CONFIG_VFP=y
-CONFIG_VFPv3=y
-CONFIG_NEON=y
-CONFIG_DTC=y
-CONFIG_OF=y
-CONFIG_PCI_IMX6=y
-CONFIG_SERIAL_IMX=y
-CONFIG_SERIAL_IMX_CONSOLE=y
diff --git a/target/arm/kernel/cubox-i4pro b/target/arm/kernel/cubox-i4pro
deleted file mode 100644
index 9d99b12a3..000000000
--- a/target/arm/kernel/cubox-i4pro
+++ /dev/null
@@ -1,27 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARM_PATCH_PHYS_VIRT=y
-CONFIG_SMP=y
-CONFIG_HIGHMEM=y
-CONFIG_ARCH_MULTI_V7=y
-CONFIG_ARCH_MXC=y
-CONFIG_ARCH_MX6=y
-CONFIG_SOC_IMX6Q=y
-CONFIG_SOC_IMX6SL=y
-CONFIG_LOCAL_TIMERS=y
-CONFIG_MXC_DEBUG_BOARD=y
-CONFIG_KUSER_HELPERS=y
-CONFIG_AEABI=y
-CONFIG_VFP=y
-CONFIG_VFPv3=y
-CONFIG_NEON=y
-CONFIG_DTC=y
-CONFIG_OF=y
-CONFIG_PCI_IMX6=y
-CONFIG_SERIAL_IMX=y
-CONFIG_SERIAL_IMX_CONSOLE=y
-CONFIG_NET_VENDOR_FREESCALE=y
-CONFIG_FEC=y
-CONFIG_PHYLIB=y
-CONFIG_AT803X_PHY=y
-CONFIG_ATAGS=y
-CONFIG_CMDLINE_FORCE=y
diff --git a/target/arm/sys-available/toolchain-arm b/target/arm/sys-available/toolchain-arm
index b9ba30aa5..876bcd84a 100644
--- a/target/arm/sys-available/toolchain-arm
+++ b/target/arm/sys-available/toolchain-arm
@@ -1,10 +1,9 @@
 config ADK_TARGET_SYSTEM_TOOLCHAIN_ARM
-	bool "Toolchain only (little endian)"
+	bool "Toolchain only (soft float)"
 	select ADK_arm
 	select ADK_toolchain_arm
 	select ADK_little
 	select ADK_soft_float
-	select ADK_fpu_vfp
 	select ADK_eabi
 	select ADK_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TXZ
diff --git a/target/config/Config.in b/target/config/Config.in
index 3d613bb1e..47e0e5861 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -1,8 +1,6 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-source "target/config/Config.in.hardware"
-source "target/config/Config.in.qemu"
 
 config ADK_TARGET_KERNEL_VMLINUZ
 	boolean
@@ -50,12 +48,6 @@ config ADK_fpu_neon
 config ADK_fpu_vfp
 	boolean
 
-config ADK_mode_arm
-	boolean
-
-config ADK_mode_thumb
-	boolean
-
 config ADK_TARGET_FLOAT
 	string
 	default "hard" if ADK_hard_float
@@ -66,13 +58,6 @@ config ADK_TARGET_FPU
 	default "vfp" if ADK_fpu_vfp
 	default "neon" if ADK_fpu_neon
 
-config ADK_TARGET_ARM_MODE
-	depends on ADK_LINUX_ARM
-	string
-	default "arm" if ADK_mode_arm
-	default "thumb" if ADK_mode_thumb
-	default "arm"
-
 config ADK_TARGET_ENDIAN
 	string
 	default "little" if ADK_little
@@ -88,6 +73,8 @@ config ADK_TOOLCHAIN
 
 source "target/config/Config.in.arch"
 source "target/config/Config.in.system"
+source "target/config/Config.in.hardware"
+source "target/config/Config.in.qemu"
 
 config ADK_LINUX_MIPS64
 	boolean
@@ -214,10 +201,7 @@ config ADK_TARGET_KERNEL_MINICONFIG
 	default "qemu-x86_64" if ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_TARGET_SYSTEM_QEMU_X86_64_32 || ADK_TARGET_SYSTEM_QEMU_X86_64_X32
 	default "aranym-m68k" if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default "ibm-x40" if ADK_TARGET_SYSTEM_IBM_X40
-	default "cubox-i4pro" if ADK_TARGET_CUBOX_I4PRO
-	default "cubox-i2ultra" if ADK_TARGET_CUBOX_I2ULTRA
-	default "cubox-i2" if ADK_TARGET_CUBOX_I2
-	default "cubox-i1" if ADK_TARGET_CUBOX_I1
+	default "cubox-i" if ADK_TARGET_SYSTEM_CUBOX_I
 	default "raspberry-pi" if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default "sharp-zaurus" if ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	default "lemote-yeelong" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
@@ -242,7 +226,7 @@ config ADK_TARGET_CUBOX_I1
 endchoice
 
 # global symbols
-config ADK_TARGET_KERNEL_MAY_64BIT
+config ADK_TARGET_KERNEL_64
 	boolean
 
 config ADK_TOOLCHAIN_ONLY
@@ -483,8 +467,6 @@ config ADK_TARGET_LIBC
 	default "glibc"  if ADK_glibc
 	default "musl"  if ADK_musl
 
-source "target/linux/config/Config.in.kernel"
-
 choice 
 prompt "Target C library"
 depends on !ADK_CHOOSE_TARGET_SYSTEM && !ADK_CHOOSE_TARGET_ARCH
@@ -606,8 +588,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK
 		ADK_LINUX_PPC || \
 		ADK_LINUX_SPARC || \
 		ADK_LINUX_X86 || \
-		ADK_LINUX_X86_64 || \
-		ADK_LINUX_NATIVE
+		ADK_LINUX_X86_64
 	depends on !ADK_HARDWARE_VBOX
 	select ADK_KERNEL_EXT2_FS
 	help
diff --git a/target/linux/Config.in b/target/linux/Config.in
index 778f4aa7c..03c4f079e 100644
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -1,3 +1,4 @@
+source target/linux/config/Config.in.kernel
 source target/linux/config/Config.in.cpu
 source target/linux/config/Config.in.block
 source target/linux/config/Config.in.flash
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio
index d228feb96..b618c59b7 100644
--- a/target/linux/config/Config.in.audio
+++ b/target/linux/config/Config.in.audio
@@ -10,6 +10,18 @@ config ADK_KERNEL_SND_PCI
 config ADK_KERNEL_SND_USB
 	boolean
 
+config ADK_KERNEL_SND_SOC_IMX_PCM_DMA
+	boolean
+
+config ADK_KERNEL_SND_SOC_IMX_HDMI_DMA
+	boolean
+
+config ADK_KERNEL_SND_SOC_IMX_SPDIF
+	boolean
+
+config ADK_KERNEL_SND_SOC_IMX_HDMI
+	boolean
+
 config ADK_KERNEL_SND_PXA2XX_AC97
 	boolean
 
@@ -124,7 +136,7 @@ config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_I2S
 	select ADK_KPACKAGE_KMOD_SND
 	select ADK_KERNEL_SND_ARM
 	select ADK_KPACKAGE_KMOD_SND_SOC
-	select ADK_KPACKAGE_KMOD_SND_PCM_DMAENGINE if !ADK_KERNEL_VERSION_3_10_34
+	select ADK_KPACKAGE_KMOD_SND_PCM_DMAENGINE if !ADK_KERNEL_VERSION_3_10_37
 	select ADK_KPACKAGE_KMOD_SND_COMPRESS
 	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
@@ -147,4 +159,17 @@ config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_HIFIBERRY_DIGI
 	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
+config ADK_KPACKAGE_KMOD_SND_IMX_SOC
+	prompt "Cubox-i SoC sound chip"
+	tristate
+	depends on ADK_TARGET_SYSTEM_CUBOX_I
+	select ADK_KPACKAGE_KMOD_SND
+	select ADK_KPACKAGE_KMOD_SND_SOC
+	select ADK_KERNEL_SND_SOC_IMX_PCM_DMA
+	select ADK_KERNEL_SND_SOC_IMX_HDMI_DMA
+	select ADK_KERNEL_SND_SOC_IMX_HDMI
+	select ADK_KERNEL_SND_SOC_IMX_SPDIF
+	default y if ADK_TARGET_SYSTEM_CUBOX_I
+	default n
+
 endmenu
diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel
index aed028f79..e6dc6d6e9 100644
--- a/target/linux/config/Config.in.kernel
+++ b/target/linux/config/Config.in.kernel
@@ -106,12 +106,6 @@ config ADK_KERNEL_CPU_MIPS64_R1
 config ADK_KERNEL_CPU_MIPS64_R2
 	boolean
 
-config ADK_KERNEL_PREEMPT
-	boolean
-
-config ADK_KERNEL_THUMB2_KERNEL
-	boolean
-
 # page size
 config ADK_KERNEL_PAGE_SIZE_4KB
 	boolean
@@ -119,10 +113,13 @@ config ADK_KERNEL_PAGE_SIZE_4KB
 config ADK_KERNEL_PAGE_SIZE_16KB
 	boolean
 
-# ABI
+# ARM specific
 config ADK_KERNEL_AEABI
 	boolean
 
+config ADK_KERNEL_THUMB2_KERNEL
+	boolean
+
 # endianess
 config ADK_KERNEL_CPU_BIG_ENDIAN
 	default y if ADK_big
@@ -131,3 +128,25 @@ config ADK_KERNEL_CPU_BIG_ENDIAN
 config ADK_KERNEL_CPU_LITTLE_ENDIAN
 	default y if ADK_little
 	boolean
+
+menu "Kernel options"
+
+config ADK_KERNEL_SMP
+	prompt "Enable symmetric multi processing"
+	boolean
+	default y if ADK_TARGET_CUBOX_I4PRO
+	default y if ADK_TARGET_CUBOX_I2ULTRA
+	default n
+
+config ADK_KERNEL_HIGHMEM
+	prompt "Enable high memory"
+	boolean
+	default y if ADK_TARGET_CUBOX_I4PRO
+	default n
+
+config ADK_KERNEL_PREEMPT
+	prompt "Enable preemptive kernel"
+	boolean
+	default n
+
+endmenu
diff --git a/target/packages/pkg-available/console b/target/packages/pkg-available/console
index 68ff1f0b5..ff7654834 100644
--- a/target/packages/pkg-available/console
+++ b/target/packages/pkg-available/console
@@ -3,13 +3,13 @@ config ADK_PKG_CONSOLE
 	default n
 	select ADK_PACKAGE_ALSA_UTILS
 	select ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER
-	select ADK_PACKAGE_DROPBEAR
 	select ADK_PACKAGE_SCREEN
 	select ADK_PACKAGE_SUDO
 	select ADK_PACKAGE_LINKS
 	select ADK_PACKAGE_ELINKS
 	select ADK_PACKAGE_LYNX
 	select ADK_PACKAGE_KEYCHAIN
+	select ADK_PACKAGE_OPENSSH
 	select ADK_PACKAGE_OPENSSH_CLIENT
 	select ADK_PACKAGE_OPENSSH_CLIENT_UTILS
 	select ADK_PACKAGE_OPENSSH_SERVER
diff --git a/target/packages/pkg-available/development b/target/packages/pkg-available/development
index 6a883ebf2..9ea11f7f6 100644
--- a/target/packages/pkg-available/development
+++ b/target/packages/pkg-available/development
@@ -4,7 +4,6 @@ config ADK_PKG_DEVELOPMENT
 	select ADK_PACKAGE_BASH
 	select ADK_PACKAGE_BINUTILS
 	select ADK_PACKAGE_DIFFUTILS
-	select ADK_PACKAGE_FILE
 	select ADK_PACKAGE_GAWK
 	select ADK_PACKAGE_GCC
 	select ADK_PACKAGE_GXX
@@ -16,10 +15,8 @@ config ADK_PKG_DEVELOPMENT
 	select ADK_PACKAGE_GLIBC_DEV if ADK_TARGET_LIB_GLIBC
 	select ADK_PACKAGE_LIBNCURSES
 	select ADK_PACKAGE_LIBNCURSES_DEV
-	select ADK_PACKAGE_M4
 	select ADK_PACKAGE_MAKE
 	select ADK_PACKAGE_MKFONTDIR
-	select ADK_PACKAGE_PATCH
 	select ADK_PACKAGE_PERL
 	select BUSYBOX_STAT
 	select BUSYBOX_FEATURE_STAT_FORMAT
diff --git a/target/sh/sys-available/toolchain-sh4 b/target/sh/sys-available/toolchain-sh4
index 4d7fff826..91110cb0c 100644
--- a/target/sh/sys-available/toolchain-sh4
+++ b/target/sh/sys-available/toolchain-sh4
@@ -2,7 +2,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_SH4
 	bool "Toolchain only (little endian)"
 	select ADK_sh
 	select ADK_little
-	select ADK_toolchain_sh
+	select ADK_toolchain_sh4
 	select ADK_CPU_SH4
 	select ADK_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TXZ
diff --git a/target/sh/sys-available/toolchain-sh4eb b/target/sh/sys-available/toolchain-sh4eb
index cccc163e1..70b99cb8e 100644
--- a/target/sh/sys-available/toolchain-sh4eb
+++ b/target/sh/sys-available/toolchain-sh4eb
@@ -2,7 +2,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_SH4EB
 	bool "Toolchain only (big endian)"
 	select ADK_sh
 	select ADK_big
-	select ADK_toolchain_sheb
+	select ADK_toolchain_sh4eb
 	select ADK_CPU_SH4
 	select ADK_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TXZ
diff --git a/target/x86/Makefile b/target/x86/Makefile
index 736f1c359..89e59095a 100644
--- a/target/x86/Makefile
+++ b/target/x86/Makefile
@@ -8,6 +8,16 @@ include $(TOPDIR)/mk/kernel-build.mk
 include $(TOPDIR)/mk/image.mk
 
 KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage
+
+QEMU_ARGS:=-M pc
+QEMU_ARGS+=${ADK_QEMU_ARGS}
+
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86_64_32),y)
+QEMU_ARCH:=x86_84
+else
+QEMU_ARCH:=i386
+endif
+
 ifeq ($(ADK_TARGET_QEMU_WITH_BOOTLOADER),y)
 ifeq ($(ADK_TARGET_QEMU_WITHOUT_GRAPHIC),y)
 CREATE:=./scripts/create.sh -g -t
@@ -43,9 +53,9 @@ ifeq ($(ADK_HARDWARE_QEMU),y)
 	@echo "$(CREATE) qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
 	@echo "Start qemu with following command line:"
 ifeq ($(ADK_TARGET_QEMU_WITH_BOOTLOADER),y)
-	@echo 'qemu-system-i386 ${ADK_QEMU_ARGS} -net user -net nic,model=e1000 qemu-${CPU_ARCH}.img'
+	@echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -net user -net nic,model=e1000 qemu-${CPU_ARCH}.img'
 else
-	@echo 'qemu-system-i386 ${ADK_QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
+	@echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
 endif
 endif
 ifeq ($(ADK_HARDWARE_VBOX),y)
@@ -72,7 +82,7 @@ imageinstall: $(FW_DIR)/$(INITRAMFS)
 	@echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}'
 ifeq ($(ADK_HARDWARE_QEMU),y)
 	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-i386 ${ADK_QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
+	@echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
 endif
 endif
 ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
@@ -81,7 +91,7 @@ imageinstall: createinitramfs
 	@echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}'
 ifeq ($(ADK_HARDWARE_QEMU),y)
 	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-i386 ${ADK_QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL)'
+	@echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL)'
 endif
 endif
 ifeq (${ADK_TARGET_FS},iso)
diff --git a/target/x86/kernel/qemu-x86_64 b/target/x86/kernel/qemu-x86_64
new file mode 100644
index 000000000..7bf96c74c
--- /dev/null
+++ b/target/x86/kernel/qemu-x86_64
@@ -0,0 +1,20 @@
+CONFIG_X86=y
+CONFIG_64BIT=y
+CONFIG_X86_64=y
+CONFIG_GENERIC_CPU=y
+CONFIG_PROCESSOR_SELECT=y
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_MTRR=y
+CONFIG_X86_PAT=y
+CONFIG_ISA_DMA_API=y
+CONFIG_AMD_NB=y
+CONFIG_IA32_EMULATION=y
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_E1000=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_PNP=y
+CONFIG_SERIAL_8250_CONSOLE=y
diff --git a/target/x86/sys-available/qemu-x86_64-32 b/target/x86/sys-available/qemu-x86_64-32
new file mode 100644
index 000000000..f96e6ea35
--- /dev/null
+++ b/target/x86/sys-available/qemu-x86_64-32
@@ -0,0 +1,11 @@
+config ADK_TARGET_SYSTEM_QEMU_X86_64_32
+	bool "Qemu Emulator (x86_64) with 32Bit userland"
+	select ADK_x86
+	select ADK_qemu_x86_64_32
+	select ADK_CPU_I686
+	select ADK_HARDWARE_QEMU
+	select ADK_TARGET_KERNEL_BZIMAGE
+	select ADK_TARGET_KERNEL_64
+	help
+	 Support for Qemu Emulator (x86_64) with 32 Bit userland.
+
diff --git a/target/x86_64/sys-available/toolchain-x86_64_32 b/target/x86_64/sys-available/toolchain-x86_64_32
deleted file mode 100644
index 9e8297ea4..000000000
--- a/target/x86_64/sys-available/toolchain-x86_64_32
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_X86_64_32
-	bool "Toolchain only (32 ABI)"
-	select ADK_x86_64
-	select ADK_32
-	select ADK_toolchain_x86_64
-	select ADK_CPU_X86_64
-	select ADK_LINUX_64
-	select ADK_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  Build a x86_64 toolchain.
-