combine cubox-i and hummingboard support, same linux patches are required

29 files changed, 114 insertions, 146 deletions

diff --git a/target/arm/Makefile b/target/arm/Makefile
index 4a87bc6ec..b216f1104 100644
--- a/target/arm/Makefile
+++ b/target/arm/Makefile
@@ -49,14 +49,9 @@ ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
 	@echo "Use following command to install with a writable data partition"
 	@echo "sudo ./scripts/install-rpi.sh -d /dev/sdX $(FW_DIR)/$(ROOTFSTARBALL)"
 endif
-ifeq ($(ADK_TARGET_SYSTEM_CUBOX_I),y)
+ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y)
 	@echo "Use following command to install it on SD card:"
-	@echo "sudo ./scripts/install-cubox.sh /dev/sdX $(FW_DIR)/$(ROOTFSTARBALL) $(FW_DIR)"
-
-endif
-ifeq ($(ADK_TARGET_SYSTEM_HUMMINGBOARD),y)
-	@echo "Use following command to install it on SD card:"
-	@echo "sudo ./scripts/install-cubox.sh /dev/sdX $(FW_DIR)/$(ROOTFSTARBALL) $(FW_DIR)"
+	@echo "sudo ./scripts/install-solidrun.sh /dev/sdX $(FW_DIR)/$(ROOTFSTARBALL) $(FW_DIR)"
 
 endif
 endif
@@ -90,22 +85,16 @@ kernel-install: kernel-strip
 	@cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
 
 dtb-install:
-ifeq ($(ADK_TARGET_SYSTEM_CUBOX_I),y)
-	env $(KERNEL_MAKE_ENV) $(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKE_OPTS) \
-		-j${ADK_MAKE_JOBS} imx6q-cubox-i.dtb imx6dl-cubox-i.dtb $(MAKE_TRACE)
-	$(CP) $(LINUX_DIR)/arch/arm/boot/dts/imx6*-cubox-i.dtb \
-		$(FW_DIR)
-endif
-ifeq ($(ADK_TARGET_SYSTEM_HUMMINGBOARD),y)
+ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y)
 	env $(KERNEL_MAKE_ENV) $(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKE_OPTS) \
-		-j${ADK_MAKE_JOBS} imx6dl-hummingboard.dtb $(MAKE_TRACE)
-	$(CP) $(LINUX_DIR)/arch/arm/boot/dts/imx6*-hummingboard.dtb \
+		imx6q-cubox-i.dtb imx6dl-cubox-i.dtb imx6dl-hummingboard.dtb $(MAKE_TRACE)
+	$(CP) $(LINUX_DIR)/arch/arm/boot/dts/imx6*.dtb \
 		$(FW_DIR)
 endif
 
 # filesystem specific targets
 ifeq ($(ADK_TARGET_FS),archive)
-ifeq ($(ADK_TARGET_SYSTEM_CUBOX_I)$(ADK_TARGET_SYSTEM_HUMMINGBOARD),y)
+ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y)
 imageinstall: dtb-install $(FW_DIR)/$(ROOTFSTARBALL) targethelp
 else
 imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) targethelp
diff --git a/target/arm/kernel/hummingboard b/target/arm/kernel/hummingboard
deleted file mode 100644
index 97e6393ef..000000000
--- a/target/arm/kernel/hummingboard
+++ /dev/null
@@ -1,18 +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_IMX6Q=y
-CONFIG_SOC_IMX6SL=y
-CONFIG_LOCAL_TIMERS=y
-CONFIG_MXC_DEBUG_BOARD=y
-CONFIG_KUSER_HELPERS=y
-CONFIG_VFP=y
-CONFIG_VFPv3=y
-CONFIG_NEON=y
-CONFIG_PCI_IMX6=y
-CONFIG_SERIAL_IMX=y
-CONFIG_SERIAL_IMX_CONSOLE=y
-CONFIG_ATAGS=y
-CONFIG_CMDLINE_FORCE=y
diff --git a/target/arm/kernel/cubox-i b/target/arm/kernel/solidrun-imx6
index 97e6393ef..97e6393ef 100644
--- a/target/arm/kernel/cubox-i
+++ b/target/arm/kernel/solidrun-imx6
diff --git a/target/arm/cubox-i/patches/3.14.15/solidrun.patch b/target/arm/solidrun-imx6/patches/3.14.15/solidrun.patch
index ac5ee0237..ac5ee0237 100644
--- a/target/arm/cubox-i/patches/3.14.15/solidrun.patch
+++ b/target/arm/solidrun-imx6/patches/3.14.15/solidrun.patch
diff --git a/target/arm/cubox-i/patches/3.16.1/rmk-wifi.patch b/target/arm/solidrun-imx6/patches/3.16.1/rmk-wifi.patch
index 0ba3a7951..0ba3a7951 100644
--- a/target/arm/cubox-i/patches/3.16.1/rmk-wifi.patch
+++ b/target/arm/solidrun-imx6/patches/3.16.1/rmk-wifi.patch
diff --git a/target/arm/systems/cubox-i b/target/arm/systems/cubox-i
deleted file mode 100644
index 1d96e8cfc..000000000
--- a/target/arm/systems/cubox-i
+++ /dev/null
@@ -1,28 +0,0 @@
-config ADK_TARGET_SYSTEM_CUBOX_I
-	bool "Cubox-i"
-	select ADK_arm
-	select ADK_little
-	select ADK_eabihf
-	select ADK_fpu_neon
-	select ADK_cubox_i
-	select ADK_CPU_CORTEX_A9
-	select ADK_TARGET_CPU_WITH_FPU
-	select ADK_TARGET_WITH_VGA
-	select ADK_TARGET_WITH_CPU_FREQ
-	select ADK_TARGET_WITH_USB
-	select ADK_TARGET_WITH_SD
-	select ADK_TARGET_WITH_I2C
-	select ADK_TARGET_WITH_SPI
-	select ADK_TARGET_WITH_RTC
-	select ADK_TARGET_WITH_SDIO
-	select ADK_TARGET_WITH_SOUND
-	select ADK_TARGET_WITH_LEDS
-	select ADK_TARGET_WITH_SMP
-	select ADK_TARGET_WITH_WATCHDOG
-	select ADK_TARGET_WITH_WIFI
-	select ADK_TARGET_KERNEL_ZIMAGE
-	select ADK_TARGET_WITH_ROOT_RW
-	select ADK_PACKAGE_U_BOOT_IMX6
-	help
-	  Solidrun Cubox-i
-
diff --git a/target/arm/systems/hummingboard b/target/arm/systems/solidrun-imx6
index 4688a6f41..38e80e70f 100644
--- a/target/arm/systems/hummingboard
+++ b/target/arm/systems/solidrun-imx6
@@ -1,10 +1,10 @@
-config ADK_TARGET_SYSTEM_HUMMINGBOARD
-	bool "HummingBoard"
+config ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+	bool "Solidrun IMX6 Embedded Systems"
 	select ADK_arm
 	select ADK_little
 	select ADK_eabihf
 	select ADK_fpu_neon
-	select ADK_hummingboard
+	select ADK_solidrun_imx6
 	select ADK_CPU_CORTEX_A9
 	select ADK_TARGET_CPU_WITH_FPU
 	select ADK_TARGET_WITH_VGA
@@ -13,15 +13,13 @@ config ADK_TARGET_SYSTEM_HUMMINGBOARD
 	select ADK_TARGET_WITH_SD
 	select ADK_TARGET_WITH_I2C
 	select ADK_TARGET_WITH_SPI
-	select ADK_TARGET_WITH_RTC
 	select ADK_TARGET_WITH_SOUND
 	select ADK_TARGET_WITH_LEDS
-	select ADK_TARGET_WITH_SMP
 	select ADK_TARGET_WITH_WATCHDOG
-	select ADK_TARGET_WITH_WIFI
 	select ADK_TARGET_KERNEL_ZIMAGE
 	select ADK_TARGET_WITH_ROOT_RW
 	select ADK_PACKAGE_U_BOOT_IMX6
 	help
-	  Solidrun HummingBoard
+	  Solidrun IMX6 Embedded Systems.
+	  http://www.solid-run.com
 
diff --git a/target/config/Config.in.arm.choice b/target/config/Config.in.arm.choice
index 6011fd7a1..79e70078b 100644
--- a/target/config/Config.in.arm.choice
+++ b/target/config/Config.in.arm.choice
@@ -21,20 +21,54 @@ config ADK_CPU_ARMV7A
 endchoice
 
 choice
-prompt "Cubox-i model"
-depends on ADK_TARGET_SYSTEM_CUBOX_I
+prompt "Solidrun IMX6 model"
+depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 
 config ADK_TARGET_CUBOX_I4PRO
 	boolean "Solidrun Cubox-i4Pro"
+	select ADK_TARGET_WITH_SMP
+	select ADK_TARGET_WITH_WIFI
+	select ADK_TARGET_WITH_RTC
+	select ADK_TARGET_WITH_SDIO
+	select ADK_TARGET_WITH_SATA
 
 config ADK_TARGET_CUBOX_I2ULTRA
 	boolean "Solidrun Cubox-i2Ultra"
+	select ADK_TARGET_WITH_SMP
+	select ADK_TARGET_WITH_WIFI
+	select ADK_TARGET_WITH_RTC
+	select ADK_TARGET_WITH_SDIO
+	select ADK_TARGET_WITH_SATA
+
+config ADK_TARGET_CUBOX_I2EX
+	boolean "Solidrun Cubox-i2eX"
+	select ADK_TARGET_WITH_SMP
+	select ADK_TARGET_WITH_WIFI
+	select ADK_TARGET_WITH_RTC
+	select ADK_TARGET_WITH_SDIO
+	select ADK_TARGET_WITH_SATA
 
 config ADK_TARGET_CUBOX_I2
 	boolean "Solidrun Cubox-i2"
+	select ADK_TARGET_WITH_SMP
+	select ADK_TARGET_WITH_WIFI
+	select ADK_TARGET_WITH_RTC
+	select ADK_TARGET_WITH_SDIO
 
 config ADK_TARGET_CUBOX_I1
 	boolean "Solidrun Cubox-i1"
+	select ADK_TARGET_WITH_WIFI
+	select ADK_TARGET_WITH_SDIO
 
-endchoice
+config ADK_TARGET_HUMMINGBOARD_I1
+	boolean "Solidrun Hummingboard-i1"
+
+config ADK_TARGET_HUMMINGBOARD_I2
+	boolean "Solidrun Hummingboard-i2"
+	select ADK_TARGET_WITH_SMP
 
+config ADK_TARGET_HUMMINGBOARD_I2EX
+	boolean "Solidrun Hummingboard-i2eX"
+	select ADK_TARGET_WITH_SMP
+
+endchoice
diff --git a/target/config/Config.in.kernel b/target/config/Config.in.kernel
index bf293019b..add212587 100644
--- a/target/config/Config.in.kernel
+++ b/target/config/Config.in.kernel
@@ -56,8 +56,7 @@ config ADK_TARGET_KERNEL_MINICONFIG
 	default "aranym-m68k" if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default "vbox-x86" if ADK_TARGET_SYSTEM_VBOX_X86
 	default "ibm-x40" if ADK_TARGET_SYSTEM_IBM_X40
-	default "cubox-i" if ADK_TARGET_SYSTEM_CUBOX_I
-	default "hummingboard" if ADK_TARGET_SYSTEM_HUMMINGBOARD
+	default "solidrun-imx6" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	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
diff --git a/target/config/Config.in.kernelversion.choice b/target/config/Config.in.kernelversion.choice
index f599dd5c8..335962b64 100644
--- a/target/config/Config.in.kernelversion.choice
+++ b/target/config/Config.in.kernelversion.choice
@@ -4,6 +4,7 @@
 choice
 prompt "Kernel Version"
 depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM && ADK_TARGET_KERNEL_CUSTOMISING
+default ADK_KERNEL_VERSION_3_14_15 if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 default ADK_KERNEL_VERSION_3_16_1
 
 config ADK_KERNEL_VERSION_3_16_1
@@ -15,7 +16,7 @@ config ADK_KERNEL_VERSION_3_16_1
 config ADK_KERNEL_VERSION_3_15_8
 	prompt "3.15.8"
 	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
-	depends on !ADK_TARGET_SYSTEM_CUBOX_I
+	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	boolean
 	select ADK_KERNEL_VERSION_3_15
 
@@ -26,14 +27,14 @@ config ADK_KERNEL_VERSION_3_14_15
 
 config ADK_KERNEL_VERSION_3_12_26
 	prompt "3.12.26"
-	depends on !ADK_TARGET_SYSTEM_CUBOX_I
+	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
 	boolean
 	select ADK_KERNEL_VERSION_3_12
 
 config ADK_KERNEL_VERSION_3_10_51
 	prompt "3.10.51"
-	depends on !ADK_TARGET_SYSTEM_CUBOX_I
+	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
 	boolean
 	select ADK_KERNEL_VERSION_3_10
@@ -41,7 +42,7 @@ config ADK_KERNEL_VERSION_3_10_51
 config ADK_KERNEL_VERSION_3_4_101
 	prompt "3.4.101"
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
-	depends on !ADK_TARGET_SYSTEM_CUBOX_I
+	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
 	boolean
 	select ADK_KERNEL_VERSION_3_4
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index 7f48513a2..845786a45 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -36,7 +36,7 @@ config ADK_RUNTIME_TMPFS_SIZE
 	default "16384" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default "32768" if ADK_TARGET_SYSTEM_IBM_X40
 	default "32768" if ADK_TARGET_SYSTEM_RASPBERRY_PI
-	default "32768" if ADK_TARGET_SYSTEM_CUBOX_I
+	default "32768" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default "8192" if ADK_TARGET_SYSTEM_MIKROTIK_RB532
 	default "2048"
 	help
@@ -102,7 +102,7 @@ config ADK_RUNTIME_GETTY_VGA
 	default y if ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY
 	default y if ADK_TARGET_QEMU_WITH_GRAPHIC
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
-	default y if ADK_TARGET_SYSTEM_CUBOX_I
+	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
@@ -117,6 +117,7 @@ config ADK_RUNTIME_GETTY_SERIAL
 	default n if ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY
 	default n if ADK_TARGET_QEMU_WITH_GRAPHIC
 	default n if ADK_TARGET_SYSTEM_RASPBERRY_PI
+	default n if ADK_TARGET_SYSTEM_HUMMINGBOARD
 	default n if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default n if ADK_TARGET_SYSTEM_IBM_X40
 	default n if ADK_TARGET_SYSTEM_ARANYM_M68K
@@ -131,7 +132,7 @@ config ADK_RUNTIME_CONSOLE_SERIAL_DEVICE
 	default "ttyUL0" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
 	default "ttyAMA0" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB || ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 || ADK_TARGET_SYSTEM_ARM_FM || ADK_TARGET_SYSTEM_QEMU_AARCH64
 	default "ttySC1" if ADK_TARGET_SYSTEM_QEMU_SH
-	default "ttymxc0" if ADK_TARGET_SYSTEM_CUBOX_I
+	default "ttymxc0" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default "ttyS0"
 
 config ADK_RUNTIME_CONSOLE_SERIAL_SPEED
@@ -289,9 +290,7 @@ endmenu
 
 menu "wlan0 Configuration"
 depends on ADK_SIMPLE_NETWORK_CONFIG
-depends on ADK_TARGET_SYSTEM_LEMOTE_YEELONG || \
-	ADK_TARGET_SYSTEM_CUBOX_I || \
-	ADK_TARGET_SYSTEM_IBM_X40
+depends on ADK_TARGET_WITH_WIFI
 
 choice
 prompt "Type"
diff --git a/target/config/Config.in.target b/target/config/Config.in.target
index 3abb99b9e..6cb858450 100644
--- a/target/config/Config.in.target
+++ b/target/config/Config.in.target
@@ -43,8 +43,8 @@ config ADK_TARGET_CMDLINE
 	default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
 	default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
 	default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_APU
-	default "console=ttymxc0,115200 console=tty0" if ADK_TARGET_SYSTEM_CUBOX_I && ADK_RUNTIME_VERBOSE_INIT_VGA
-	default "console=tty0 console=ttymxc0,115200" if ADK_TARGET_SYSTEM_CUBOX_I && ADK_RUNTIME_VERBOSE_INIT_SERIAL
+	default "console=ttymxc0,115200 console=tty0" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 && ADK_RUNTIME_VERBOSE_INIT_VGA
+	default "console=tty0 console=ttymxc0,115200" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 && ADK_RUNTIME_VERBOSE_INIT_SERIAL
 	default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_IBM_X40 && ADK_RUNTIME_VERBOSE_INIT_VGA
 	default "console=tty0 console=ttyS0,115200" if ADK_TARGET_SYSTEM_IBM_X40 && ADK_RUNTIME_VERBOSE_INIT_SERIAL
 	default "console=tty0" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio
index 2df6cc25f..b41ccbbf0 100644
--- a/target/linux/config/Config.in.audio
+++ b/target/linux/config/Config.in.audio
@@ -217,11 +217,8 @@ config ADK_KERNEL_SND_IMX_SOC
 	select ADK_KERNEL_SND_SOC_IMX_SPDIF
 	select ADK_KERNEL_REGMAP_SPI
 	select ADK_KERNEL_REGMAP_I2C
-	select ADK_KERNEL_SND_PCM_DMAENGINE if !ADK_KERNEL_VERSION_3_10
-	select ADK_KERNEL_SND_SOC_SPDIF if ADK_KERNEL_VERSION_3_10
-	select ADK_KERNEL_SND_SOC_FSL_SPDIF if ADK_KERNEL_VERSION_3_10
-	depends on ADK_TARGET_SYSTEM_CUBOX_I
-	#default m if ADK_TARGET_SYSTEM_CUBOX_I
+	select ADK_KERNEL_SND_PCM_DMAENGINE
+	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
 
 endmenu
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index 025f05680..cfe24f9ef 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -213,8 +213,8 @@ config ADK_KERNEL_PATA_IMX
 	select ADK_KERNEL_AHCI_IMX
 	select ADK_KERNEL_SATA_PMP
 	select ADK_KERNEL_SATA_AHCI_PLATFORM
-	depends on ADK_TARGET_SYSTEM_CUBOX_I
-	default y if ADK_TARGET_SYSTEM_CUBOX_I
+	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
 
 config ADK_KERNEL_PATA_PXA
@@ -308,7 +308,7 @@ config ADK_KERNEL_MMC_SDHCI_BCM2708
 	default n
 
 config ADK_KERNEL_MMC_SDHCI_ESDHC_IMX
-	prompt "SD card support for Cubox-i"
+	prompt "SD card support for Solidrun IMX6"
 	boolean
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_SCSI_DMA
@@ -325,8 +325,8 @@ config ADK_KERNEL_MMC_SDHCI_ESDHC_IMX
 	select ADK_KERNEL_MMC_SDHCI_IO_ACCESSORS
 	select ADK_KERNEL_MMC_SDHCI_PLTFM
 	select ADK_KERNEL_MMC_UNSAFE_RESUME
-	depends on ADK_TARGET_SYSTEM_CUBOX_I
-	default y if ADK_TARGET_SYSTEM_CUBOX_I
+	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
 
 endmenu
diff --git a/target/linux/config/Config.in.bluetooth b/target/linux/config/Config.in.bluetooth
index 352d73fad..537e0c741 100644
--- a/target/linux/config/Config.in.bluetooth
+++ b/target/linux/config/Config.in.bluetooth
@@ -82,7 +82,7 @@ config ADK_KERNEL_BT_HCIBTSDIO
 	tristate
 	select ADK_KERNEL_BT
 	depends on ADK_TARGET_WITH_SDIO
-	default m if ADK_TARGET_SYSTEM_CUBOX_I && !ADK_KERNEL_VERSION_3_14
+	default m if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
 	help
 	  Bluetooth HCI SDIO driver.
@@ -117,7 +117,7 @@ config ADK_KERNEL_BT_MRVL
 	tristate
 	select ADK_KERNEL_BT
 	select ADK_PACKAGE_BRCM_BLUETOOTH
-	default m if ADK_TARGET_SYSTEM_CUBOX_I && !ADK_KERNEL_VERSION_3_14
+	default m if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
 	help
 	  Bluetooth Marvell driver.
@@ -128,7 +128,7 @@ config ADK_KERNEL_BT_MRVL_SDIO
 	depends on ADK_KERNEL_BT_MRVL
 	depends on ADK_KERNEL_BT_HCIBTSDIO
 	depends on ADK_TARGET_WITH_SDIO
-	default m if ADK_TARGET_SYSTEM_CUBOX_I && !ADK_KERNEL_VERSION_3_14
+	default m if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
 	help
 	  Bluetooth Marvell driver.
diff --git a/target/linux/config/Config.in.cpu b/target/linux/config/Config.in.cpu
index 22b1cd332..5bfa6d6c1 100644
--- a/target/linux/config/Config.in.cpu
+++ b/target/linux/config/Config.in.cpu
@@ -47,14 +47,14 @@ config ADK_KERNEL_CPU_FREQ_GOV_CONSERVATIVE
 	default n
 
 config ADK_KERNEL_ARM_IMX6_CPUFREQ
-	prompt "CPU frequency support for cubox-i"
+	prompt "CPU frequency support for Solidrun IMX6"
 	boolean
 	select ADK_KERNEL_CPU_FREQ
 	select ADK_KERNEL_REGULATOR
 	select ADK_KERNEL_REGULATOR_FIXED_VOLTAGE
 	select ADK_KERNEL_REGULATOR_ANATOP
-	depends on ADK_TARGET_SYSTEM_CUBOX_I
-	default y if ADK_TARGET_SYSTEM_CUBOX_I
+	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
 
 config ADK_KERNEL_ARM_BCM2835_CPUFREQ
diff --git a/target/linux/config/Config.in.dma b/target/linux/config/Config.in.dma
index b83cc3af2..2f7f9734e 100644
--- a/target/linux/config/Config.in.dma
+++ b/target/linux/config/Config.in.dma
@@ -7,12 +7,12 @@ config ADK_KERNEL_DMA_BCM2708
 
 config ADK_KERNEL_IMX_SDMA
 	boolean
-	depends on ADK_TARGET_SYSTEM_CUBOX_I
 	select ADK_KERNEL_DMADEVICES
 	select ADK_KERNEL_FW_LOADER
 	select ADK_KERNEL_FIRMWARE_IN_KERNEL
 	select ADK_KERNEL_FW_LOADER_USER_HELPER
-	default y if ADK_TARGET_SYSTEM_CUBOX_I
+	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
 
 config ADK_KERNEL_CMA
diff --git a/target/linux/config/Config.in.ethernet b/target/linux/config/Config.in.ethernet
index 94aa11b34..982d1cd76 100644
--- a/target/linux/config/Config.in.ethernet
+++ b/target/linux/config/Config.in.ethernet
@@ -58,9 +58,9 @@ config ADK_KERNEL_FEC
 	tristate
 	select ADK_KERNEL_NET_VENDOR_FREESCALE
 	select ADK_KERNEL_AT803X_PHY
-	depends on ADK_TARGET_SYSTEM_CUBOX_I || \
+	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 || \
 		   ADK_TARGET_SYSTEM_QEMU_M68K
-	default y if ADK_TARGET_SYSTEM_CUBOX_I
+	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default y if ADK_TARGET_SYSTEM_QEMU_M68K
 	default n
 	help
diff --git a/target/linux/config/Config.in.gpio b/target/linux/config/Config.in.gpio
index d66bff46f..6cdc97d18 100644
--- a/target/linux/config/Config.in.gpio
+++ b/target/linux/config/Config.in.gpio
@@ -12,5 +12,5 @@ config ADK_KERNEL_GPIO_MXC
 	select ADK_KERNEL_GPIOLIB
 	select ADK_KERNEL_GPIO_SYSFS
 	select ADK_KERNEL_GPIO_GENERIC
-	default y if ADK_TARGET_SYSTEM_CUBOX_I
+	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index 5e2d32482..9e47b7d1c 100644
--- a/target/linux/config/Config.in.graphics
+++ b/target/linux/config/Config.in.graphics
@@ -153,17 +153,17 @@ config ADK_KERNEL_FB_VESA
 
 config ADK_KERNEL_DRM_DW_HDMI_AUDIO
 	tristate
-	depends on ADK_TARGET_SYSTEM_CUBOX_I
+	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	depends on ADK_KERNEL_VERSION_3_16
-	#default m if ADK_TARGET_SYSTEM_CUBOX_I
+	#default m if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
  	default n
  	help
 
 config ADK_KERNEL_DRM_DW_HDMI_CEC
 	tristate
-	depends on ADK_TARGET_SYSTEM_CUBOX_I
+	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	depends on ADK_KERNEL_VERSION_3_16
-	#default m if ADK_TARGET_SYSTEM_CUBOX_I
+	#default m if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
  	default n
  	help
 	
@@ -185,16 +185,15 @@ config ADK_KERNEL_DRM_IMX
 	select ADK_KERNEL_FRAMEBUFFER_CONSOLE
 	select ADK_KERNEL_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY
 	select ADK_KERNEL_I2C_IMX
-	depends on ADK_TARGET_SYSTEM_CUBOX_I || ADK_TARGET_SYSTEM_HUMMINGBOARD
+	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	depends on ADK_KERNEL_VERSION_3_16
-	default y if ADK_TARGET_SYSTEM_CUBOX_I
-	default y if ADK_TARGET_SYSTEM_HUMMINGBOARD
+	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
  	default n
  	help
 	 Framebuffer support for Cubox-i/Hummingboard
 
 config ADK_KERNEL_DRM_VIVANTE
-	prompt "Framebuffer support for Cubox-i/Hummingboard"
+	prompt "Framebuffer support for Cubox-i/Hummingboard (Vivante)"
 	boolean
 	select ADK_KERNEL_DRM
 	select ADK_KERNEL_FB
@@ -202,10 +201,9 @@ config ADK_KERNEL_DRM_VIVANTE
 	select ADK_KERNEL_FB_MXS
 	select ADK_KERNEL_FB_MXC_SYNC_PANEL
 	select ADK_KERNEL_FB_MXC_HDMI
-	depends on ADK_TARGET_SYSTEM_CUBOX_I || ADK_TARGET_SYSTEM_HUMMINGBOARD
+	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	depends on ADK_KERNEL_VERSION_3_14
-	default y if ADK_TARGET_SYSTEM_CUBOX_I
-	default y if ADK_TARGET_SYSTEM_HUMMINGBOARD
+	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
  	default n
  	help
 	 Framebuffer support for Cubox-i/Hummingboard (Vivante)
diff --git a/target/linux/config/Config.in.i2c b/target/linux/config/Config.in.i2c
index b3a3cbed2..e7cbc24f2 100644
--- a/target/linux/config/Config.in.i2c
+++ b/target/linux/config/Config.in.i2c
@@ -8,15 +8,15 @@ config ADK_KERNEL_I2C_CHARDEV
  	tristate
 
 config ADK_KERNEL_I2C_IMX
-	prompt "I2C driver for Cubox-i"
+	prompt "I2C driver for IMX6"
 	tristate
-	depends on ADK_TARGET_SYSTEM_CUBOX_I
+	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	select ADK_KERNEL_I2C
 	select ADK_KERNEL_I2C_CHARDEV
-	default y if ADK_TARGET_SYSTEM_CUBOX_I
+	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
 	help
-	  I2C driver for Cubox-i.
+	  I2C driver for Solidrun IMX6.
 	
 config ADK_KERNEL_SCX200_ACB
 	prompt "I2C driver for Geode"
diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel
index e3906cf9a..3f2541a7c 100644
--- a/target/linux/config/Config.in.kernel
+++ b/target/linux/config/Config.in.kernel
@@ -187,9 +187,7 @@ 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 y if ADK_TARGET_SYSTEM_PCENGINES_APU
+	default y if ADK_TARGET_WITH_SMP
 	depends on ADK_TARGET_WITH_SMP
 	default n
 
@@ -198,6 +196,7 @@ config ADK_KERNEL_HIGHMEM
 	boolean
 	default y if ADK_TARGET_CUBOX_I4PRO
 	default y if ADK_TARGET_CUBOX_I2ULTRA
+	default y if ADK_TARGET_CUBOX_I2EX
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default n
 
diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc
index 8771af1c1..6823ee612 100644
--- a/target/linux/config/Config.in.misc
+++ b/target/linux/config/Config.in.misc
@@ -20,8 +20,8 @@ config ADK_KERNEL_SBUS
 
 config ADK_KERNEL_IMX_WEIM
 	boolean
-	depends on ADK_TARGET_SYSTEM_CUBOX_I
-	default y if ADK_TARGET_SYSTEM_CUBOX_I
+	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
 
 menu "Miscellaneous devices support"
diff --git a/target/linux/config/Config.in.pm b/target/linux/config/Config.in.pm
index 702e516eb..0e418ce0c 100644
--- a/target/linux/config/Config.in.pm
+++ b/target/linux/config/Config.in.pm
@@ -1,6 +1,6 @@
 config ADK_KERNEL_PM_RUNTIME
 	boolean
-	default y if ADK_TARGET_SYSTEM_CUBOX_I
+	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 
 config ADK_KERNEL_ACPI
 	boolean
diff --git a/target/linux/config/Config.in.rtc b/target/linux/config/Config.in.rtc
index 6263806ff..ad5d3d5e1 100644
--- a/target/linux/config/Config.in.rtc
+++ b/target/linux/config/Config.in.rtc
@@ -14,17 +14,17 @@ config ADK_KERNEL_RTC_INTF_DEV_UIE_EMUL
 	boolean
 
 config ADK_KERNEL_RTC_DRV_PCF8523
-	prompt "RTC support for Solidrun Cubox-i"
+	prompt "RTC support for Solidrun IMX6 (PCF8523)"
 	boolean
 	select ADK_KERNEL_RTC_CLASS
 	select ADK_KERNEL_RTC_HCTOSYS
 	select ADK_KERNEL_RTC_INTF_DEV
 	select ADK_KERNEL_RTC_INTF_DEV_UIE_EMUL
-	default y if ADK_TARGET_SYSTEM_CUBOX_I
+	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
-	depends on ADK_TARGET_SYSTEM_CUBOX_I
+	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	help
-	  Solidrun Cubox-i RTC.
+	  PCF8523 RTC.
 
 config ADK_KERNEL_RTC_DRV_PXA
 	prompt "RTC support for Sharp Zaurus"
diff --git a/target/linux/config/Config.in.spi b/target/linux/config/Config.in.spi
index 31a29f0f9..12637f9cb 100644
--- a/target/linux/config/Config.in.spi
+++ b/target/linux/config/Config.in.spi
@@ -27,12 +27,12 @@ config ADK_KERNEL_SPI_PXA2XX
 	select ADK_KERNEL_SPI
 
 config ADK_KERNEL_SPI_IMX
-	prompt "SPI driver for Solidrun Cubox-i"
+	prompt "SPI driver for Solidrun Cubox-i/Hummingboard"
 	tristate
 	select ADK_KERNEL_SPI
 	select ADK_KERNEL_SPI_MASTER
 	select ADK_KERNEL_SPI_BITBANG
-	default y if ADK_TARGET_SYSTEM_CUBOX_I
+	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
 
 endmenu
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index 9a39eaf7f..853724c63 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -19,7 +19,7 @@ config ADK_KERNEL_USB_PHY
 config ADK_KERNEL_USB_MXS_PHY
 	tristate
 	select ADK_KERNEL_USB_PHY
-	default m if ADK_TARGET_SYSTEM_CUBOX_I
+	default m if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
 
 config ADK_KERNEL_USB_OHCI_HCD_PLATFORM
@@ -41,7 +41,7 @@ config ADK_KERNEL_USB
 	default m if ADK_TARGET_SYSTEM_IBM_X40
 	default m if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default m if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	default m if ADK_TARGET_SYSTEM_CUBOX_I
+	default m if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
 	help
 	  Universal Serial Bus (USB) is a specification for a serial bus
@@ -79,7 +79,7 @@ config ADK_KERNEL_USB_EHCI_HCD
 	tristate
 	select ADK_KERNEL_USB_EHCI_ROOT_HUB_TT
 	select ADK_KERNEL_USB_EHCI_TT_NEWSCHED
-	select ADK_KERNEL_USB_MXS_PHY if ADK_TARGET_SYSTEM_CUBOX_I
+	select ADK_KERNEL_USB_MXS_PHY if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	depends on ADK_KERNEL_USB
@@ -88,7 +88,7 @@ config ADK_KERNEL_USB_EHCI_HCD
 	default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
 	default m if ADK_TARGET_SYSTEM_IBM_X40
 	default m if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
-	default m if ADK_TARGET_SYSTEM_CUBOX_I
+	default m if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
 	help
 	  The Enhanced Host Controller Interface (EHCI) is standard for USB 2.0
@@ -173,8 +173,8 @@ config ADK_KERNEL_USB_CHIPIDEA
 	select ADK_KERNEL_USB_CHIPIDEA_HOST
 	select ADK_KERNEL_USB_GADGET
 	depends on ADK_KERNEL_USB_EHCI_HCD
-	depends on ADK_TARGET_SYSTEM_CUBOX_I
-	default m if ADK_TARGET_SYSTEM_CUBOX_I
+	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+	default m if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
 
 config ADK_KERNEL_USB_ISP116X_HCD
diff --git a/target/linux/config/Config.in.watchdog b/target/linux/config/Config.in.watchdog
index 1b9d183cc..24c62dc5e 100644
--- a/target/linux/config/Config.in.watchdog
+++ b/target/linux/config/Config.in.watchdog
@@ -16,14 +16,14 @@ config ADK_KERNEL_CS5535_CLOCK_EVENT_SRC
 menu "Watchdog driver support"
 
 config ADK_KERNEL_IMX2_WDT
-	prompt "Cubox-i Hardware Watchdog"
+	prompt "IMX6 Hardware Watchdog"
 	boolean
 	select ADK_KERNEL_WATCHDOG
-	depends on ADK_TARGET_SYSTEM_CUBOX_I
-	default y if ADK_TARGET_SYSTEM_CUBOX_I
+	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
 	help
-	  Watchdog driver for Cubox-i
+	  Watchdog driver for Cubox-i and Hummingboard.
 
 config ADK_KERNEL_SCx200_WDT
 	prompt "Natsemi Hardware Watchdog" 
diff --git a/target/linux/config/Config.in.wireless b/target/linux/config/Config.in.wireless
index 5d7f9e10d..1fbeb628f 100644
--- a/target/linux/config/Config.in.wireless
+++ b/target/linux/config/Config.in.wireless
@@ -128,7 +128,7 @@ config ADK_KERNEL_BRCMFMAC
 	select ADK_KERNEL_BRCMFMAC_SDIO
 	select ADK_PACKAGE_BRCMFMAC_FIRMWARE
 	depends on ADK_TARGET_WITH_SDIO
-	default m if ADK_TARGET_SYSTEM_CUBOX_I
+	default m if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
 	help
 	  Driver for Broadcom FullMac wireless cards